Testing fixes

.travis.yml

@@ -1,8 +1,8 @@
 language: python
 python:
-  - "3.4"
-  - "3.5"
   - "3.6"
+  - "3.7"
+
 env:
   - NUMPY=1.12
   - NUMPY=1.13

tests/__init__.py

@@ -15,4 +15,4 @@ def run_tests(directory, pattern='test*.py'):
     # run test discovery
     test_suite = unittest.defaultTestLoader.discover(directory, pattern)
     # run test runner
-    runner.run(test_suite)
+    runner.run(test_suite)

tests/_test_all.py

@@ -1,7 +1,18 @@
 """Test the entire package; an underscore precedes this file name
 so it does not include itself in the test discovery."""
 import os.path as osp
-from tests import run_tests
+import unittest
+
+# from tests import run_tests
+
+
+def run_tests(directory, pattern='test*.py'):
+    # import a runner to run tests
+    runner = unittest.TextTestRunner()
+    # run test discovery
+    test_suite = unittest.defaultTestLoader.discover(directory, pattern)
+    # run test runner
+    runner.run(test_suite)
 
 test_dir = osp.dirname(__file__)
 run_tests(test_dir)

tests/test_tg51.py

@@ -400,5 +400,5 @@ class IMMC_TB_20E_Modern(TestTG51ElectronModern, TestCase):
     m_reduced = 19.437
     i_50 = 8.22
     clinical_pdd = 96.8
-    dose_mu_dref = 0.980
-    dose_mu_dmax = 1.013
+    dose_mu_dref = 0.974
+    dose_mu_dmax = 1.006

tests/test_trs398.py

@@ -134,10 +134,10 @@ class MDA_TB1_2015_10x(TestTRS398Photon, TestCase):
     m_reduced = 27.635
     clinical_pdd_zref = 73.5
     dose_mu_zref = 0.734
-    dose_mu_zmax = 1.000
+    dose_mu_zmax = 0.998
     tpr2010 = (73.42/73.7) * trs398.tpr2010_from_pdd2010(pdd2010=46.3/73.7)
-    open_pdf = True
-    print_data = True
+    # open_pdf = True
+    # print_data = True
 
 
 class ACB5_2011_6x(TestTRS398Photon, TestCase):

tests/test_vmat.py

@@ -74,7 +74,6 @@ class VMATMixin:
     klass = object
     filepaths = Union[str, List]
     is_zip = False
-    x_offset = 0
     segment_positions = {1: Point(100, 200)}
     segment_values = {
         0: {'r_dev': 0, 'r_corr': 100},
@@ -133,11 +132,10 @@ class TestDRGSDemo(VMATMixin, TestCase):
     avg_abs_r_deviation = 0.46
     avg_r_deviation = 0
     max_r_deviation = 0.96
-    x_offset = 20
 
     def setUp(self):
         self.vmat = DRGS.from_demo_images()
-        self.vmat.analyze(x_offset=self.x_offset)
+        self.vmat.analyze()
 
     def test_demo(self):
         """Run the demo; no errors should arise."""
@@ -157,7 +155,7 @@ class TestDRMLCDemo(VMATMixin, TestCase):
 
     def setUp(self):
         self.vmat = DRMLC.from_demo_images()
-        self.vmat.analyze(x_offset=self.x_offset)
+        self.vmat.analyze()
 
     def test_demo(self):
         self.vmat.run_demo()