Update requirements (#70)

* ci update python versions * nit * update requirements in doc * update release notes
xarray-contrib · Dec 10, 2019 · 477e996 · 477e996
1 parent a3fd84a
commit 477e996
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 29 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -11,30 +11,26 @@ branches:
 matrix:
   fast_finish: True
   include:
-    - python: 3.5
-      env: CONDA_ENV=py35
     - python: 3.6
       env: CONDA_ENV=py36
     - python: 3.7
       env: CONDA_ENV=py37
-    - python: 3.6
-      env: CONDA_ENV=py36-xarray-dev
-    - python: 3.6
-      env: CONDA_ENV=py36-attrs-dev
-    - python: 3.5
+    - python: 3.8
+      env: CONDA_ENV=py38
+    - python: 3.7
+      env: CONDA_ENV=py37-xarray-dev
+    - python: 3.7
+      env: CONDA_ENV=py37-attrs-dev
+    - python: 3.7
       env: CONDA_ENV=docs
   allow_failures:
-    - python: 3.6
-      env: CONDA_ENV=py36-xarray-dev
-    - python: 3.6
-      env: CONDA_ENV=py36-attrs-dev
+    - python: 3.7
+      env: CONDA_ENV=py37-xarray-dev
+    - python: 3.7
+      env: CONDA_ENV=py37-attrs-dev
 
 before_install:
-  - if [[ "$TRAVIS_PYTHON_VERSION" == "2.7" ]]; then
-      wget http://repo.continuum.io/miniconda/Miniconda2-latest-Linux-x86_64.sh -O miniconda.sh;
-    else
-      wget http://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh;
-    fi
+  - wget http://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh;
   - bash miniconda.sh -b -p $HOME/miniconda
   - export PATH="$HOME/miniconda/bin:$PATH"
   - hash -r

diff --git a/ci/requirements-py36-attrs-dev.yml → ci/requirements-py37-attrs-dev.yml b/ci/requirements-py36-attrs-dev.yml → ci/requirements-py37-attrs-dev.yml
@@ -1,8 +1,8 @@
-name: test_env_py36-attrs-dev
+name: test_env_py37-attrs-dev
 channels:
   - conda-forge
 dependencies:
-  - python=3.6
+  - python=3.7
   - pytest
   - numpy
   - xarray

diff --git a/ci/requirements-py36-xarray-dev.yml → ci/requirements-py37-xarray-dev.yml b/ci/requirements-py36-xarray-dev.yml → ci/requirements-py37-xarray-dev.yml
@@ -1,9 +1,9 @@
-name: test_env_py36-xarray-dev
+name: test_env_py37-xarray-dev
 channels:
   - conda-forge
 dependencies:
   - attrs>=19.2.0
-  - python=3.6
+  - python=3.7
   - pytest
   - numpy
   - pip:

diff --git a/ci/requirements-py35.yml → ci/requirements-py38.yml b/ci/requirements-py35.yml → ci/requirements-py38.yml
@@ -1,9 +1,9 @@
-name: test_env_py35
+name: test_env_py38
 channels:
   - conda-forge
 dependencies:
   - attrs>=19.2.0
-  - python=3.5
+  - python=3.8
   - pytest
   - numpy
   - xarray

diff --git a/doc/installing.rst b/doc/installing.rst
@@ -6,8 +6,8 @@ Install xarray-simlab
 Required dependencies
 ---------------------
 
-- Python 3.5 or later.
-- `attrs <http://www.attrs.org>`__ (18.1.0 or later)
+- Python 3.6 or later.
+- `attrs <http://www.attrs.org>`__ (18.2.0 or later)
 - `numpy <http://www.numpy.org/>`__
 - `xarray <http://xarray.pydata.org>`__ (0.10.0 or later)
 
@@ -55,8 +55,8 @@ using conda_ to install them::
 A good practice (especially for development purpose) is to install the
 packages in a separate environment, e.g. using conda::
 
-    $ conda create -n simlab_py36 python=3.6 attrs xarray numpy pip -c conda-forge
-    $ source activate simlab_py36
+    $ conda create -n xsimlab python attrs xarray numpy pip -c conda-forge
+    $ source activate xsimlab
 
 Then you can clone the xarray-simlab git repository and install it
 using ``pip`` locally::

diff --git a/doc/whats_new.rst b/doc/whats_new.rst
@@ -6,7 +6,16 @@ Release Notes
 v0.4.0 (Unreleased)
 -------------------
 
+Breaking changes
+~~~~~~~~~~~~~~~~
+
+- Python 3.6 is now the oldest supported version (:issue:`70`).
+
+Bug fixes
+~~~~~~~~~
+
 - Remove ``attrs`` 19.2.0 depreciation warning (:issue:`68`).
+- Fix compatibility with xarray 0.14.1 (:issue:`69`).
 
 v0.3.0 (30 September 2019)
 --------------------------

diff --git a/xsimlab/process.py b/xsimlab/process.py
@@ -179,9 +179,9 @@ def put_in_store(self, value):
         target_str = target_var.name
 
     if target_type == VarType.GROUP:
-        raise ValueError("Variable {var!r} links to group variable {target!r}, "
-                         "which is not supported. Declare {var!r} as a group "
-                         "variable instead."
+        raise ValueError("Variable {var!r} links to group variable "
+                         "{target!r}, which is not supported. Declare {var!r} "
+                         "as a group variable instead."
                          .format(var=var.name, target=target_str))
 
     elif (var_type == VarType.FOREIGN and
@@ -243,6 +243,7 @@ class _RuntimeMethodExecutor:
     simulation.
 
     """
+
     def __init__(self, meth, args=None):
         self.meth = meth