Moves tests on toplevel, partly removes jit from hymod_python.py #226

.travis.yml

@@ -32,8 +32,8 @@ install:
 
 script:
   - pip uninstall spotpy -y
-  - py.test  spotpy/tests/test_* --cov spotpy --cov-report term-missing -v
-  - mpirun -c 2 python spotpy/examples/dds/dds_parallel.py 10
+  - py.test  tests/test_* --cov spotpy --cov-report term-missing -v
+  - mpirun -c 4 python spotpy/examples/dds/dds_parallel.py 100
 
 after_success:
   - coveralls

setup.py

@@ -28,9 +28,9 @@
         'License :: OSI Approved :: MIT License',
         'Operating System :: OS Independent',
         'Programming Language :: Python',
-        'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
         'Topic :: Software Development :: Libraries :: Python Modules'],
         )

spotpy/examples/hymod_python/hymod.py

@@ -1,6 +1,6 @@
 from numba import jit
 
-@jit
+
 def hymod(Precip, PET, cmax,bexp,alpha,Rs,Rq):
     """
     See https://www.proc-iahs.net/368/180/2015/piahs-368-180-2015.pdf for a scientific paper.
@@ -22,7 +22,6 @@ def hymod(Precip, PET, cmax,bexp,alpha,Rs,Rq):
     # Initialize state(s) of quick tank(s)
     x_quick = [0,0,0]
     t = 0
-    outflow = []
     output = []
     # START PROGRAMMING LOOP WITH DETERMINING RAINFALL - RUNOFF AMOUNTS
 
@@ -50,7 +49,6 @@ def hymod(Precip, PET, cmax,bexp,alpha,Rs,Rq):
         output.append(QS + outflow)
         t = t+1
 
-
     return output
 
 @jit

spotpy/tests/test_fast.py → tests/test_fast.py

@@ -14,7 +14,6 @@
     sys.path.append(".")
     import spotpy
 
-
 from spotpy.examples.spot_setup_hymod_python import spot_setup
 
 # Test only untder Python 3 as lower versions results in a strange fft error

spotpy/tests/test_padds.py → tests/test_padds.py

@@ -9,7 +9,7 @@
 import numpy as np
 
 from spotpy.examples.tutorial_padds import padds_spot_setup
-from spotpy.tests.test_dds import FixedRandomizer
+from tests.test_dds import FixedRandomizer
 
 try:
     import spotpy

spotpy/tests/test_parallel.py → tests/test_parallel.py

@@ -18,7 +18,7 @@ def setUpClass(self):
         # How many digits to match in case of floating point answers
         self.tolerance = 7
         #Create samplers for every algorithm:
-        self.rep = 987
+        self.rep = 21
         self.timeout = 10 #Given in Seconds
 
         self.dbformat = "ram"

spotpy/tests/test_setup_parameters.py → tests/test_setup_parameters.py

@@ -110,7 +110,7 @@ def test_create(self):
     def test_assign(self):
         values = [1] * len(self.ps)
         self.ps(*values)
-        self.assertEquals(list(self.ps), values)
+        self.assertEqual(list(self.ps), values)
         # Test if wrong number of parameters raises
         with self.assertRaises(ValueError):
             self.ps(*values[:-1])
@@ -119,13 +119,13 @@ def test_iter(self):
         values = [1] * len(self.ps)
         self.ps(*values)
         ps_values = list(self.ps)
-        self.assertEquals(values, ps_values)
+        self.assertEqual(values, ps_values)
 
     def test_getitem(self):
         values = [1] * len(self.ps)
         self.ps(*values)
-        self.assertEquals(self.ps['a'], 1.0)
-        self.assertEquals(self.ps[0], 1.0)
+        self.assertEqual(self.ps['a'], 1.0)
+        self.assertEqual(self.ps[0], 1.0)
 
     def test_getattr(self):
         values = [1] * len(self.ps)
@@ -134,15 +134,15 @@ def test_getattr(self):
         with self.assertRaises(AttributeError):
             _ = self.ps.__x
 
-        self.assertEquals(self.ps.a, 1.0)
-        self.assertEquals(list(self.ps.random), list(self.ps), 'Access to random variable does not equal list of names')
+        self.assertEqual(self.ps.a, 1.0)
+        self.assertEqual(list(self.ps.random), list(self.ps), 'Access to random variable does not equal list of names')
 
         with self.assertRaises(AttributeError):
             _ = self.ps.x
 
     def test_setattr(self):
         self.ps.a = 2
-        self.assertEquals(self.ps[0], 2)
+        self.assertEqual(self.ps[0], 2)
 
     def test_dir(self):
         values = [1] * len(self.ps)
@@ -157,12 +157,12 @@ def test_dir(self):
     def test_str(self):
         values = [1] * len(self.ps)
         self.ps(*values)
-        self.assertEquals(str(self.ps), 'parameters(a=1, b=1, c=1, d=1)')
+        self.assertEqual(str(self.ps), 'parameters(a=1, b=1, c=1, d=1)')
 
     def test_repr(self):
         values = [1] * len(self.ps)
         self.ps(*values)
-        self.assertEquals(repr(self.ps), 'spotpy.parameter.ParameterSet()')
+        self.assertEqual(repr(self.ps), 'spotpy.parameter.ParameterSet()')
 
 
 class TestSetupVariants(unittest.TestCase):

spotpy/tests/test_signatures.py → tests/test_signatures.py

@@ -14,8 +14,6 @@
     import spotpy
 
 from spotpy.hydrology.signatures import SignatureMethod
-
-
 import spotpy.hydrology as sig
 
 class TestSignatures(unittest.TestCase):