use pytest as nose is deprecated; move docs requirements to setup.py

.travis.yml

@@ -62,8 +62,9 @@ before_install:
 # Install required python packages
 #-----------------------------------------------------------------------------
 - conda config --add channels conda-forge
-- conda install --yes cmake gdal future netcdf4 nose numpy pandas pyproj pytz requests rtree scipy shapely
-- pip install coveralls nose-cov
+- conda install --yes cmake gdal future netcdf4 numpy pandas pyproj pytz requests rtree scipy shapely
+- conda install --yes pytest-cov
+- pip install coveralls
 - source deactivate rapid
 
 #-------------------------------------------------------------------------------
@@ -109,7 +110,7 @@ install:
 #*******************************************************************************
 - cd $TRAVIS_BUILD_DIR/tests
 script:
-- nosetests --with-cov --cov-report term-missing --cov RAPIDpy
+- py.test --cov-report term-missing --cov=RAPIDpy
 ##ADD Coveralls stats for code coverage
 after_success:
 - coveralls

appveyor.yml

@@ -21,8 +21,9 @@ install:
   - activate rapid
   # Install required python packages
   - conda config --add channels conda-forge
-  - conda install --yes cmake gdal future netcdf4 nose numpy pandas pyproj pytz requests rtree scipy shapely
-  - pip install coveralls nose-cov
+  - conda install --yes cmake gdal future netcdf4 numpy pandas pyproj pytz requests rtree scipy shapely
+  - conda install --yes pytest-cov
+  - pip install coveralls
   - deactivate rapid
   #install cygwin
   - '%CYG_ROOT%\setup-x86_64.exe -qnNdO -R "%CYG_ROOT%" -s "%CYG_MIRROR%" -l "%CYG_CACHE%" -P gcc-core,gcc-g++,gcc-fortran,gdb,git,make,time,wget,gdal,libgdal-devel,openmpi > NULL'
@@ -47,6 +48,6 @@ install:
 build: false
 
 test_script:
-  - "nosetests --with-cov --cov-report term-missing --cov RAPIDpy"
+  - py.test --cov-report term-missing --cov=RAPIDpy
 on_success:
  - 'coveralls'

conda-env.yml

@@ -10,8 +10,6 @@ channels:
 - defaults
 dependencies:
 - python=2
-- mock
-- nose
 - numpy
 - pandas
 - scipy
@@ -21,9 +19,7 @@ dependencies:
 - pyproj
 - python-dateutil
 - rtree
-- sphinx
 - pip:
   - future
   - requests
   - six
-  - sphinxcontrib-napoleon

readthedocs.yml

@@ -2,4 +2,6 @@ conda:
     file: conda-env.yml
 python:
     version: 2
-    setup_py_install: true
+    pip_install: true
+    extra_requirements:
+        - docs

setup.py

@@ -2,7 +2,7 @@
 
 setup(
     name='RAPIDpy',
-    version='2.4.2',
+    version='2.4.3',
     description='Python interface for RAPID (rapid-hub.org)',
     long_description='RAPIDpy is a python interface for RAPID that assists to prepare inputs, runs the RAPID program,'
                      ' and provides post-processing utilities (https://github.com/erdc-cm/RAPIDpy). More information '
@@ -28,4 +28,16 @@
                 'Programming Language :: Python :: 3',
                 'Programming Language :: Python :: 3.5',
                 ],
+    extras_require={
+        'tests': [
+            'pytest',
+            'pytest-cov',
+        ],
+        'docs': [
+            'mock',
+            'sphinx',
+            'sphinx_rtd_theme',
+            'sphinxcontrib-napoleon',
+        ]
+      },
 )