fix settings filename in setup.py; update tox configuration; removed some dev packages from requirements.txt/environment.yal #75

Author: domeniconappo

VERSION

@@ -1 +1 @@
-3.0.1
+3.0.1.post1

environment.yml

@@ -117,7 +117,6 @@ dependencies:
     - cftime==1.0.4.2
     - chardet==3.0.4
     - colorama==0.4.3
-    - coverage==5.0.3
     - cryptography==3.1.1
     - cython==0.29.14
     - dask==2.7.0
@@ -126,7 +125,6 @@ dependencies:
     - docutils==0.15.2
     - entrypoints==0.3
     - filelock==3.0.12
-    - flake8==3.7.9
     - future==0.18.0
     - future-fstrings==1.2.0
     - gdal==3.1.2
@@ -168,10 +166,6 @@ dependencies:
     - pygsp==0.5.1
     - pyparsing==2.4.2
     - pyproj==2.4.0
-    - pytest==5.2.1
-    - pytest-cov==2.8.1
-    - pytest-env==0.6.2
-    - pytest-mock==2.0.0
     - python-dateutil==2.8.1
     - pytz==2019.3
     - pyyaml==5.3
@@ -190,10 +184,8 @@ dependencies:
     - threadpoolctl==2.1.0
     - toml==0.10.0
     - toolz==0.10.0
-    - tox==3.14.0
     - tqdm==4.36.1
     - traitlets==4.3.3
-    - twine==3.2.0
     - urllib3==1.25.6
     - virtualenv==16.7.6
     - wcwidth==0.1.7

requirements.txt

@@ -2,19 +2,16 @@ atomicwrites==1.3.0
 attrs==19.3.0
 backcall==0.1.0
 beautifulsoup4==4.8.1
-bleach==3.1.4
 certifi==2019.11.28
 cftime==1.0.4.2
 chardet==3.0.4
-coverage==5.0.3
 Cython==0.29.14
 dask==2.7.0
 decorator==4.4.1
 docopt==0.6.2
 docutils==0.15.2
 entrypoints==0.3
 filelock==3.0.12
-flake8==3.7.9
 future==0.18.0
 future-fstrings==1.2.0
 gitdb2==2.0.6
@@ -49,10 +46,6 @@ Pygments==2.4.2
 PyGSP==0.5.1
 pyparsing==2.4.2
 pyproj==2.4.0
-pytest==5.2.1
-pytest-cov==2.8.1
-pytest-mock==2.0.0
-pytest-env==0.6.2
 python-dateutil==2.8.1
 pytz==2019.3
 readme-renderer==24.0
@@ -64,11 +57,9 @@ soupsieve==1.9.5
 tasklogger==1.0.0
 toml==0.10.0
 toolz==0.10.0
-tox==3.14.0
 tqdm==4.36.1
 traitlets==4.3.3
 urllib3==1.25.6
-virtualenv==16.7.6
 wcwidth==0.1.7
 webencodings==0.5.1
 xarray==0.15.1

setup.py

@@ -13,9 +13,16 @@
 See the Licence for the specific language governing permissions and limitations under the Licence.
 
 ---------------------------------------------------------------------------------------------------------------------------------------
-Use python setup.y upload to publish versioned tags and pypi package
+Use python setup.y publish to publish versioned tags and pypi package
 
-python setup.py upload
+IMPORTANT Note:
+To test pip installation:
+python setup.py testpypi
+pip install --index-url https://test.pypi.org/simple/ lisflood-model==2.8.14
+
+To publish on PyPi:
+
+python setup.py publish
 
 It's equivalent to:
 
@@ -24,15 +31,8 @@
 3. git tag {version}
 4. git push --tags
 
-Note: To upload new package on PyPi Test:
-python setup.py testpypi
-
 Install
 
-3a. Test package install
-pip install --index-url https://test.pypi.org/simple/ lisflood-model==2.8.14
-
-3b. In prod:
 pip install lisflood-model
 """
 
@@ -162,7 +162,7 @@ def _get_gdal_version():
     package_dir={'': 'src/'},
     py_modules=[os.path.splitext(os.path.basename(path))[0] for path in glob('src/*.py*')],
     include_package_data=True,
-    data_files=[('', ['VERSION']), ('settings', ['src/settings_tpl.xml'])],
+    data_files=[('', ['VERSION']), ('settings', ['src/lisfloodSettings_reference.xml'])],
     packages=find_packages('src'),
     long_description=long_description,
     long_description_content_type='text/markdown',

tox.ini

@@ -1,33 +1,25 @@
 [tox]
-envlist = py27,py36,py37
+
+envlist = py36,py37
 skip_missing_interpreters=True
 skipsdist=True
-deps =
-    pytest
 
-[testenv:py27]
+[testenv]
+deps=
+    pytest-sugar
+    pytest-cov
+    pytest-mock
+    pytest-env
+    pytest
 usedevelop=True
-deps =
-    GDAL==2.2.3
-    -rrequirements27.txt
-setenv =
-    PYTHONPATH=/opt/pcraster27/python
-commands =
-    pytest -x -l -ra tests/
 
-[testenv:py36]
-usedevelop=True
-deps =
-    GDAL==2.2.3
-    -rrequirements.txt
-commands =
-    pytest -x -l -ra --cov=lisflood --cov-config=.coveragerc tests/
+conda_env=
+    environment.yml
+conda_channels=
+    conda-forge
+conda_install_args=
+    --override-channels
 
-[testenv:py37]
-usedevelop=True
-deps =
-    GDAL==2.2.3
-    -rrequirements.txt
 commands =
     pytest -x -l -ra --cov=lisflood --cov-config=.coveragerc tests/