Merge pull request #47 from bird-house/move-tests-to-top-level

moved tests to top-level folder
bird-house · Feb 7, 2019 · e7144d0 · e7144d0
2 parents 3d235ca + 27d72d5
commit e7144d0
Show file tree

Hide file tree

Showing 28 changed files with 16 additions and 12 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,5 +1,7 @@
-include *.rst *.txt
-graft twitcher
+include Makefile
+include *.txt
+include *.rst
+recursive-include twitcher *
 global-exclude *.*~
 global-exclude __pycache__
 global-exclude *.py[co]
diff --git a/requirements.txt b/requirements.txt
@@ -5,3 +5,4 @@ requests
 requests_oauthlib
 pymongo
 argcomplete
+pytz
diff --git a/requirements_dev.txt b/requirements_dev.txt
@@ -4,4 +4,4 @@ mock
 WebTest
 flake8
 # internal WPS
-pywps>=4.0.0
+pywps>=4.2.0
diff --git a/setup.cfg b/setup.cfg
@@ -2,7 +2,6 @@
 addopts =
         --strict
         --tb=native
-        twitcher/
 python_files = test_*.py
 markers =
     online: mark test to need internet connection

diff --git a/setup.py b/setup.py
@@ -8,6 +8,7 @@
 CHANGES = open(os.path.join(here, 'CHANGES.rst')).read()
 
 reqs = [line.strip() for line in open('requirements.txt')]
+extra_reqs = [line.strip() for line in open('requirements_dev.txt')]
 
 setup(name='pyramid_twitcher',
       version=version,
@@ -20,16 +21,17 @@
           "Topic :: Internet :: WWW/HTTP :: WSGI :: Application",
           "Development Status :: 4 - Beta",
       ],
-      author='Birdhouse Developers',
-      author_email='wps-dev@lists.dkrz.de',
+      author='Carsten Ehbrecht',
+      author_email='ehbrecht@dkrz.de',
       url='https://github.com/bird-house/twitcher.git',
       license='Apache License 2.0',
-      keywords='buildout pyramid twitcher birdhouse wps pywps security proxy ows ogc',
+      keywords='pyramid twitcher birdhouse wps security proxy ows ogc',
       packages=find_packages(),
       include_package_data=True,
       zip_safe=False,
       test_suite='twitcher',
       install_requires=reqs,
