Merge pull request #2 from fispact/move_tests

thomasms · web-flow · commit d84d17e7dcfb · 2018-02-28T09:07:51.000Z
Moved tests out of package and fixes to pypi setup.
diff --git a/.coveragerc b/.coveragerc
@@ -1,2 +1,2 @@
 [run]
-omit = pypact/tests/*
+omit = tests/*
diff --git a/.travis.yml b/.travis.yml
@@ -12,7 +12,7 @@ before_script:
 script:
   - pip3 install -e $PYPACT
   - python $PYPACT/setup.py test
-  - coverage run $PYPACT/pypact/tests/testsuite.py
+  - coverage run $PYPACT/tests/testsuite.py
   - pylint -j4 $PYPACT/pypact --rcfile=$PYPACT/.pylintrc || true
   - fispactconverter.py $PYPACT/reference/test31.out test31.json
 #  - diff test31.json $PYPACT/reference/test31.json
diff --git a/pypact/tests/testsuite.py b/pypact/tests/testsuite.py
diff --git a/pytest.ini b/pytest.ini
@@ -1,3 +1,3 @@
 [pytest]
 addopts = --cov-config .coveragerc --cov=./pypact
-python_files = pypact/tests/testsuite.py
+python_files = tests/testsuite.py
diff --git a/setup.py b/setup.py
@@ -2,19 +2,24 @@
 
 
 setup(name='pypact',
-      version='1.1.0',
+      version='1.1.1',
       description='The package for reading and manipulating the fispact output text file.',
       url='https://github.com/fispact/pypact',
       author='UKAEA',
       author_email='thomas.stainer@ukaea.uk',
       license='Apache License 2.0',
       packages=[
-            'pypact'
+            'pypact',
+            'pypact.analysis',
+            'pypact.library',
+            'pypact.output',
+            'pypact.tools',
+            'pypact.util'
       ],
       install_requires=[],
       python_requires='>=3',
       scripts=['pypact/tools/fispactconverter.py'],
       setup_requires=['pytest-runner'],
-      test_suite='pypact.tests.testsuite',
+      test_suite='tests.testsuite',
       tests_require=['pytest'],
       zip_safe=False)
diff --git a/tests/__init__.py b/tests/__init__.py
diff --git a/tests/output/__init__.py b/tests/output/__init__.py
diff --git a/tests/output/baseoutputtest.py b/tests/output/baseoutputtest.py
@@ -1,6 +1,6 @@
 import os
 from pypact.filerecord import FileRecord
-from pypact.tests.testerbase import Tester, REFERENCE_DIR
+from tests.testerbase import Tester, REFERENCE_DIR
 
 
 class BaseOutputUnitTest(Tester):
diff --git a/tests/output/doseratetest.py b/tests/output/doseratetest.py
@@ -1,7 +1,9 @@
 import math
+
+from tests.output.baseoutputtest import BaseOutputUnitTest
+
 from pypact.util.numerical import nan
 from pypact.filerecord import FileRecord
-from pypact.tests.output.baseoutputtest import BaseOutputUnitTest
 from pypact.output.doserate import DoseRate
 
 
diff --git a/tests/output/nuclidestest.py b/tests/output/nuclidestest.py
@@ -1,4 +1,5 @@
-from pypact.tests.output.baseoutputtest import BaseOutputUnitTest
+from tests.output.baseoutputtest import BaseOutputUnitTest
+
 from pypact.output.nuclides import Nuclides
 from pypact.output.nuclide import Nuclide
 
diff --git a/tests/output/outputtest.py b/tests/output/outputtest.py
@@ -1,6 +1,7 @@
-from pypact.tests.output.baseoutputtest import BaseOutputUnitTest
-from pypact.tests.output.rundatatest import RunDataAssertor
-from pypact.tests.output.timesteptest import TimeStepAssertor
+from tests.output.baseoutputtest import BaseOutputUnitTest
+from tests.output.rundatatest import RunDataAssertor
+from tests.output.timesteptest import TimeStepAssertor
+
 from pypact.output.output import Output
 
 
diff --git a/tests/output/rundatatest.py b/tests/output/rundatatest.py
@@ -1,4 +1,5 @@
-from pypact.tests.output.baseoutputtest import BaseOutputUnitTest
+from tests.output.baseoutputtest import BaseOutputUnitTest
+
 from pypact.output.rundata import RunData
 
 
diff --git a/tests/output/timesteptest.py b/tests/output/timesteptest.py
@@ -1,6 +1,7 @@
-from pypact.tests.output.baseoutputtest import BaseOutputUnitTest
-from pypact.tests.output.doseratetest import DoseRateAssertor
-from pypact.tests.output.nuclidestest import NuclidesAssertor
+from tests.output.baseoutputtest import BaseOutputUnitTest
+from tests.output.doseratetest import DoseRateAssertor
+from tests.output.nuclidestest import NuclidesAssertor
+
 from pypact.output.timestep import TimeStep
 
 
diff --git a/tests/testerbase.py b/tests/testerbase.py
@@ -3,7 +3,7 @@
 import os
 
 REFERENCE_DIR = os.path.join(os.path.dirname(os.path.abspath(__file__)),
-                             '..', '..', 'reference')
+                             '..', 'reference')
 
 class Tester(unittest.TestCase):
 
diff --git a/tests/testsuite.py b/tests/testsuite.py
@@ -0,0 +1,18 @@
+import unittest
+
+from tests.util.filetest import FileUnitTest
+from tests.util.linestest import LinesUnitTest
+from tests.util.numericaltest import NumericalUnitTest
+from tests.util.propertyfindertest import PropertyFinderUnitTest
+from tests.output.doseratetest import DoseRateUnitTest
+from tests.output.rundatatest import RunDataUnitTest
+from tests.output.nuclidestest import NuclidesUnitTest
+from tests.output.timesteptest import TimeStepUnitTest
+from tests.output.outputtest import OutputUnitTest
+
+def main():
+    unittest.TextTestRunner(verbosity=3).run(unittest.TestSuite())
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/util/__init__.py b/tests/util/__init__.py
diff --git a/tests/util/filetest.py b/tests/util/filetest.py
@@ -1,6 +1,8 @@
 import unittest
 import os
-from pypact.tests.testerbase import REFERENCE_DIR
+
+from tests.testerbase import REFERENCE_DIR
+
 from pypact.util.file import *
 
 
diff --git a/tests/util/linestest.py b/tests/util/linestest.py
@@ -1,5 +1,7 @@
 import os
-from pypact.tests.testerbase import Tester, REFERENCE_DIR
+
+from tests.testerbase import Tester, REFERENCE_DIR
+
 import pypact.util.lines as lines
 from pypact.util.file import content_as_str
 
diff --git a/tests/util/numericaltest.py b/tests/util/numericaltest.py
diff --git a/tests/util/propertyfindertest.py b/tests/util/propertyfindertest.py
@@ -1,5 +1,7 @@
 import os
-from pypact.tests.testerbase import Tester, REFERENCE_DIR
+
+from tests.testerbase import Tester, REFERENCE_DIR
+
 import pypact.util.propertyfinder as pf
 from pypact.util.file import content_as_str
 
diff --git a/update_on_pypi.sh b/update_on_pypi.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+python3 setup.py test
+python3 setup.py sdist
+python3 setup.py bdist_wheel
+twine upload dist/*

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`[run]`
`2`		`-omit = pypact/tests/*`
	`2`	`+omit = tests/*`