Merge branch 'master' of https://github.com/thouska/spotpy

thouska · Sep 18, 2019 · 88bdef3 · 88bdef3
2 parents 6ba06f9 + df1b4f5
commit 88bdef3
Show file tree

Hide file tree

Showing 15 changed files with 5,851 additions and 13 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -31,9 +31,8 @@ install:
 
 
 script:
-  - pip uninstall spotpy -y
   - py.test  tests/test_* --cov spotpy --cov-report term-missing -v
-  - mpirun -c 4 python spotpy/examples/dds/dds_parallel.py 100
-
+#  - mpirun -c 4 python spotpy/examples/tutorial_parallel_computing_hymod.py 100
+  - pip uninstall spotpy -y
 after_success:
   - coveralls
diff --git a/setup.py b/setup.py
@@ -17,6 +17,7 @@
   package_data={
    'spotpy.examples.hymod_exe': ['*'],
    'spotpy.examples.hymod_python': ['*'],
+   'spotpy.examples.hymod_unix': ['*'],
    },
   #include_package_data = True,
   use_2to3 = True,