+      extra_requires=extra_reqs,
       entry_points="""\
       [paste.app_factory]
       main = twitcher:main

diff --git a/twitcher/tests/__init__.py → tests/__init__.py b/twitcher/tests/__init__.py → tests/__init__.py
diff --git a/twitcher/tests/common.py → tests/common.py b/twitcher/tests/common.py → tests/common.py
diff --git a/twitcher/tests/functional/__init__.py → tests/functional/__init__.py b/twitcher/tests/functional/__init__.py → tests/functional/__init__.py
diff --git a/twitcher/tests/functional/common.py → tests/functional/common.py b/twitcher/tests/functional/common.py → tests/functional/common.py
diff --git a/...her/tests/functional/test_owsproxy_app.py → tests/functional/test_owsproxy_app.py b/...her/tests/functional/test_owsproxy_app.py → tests/functional/test_owsproxy_app.py
diff --git a/...tests/functional/test_rpcinterface_app.py → tests/functional/test_rpcinterface_app.py b/...tests/functional/test_rpcinterface_app.py → tests/functional/test_rpcinterface_app.py
@@ -9,9 +9,9 @@
 from twitcher._compat import PY2
 from twitcher._compat import xmlrpclib
 
-from twitcher.tests.functional.common import setup_with_mongodb
-from twitcher.tests. functional.common import setup_mongodb_tokenstore
-from twitcher.tests.functional.common import setup_mongodb_servicestore
+from .common import setup_with_mongodb
+from .common import setup_mongodb_tokenstore
+from .common import setup_mongodb_servicestore
 
 
 class XMLRPCInterfaceAppTest(unittest.TestCase):

diff --git a/twitcher/tests/functional/test_wps_app.py → tests/functional/test_wps_app.py b/twitcher/tests/functional/test_wps_app.py → tests/functional/test_wps_app.py
@@ -10,7 +10,7 @@
 import unittest
 import webtest
 import pyramid.testing
-from twitcher.tests.functional.common import setup_with_mongodb, setup_mongodb_tokenstore
+from .common import setup_with_mongodb, setup_mongodb_tokenstore
 
 
 class WpsAppTest(unittest.TestCase):

diff --git a/...r/tests/resources/wms_caps_ncwms2_111.xml → tests/resources/wms_caps_ncwms2_111.xml b/...r/tests/resources/wms_caps_ncwms2_111.xml → tests/resources/wms_caps_ncwms2_111.xml
diff --git a/...r/tests/resources/wms_caps_ncwms2_130.xml → tests/resources/wms_caps_ncwms2_130.xml b/...r/tests/resources/wms_caps_ncwms2_130.xml → tests/resources/wms_caps_ncwms2_130.xml
diff --git a/twitcher/tests/resources/wps_caps_emu.xml → tests/resources/wps_caps_emu.xml b/twitcher/tests/resources/wps_caps_emu.xml → tests/resources/wps_caps_emu.xml
diff --git a/twitcher/tests/store/__init__.py → tests/store/__init__.py b/twitcher/tests/store/__init__.py → tests/store/__init__.py
diff --git a/twitcher/tests/store/test_memory.py → tests/store/test_memory.py b/twitcher/tests/store/test_memory.py → tests/store/test_memory.py
diff --git a/twitcher/tests/store/test_mongodb.py → tests/store/test_mongodb.py b/twitcher/tests/store/test_mongodb.py → tests/store/test_mongodb.py
diff --git a/twitcher/tests/test_api.py → tests/test_api.py b/twitcher/tests/test_api.py → tests/test_api.py
diff --git a/twitcher/tests/test_datatype.py → tests/test_datatype.py b/twitcher/tests/test_datatype.py → tests/test_datatype.py
diff --git a/twitcher/tests/test_esgf.py → tests/test_esgf.py b/twitcher/tests/test_esgf.py → tests/test_esgf.py
diff --git a/twitcher/tests/test_namesgenerator.py → tests/test_namesgenerator.py b/twitcher/tests/test_namesgenerator.py → tests/test_namesgenerator.py
diff --git a/twitcher/tests/test_owsproxy.py → tests/test_owsproxy.py b/twitcher/tests/test_owsproxy.py → tests/test_owsproxy.py
diff --git a/twitcher/tests/test_owsrequest_wms.py → tests/test_owsrequest_wms.py b/twitcher/tests/test_owsrequest_wms.py → tests/test_owsrequest_wms.py
diff --git a/twitcher/tests/test_owsrequest_wps.py → tests/test_owsrequest_wps.py b/twitcher/tests/test_owsrequest_wps.py → tests/test_owsrequest_wps.py
diff --git a/twitcher/tests/test_owssecurity.py → tests/test_owssecurity.py b/twitcher/tests/test_owssecurity.py → tests/test_owssecurity.py
diff --git a/twitcher/tests/test_tokengenerator.py → tests/test_tokengenerator.py b/twitcher/tests/test_tokengenerator.py → tests/test_tokengenerator.py
diff --git a/twitcher/tests/test_utils.py → tests/test_utils.py b/twitcher/tests/test_utils.py → tests/test_utils.py
@@ -2,7 +2,7 @@
 from lxml import etree
 from twitcher import utils
 from twitcher.exceptions import ServiceNotFound
-from twitcher.tests.common import WPS_CAPS_EMU_XML, WMS_CAPS_NCWMS2_111_XML, WMS_CAPS_NCWMS2_130_XML
+from .common import WPS_CAPS_EMU_XML, WMS_CAPS_NCWMS2_111_XML, WMS_CAPS_NCWMS2_130_XML
 
 
 def test_is_url_valid():
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,3 +5,4 @@ requests @@
     requests_oauthlib
     pymongo
     argcomplete
+    pytz