Merge branch 'master' into PADDS_v05

* master: Update version number thouska#223 # Conflicts: # spotpy/__init__.py
bees4ever · Jul 31, 2019 · ff2f4ce · ff2f4ce
2 parents cf73bf9 + 269a5a7
commit ff2f4ce
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/setup.py b/setup.py
@@ -5,7 +5,7 @@
 
 setup(
   name = 'spotpy',
-  version = '1.5.1',
+  version = '1.5.2',
   description = 'A Statistical Parameter Optimization Tool',
   long_description=open(os.path.join(os.path.dirname(__file__),
                                        "README.rst")).read(),

diff --git a/spotpy/__init__.py b/spotpy/__init__.py
@@ -39,4 +39,4 @@
 from . import describe            # Contains some helper functions to describe smaplers and setups
 from .hydrology import signatures # Quantifies goodness of fit between simulation and evaluation data with hydrological signatures
 from . import unittests
-__version__ = '1.5.1'
+__version__ = '1.5.2'