Add runner script as setup.py entry_point.

tardis-sn · Jul 11, 2016 · d5d7532 · d5d7532
1 parent ed5f3f7
commit d5d7532
Show file tree

Hide file tree

Showing 14 changed files with 11 additions and 7 deletions.
diff --git a/setup.py b/setup.py
@@ -106,6 +106,10 @@
     hook_func = 'astropy.utils.release:' + '_'.join(hook)
     entry_points[hook_ep] = ['%s = %s' % (hook_name, hook_func)]
 
+entry_points['console_scripts'] = [
+    'tardis_test_runner = tardis.tests.integration_tests.runner:run_tests'
+]
+
 #from Cython.Build import cythonize
 #package_info['ext_modules'] = cythonize(package_info['ext_modules'])
 # Include all .c files, recursively, including those generated by

diff --git a/tardis/tests/tests_slow/__init__.py → tardis/tests/integration_tests/__init__.py b/tardis/tests/tests_slow/__init__.py → tardis/tests/integration_tests/__init__.py
diff --git a/tardis/tests/tests_slow/at/abundances.dat → ...tests/integration_tests/at/abundances.dat b/tardis/tests/tests_slow/at/abundances.dat → ...tests/integration_tests/at/abundances.dat
diff --git a/tardis/tests/tests_slow/at/config.yml → tardis/tests/integration_tests/at/config.yml b/tardis/tests/tests_slow/at/config.yml → tardis/tests/integration_tests/at/config.yml
diff --git a/tardis/tests/tests_slow/at/densities.dat → .../tests/integration_tests/at/densities.dat b/tardis/tests/tests_slow/at/densities.dat → .../tests/integration_tests/at/densities.dat
diff --git a/tardis/tests/tests_slow/conftest.py → tardis/tests/integration_tests/conftest.py b/tardis/tests/tests_slow/conftest.py → tardis/tests/integration_tests/conftest.py
@@ -5,8 +5,8 @@
 import pytest
 
 from tardis import __githash__ as tardis_githash
-from tardis.tests.tests_slow.report import DokuReport
-from tardis.tests.tests_slow.plot_helpers import PlotUploader
+from tardis.tests.integration_tests.report import DokuReport
+from tardis.tests.integration_tests.plot_helpers import PlotUploader
 
 
 def pytest_configure(config):

diff --git a/tardis/tests/tests_slow/plot_helpers.py → ...s/tests/integration_tests/plot_helpers.py b/tardis/tests/tests_slow/plot_helpers.py → ...s/tests/integration_tests/plot_helpers.py
diff --git a/tardis/tests/tests_slow/report.py → tardis/tests/integration_tests/report.py b/tardis/tests/tests_slow/report.py → tardis/tests/integration_tests/report.py
diff --git a/tardis/tests/tests_slow/runner.py → tardis/tests/integration_tests/runner.py b/tardis/tests/tests_slow/runner.py → tardis/tests/integration_tests/runner.py
@@ -18,7 +18,7 @@
                     help="Path to atomic dataset.")
 
 
-if __name__ == "__main__":
+def run_tests():
     args = parser.parse_args()
     while True:
         gh_request = requests.get(
@@ -34,7 +34,7 @@
 
             subprocess.call([
                 "python", "setup.py", "test",
-                "--test-path=tardis/tests/tests_slow/test_integration.py", "--args",
+                "--test-path=tardis/tests/integration_tests/test_integration.py", "--args",
                 "-rs --integration-tests={0} --atomic-dataset={1} --remote-data".format(
                     args.yaml_filepath, args.atomic_dataset
                 )

diff --git a/tardis/tests/tests_slow/test_integration.py → ...sts/integration_tests/test_integration.py b/tardis/tests/tests_slow/test_integration.py → ...sts/integration_tests/test_integration.py
@@ -14,7 +14,7 @@
                     reason="integration tests are not included in this run")
 class TestIntegration(object):
     """Slow integration test for various setups present in subdirectories of
-    ``tardis/tests/tests_slow``.
+    ``tardis/tests/integration_tests``.
     """
 
     @classmethod

diff --git a/tardis/tests/tests_slow/w7/abundances.dat → ...tests/integration_tests/w7/abundances.dat b/tardis/tests/tests_slow/w7/abundances.dat → ...tests/integration_tests/w7/abundances.dat
diff --git a/tardis/tests/tests_slow/w7/config.yml → tardis/tests/integration_tests/w7/config.yml b/tardis/tests/tests_slow/w7/config.yml → tardis/tests/integration_tests/w7/config.yml
diff --git a/tardis/tests/tests_slow/w7/densities.dat → .../tests/integration_tests/w7/densities.dat b/tardis/tests/tests_slow/w7/densities.dat → .../tests/integration_tests/w7/densities.dat
diff --git a/tardis/tests/setup_package.py b/tardis/tests/setup_package.py
@@ -2,5 +2,5 @@ def get_package_data():
     return {
         _ASTROPY_PACKAGE_NAME_ + '.tests': ['coveragerc', 'data/*.h5',
                                             'data/*.dat', 'data/*.npy',
-                                            'tests_slow/*/*.yml',
-                                            'tests_slow/*/*.dat']}
+                                            'integration_tests/*/*.yml',
+                                            'integration_tests/*/*.dat']}