switched to Python 3.6

appveyor.yml

@@ -1,9 +1,9 @@
+# version here is only relevant for the AppVeyor CI, no need to adjust
 version: '{build}'
-# version here is only relevant for the appveyor CI, no need to adjust
 
 environment:
   global:
-    PYTHON_LOC: "C:\\Miniconda35-x64"
+    PYTHON_LOC: "C:\\Miniconda36-x64"
 
 install:
   - call %PYTHON_LOC%\Scripts\activate.bat

cate/version.py

@@ -20,4 +20,4 @@
 # SOFTWARE.
 
 #: Cate version string (PEP440-compatible).
-__version__ = '0.8.0rc3'
+__version__ = '0.8.0rc4'

environment-rtd.yml

@@ -4,48 +4,14 @@ channels:
   - defaults
 dependencies:
   # rdt has currently no higher version
-  - python=3.5*
+  - python=3.6*
   #
   # for testing
   #
   - pytest
   - pytest-cov
-  #
-  # dependencies (in alphabetical order)
-  #
-  #- cartopy (excluded for rtd, mocked instead)
-  #- dask >=0.14
-  #- fiona >=1.7 (excluded for rtd, mocked instead)
-  #- geopandas>=0.2 (excluded for rtd, mocked instead)
-  #- jdcal >=1.3 (excluded for rtd, mocked instead)
-  #- matplotlib=1.5* (excluded for rtd, mocked instead)
-  #- netcdf4 >=1.2 (excluded for rtd, mocked instead)
-  #- numba >=0.26 (excluded for rtd, mocked instead)
-  #- numpy >=1.7 (excluded for rtd, mocked instead)
-  #- pandas >=0.18 (excluded for rtd, mocked instead)
-  # readthedocs has a hard dependency on pillow 3.0.0
-  # https://github.com/rtfd/readthedocs.org/issues/2594
-  #- pillow ==3.0.0
-  #- pyproj >=1.9 (excluded for rtd, mocked instead)
-  #- pyqt=4* (excluded for rtd, mocked instead)
-  #- scipy >=0.17 (excluded for rtd, mocked instead)
-  #- shapely >=1.5 (excluded for rtd, mocked instead)
   - tornado
-  #- xarray >=0.9.1 (excluded for rtd, mocked instead)
-  #
-  # for these packages specific version are needed, lower minor version have errors
-  # they often get downgraded if not required explicitly
-  #- hdf4 >=4.2.12
-  #- geos >=3.5.1
-  #
-  # readthedocs specific
-  #
-  # for mocking all libraries we DON'T want/cant require
-  #- mock
-  # sphinx
-  #- sphinx
-  #- sphinx_rtd_theme
-  # v 0.2.0 of sphinx-argparse needs a greater commonmark version than rtd
+  # v 0.2.0 of sphinx-argparse needs a greater commonmark-parser version than rtd
   - sphinx-argparse ==0.1.17
   - pip:
     - sphinx_autodoc_annotation

environment.yml

@@ -3,7 +3,7 @@ channels:
   - conda-forge
   - defaults
 dependencies:
-  - python=3.5*
+  - python=3.6*
   #
   # for testing
   #
@@ -13,24 +13,25 @@ dependencies:
   #
   # dependencies (in alphabetical order)
   #
-  - cartopy
+  - cartop >=0.15
   - dask >=0.14
   - fiona >=1.7
   - geopandas >=0.2
   - jdcal >=1.3
-  - matplotlib=1.5*
+  - matplotlib >=2.0
   - netcdf4 >=1.2
-  - numba >=0.26
-  # 1.12 gave some trouble
-  - numpy=1.11*
-  - pandas >=0.18
-  - pillow >=4.0
-  - pyqt=4*
+  - numba >=0.33
+  # numpy 1.12 gave some trouble
+  - numpy >=1.11
+  # pandas 0.20 has deprecations that produce ugly warnings from xarray
+  - pandas=0.19
+  - pillow >=4.1
+  - pyqt >=5.6
   - pyproj >=1.9
-  - python-dateutil
-  - scipy >=0.17
+  - python-dateutil >=2.6
+  - scipy >=0.19
   - shapely >=1.5
-  - tornado >=4.4
+  - tornado >=4.5
   - xarray >=0.9.5
   #
   # for these packages specific version are needed, lower minor version have errors

setup-util.py

@@ -36,10 +36,10 @@
     author='Cate Development Team',
     packages=['cate', 'cate.util', 'cate.util.im', 'cate.util.web'],
     install_requires=[
-        'numpy >= 1.7',
+        'numpy',
         # Optional dependencies
-        # 'matplotlib >= 1.5,<2',
-        # 'tornado >= 4.4',
-        # 'pillow >= 4.0'
+        # 'matplotlib',
+        # 'tornado',
+        # 'pillow'
     ],
 )

setup.py

@@ -29,21 +29,21 @@
 # in alphabetical oder
 requirements = [
     'cartopy',
-    'dask >= 0.14',
-    'geopandas >= 0.2',
-    'fiona >= 1.7',
-    'jdcal >= 1.3',
-    'matplotlib >= 1.5,<2',
-    'netcdf4 >= 1.2',
-    'numba >= 0.26',
-    'numpy >= 1.7',
-    'pandas >= 0.18',
-    'pillow >= 4.0',
-    'pyproj >= 1.9',
-    'scipy >= 0.17',
-    'shapely >= 1.5',
-    'tornado >= 4.4',
-    'xarray >= 0.9.5',
+    'dask',
+    'geopandas',
+    'fiona',
+    'jdcal',
+    'matplotlib',
+    'netcdf4',
+    'numba',
+    'numpy',
+    'pandas',
+    'pillow',
+    'pyproj',
+    'scipy',
+    'shapely',
+    'tornado',
+    'xarray',
 ]
 
 on_rtd = os.environ.get('READTHEDOCS') == 'True'