DEP: drop python 2 support and associated ci mods (pydata#2637)

Joe Hamman · shoyer · commit faacc8da000b · 2019-01-01T20:52:03.000-08:00
* drop python 2 support and associated ci mods

* add py35-min env file

* fix python version in py37-windows env

* fix setup.py

* move iris and pynio to py36 env

* add cdms2 to 36 test env

* testing with UVCDAT_ANONYMOUS_LOG=no

* use pytest-env

* pip for pytest plugins
diff --git a/.travis.yml b/.travis.yml
@@ -10,8 +10,7 @@ branches:
 matrix:
   fast_finish: true
   include:
-  - env: CONDA_ENV=py27-min
-  - env: CONDA_ENV=py27-cdat+iris+pynio
+  - env: CONDA_ENV=py35-min
   - env: CONDA_ENV=py35
   - env: CONDA_ENV=py36
   - env: CONDA_ENV=py37
diff --git a/appveyor.yml b/appveyor.yml
@@ -7,15 +7,14 @@ branches:
 environment:
 
   matrix:
-    - PYTHON: "C:\\Python27-conda64"
-      PYTHON_VERSION: "2.7"
-      PYTHON_ARCH: "64"
-      CONDA_ENV: "py27-windows"
-
     - PYTHON: "C:\\Python36-conda64"
       PYTHON_VERSION: "3.6"
       PYTHON_ARCH: "64"
       CONDA_ENV: "py36-windows"
+    - PYTHON: "C:\\Python37-conda64"
+      PYTHON_VERSION: "3.7"
+      PYTHON_ARCH: "64"
+      CONDA_ENV: "py37-windows"
 
 install:
   # Install miniconda Python
diff --git a/ci/requirements-py27-cdat+iris+pynio.yml b/ci/requirements-py27-cdat+iris+pynio.yml
diff --git a/ci/requirements-py35-min.yml b/ci/requirements-py35-min.yml
@@ -1,11 +1,12 @@
 name: test_env
 dependencies:
-  - python=2.7
+  - python=3.5
   - pytest
   - flake8
   - mock
   - numpy=1.12
   - pandas=0.19
   - pip:
-    - coveralls
+    - pytest-env
     - pytest-cov
+    - coveralls
diff --git a/ci/requirements-py35.yml b/ci/requirements-py35.yml
@@ -10,6 +10,9 @@ dependencies:
   - matplotlib=1.5
   - netcdf4
   - pytest
+  - pytest-env
+  - pytest-cov
+  - coveralls
   - flake8
   - numpy
   - pandas
@@ -18,6 +21,3 @@ dependencies:
   - toolz
   - rasterio
   - zarr
-  - pip:
-    - coveralls
-    - pytest-cov
diff --git a/ci/requirements-py36-bottleneck-dev.yml b/ci/requirements-py36-bottleneck-dev.yml
@@ -11,6 +11,9 @@ dependencies:
   - matplotlib
   - netcdf4
   - pytest
+  - pytest-env
+  - pytest-cov
+  - coveralls
   - flake8
   - numpy
   - pandas
@@ -19,5 +22,3 @@ dependencies:
   - toolz
   - pip:
     - git+https://github.com/kwgoodman/bottleneck.git
-    - coveralls
-    - pytest-cov
diff --git a/ci/requirements-py36-condaforge-rc.yml b/ci/requirements-py36-condaforge-rc.yml
@@ -12,12 +12,12 @@ dependencies:
   - matplotlib
   - netcdf4
   - pytest
+  - pytest-env
+  - pytest-cov
+  - coveralls
   - flake8
   - numpy
   - pandas
   - seaborn
   - scipy
   - toolz
-  - pip:
-    - coveralls
-    - pytest-cov
diff --git a/ci/requirements-py36-dask-dev.yml b/ci/requirements-py36-dask-dev.yml
@@ -9,6 +9,9 @@ dependencies:
   - matplotlib
   - netcdf4
   - pytest
+  - pytest-env
+  - pytest-cov
+  - coveralls
   - flake8
   - numpy
   - pandas
@@ -20,7 +23,5 @@ dependencies:
   - zarr
   - pseudonetcdf>=3.0.1
   - pip:
-    - coveralls
-    - pytest-cov
     - git+https://github.com/dask/dask.git
     - git+https://github.com/dask/distributed.git
diff --git a/ci/requirements-py36-hypothesis.yml b/ci/requirements-py36-hypothesis.yml
@@ -10,6 +10,10 @@ dependencies:
   - matplotlib
   - netcdf4
   - pytest
+  - pytest-env
+  - pytest-cov
+  - coveralls
+  - hypothesis
   - flake8
   - numpy
   - pandas
@@ -19,9 +23,5 @@ dependencies:
   - rasterio
   - bottleneck
   - zarr
-  - pip:
-    - coveralls
-    - pytest-cov
-    - pydap
-    - lxml
-    - hypothesis
+  - pydap
+  - lxml
diff --git a/ci/requirements-py36-netcdf4-dev.yml b/ci/requirements-py36-netcdf4-dev.yml
@@ -10,13 +10,14 @@ dependencies:
   - h5netcdf
   - matplotlib
   - pytest
+  - pytest-env
+  - pytest-cov
+  - coveralls
   - flake8
   - numpy
   - pandas
   - scipy
   - toolz
   - pip:
-    - coveralls
-    - pytest-cov
     - git+https://github.com/Unidata/netcdf4-python.git
     - git+https://github.com/Unidata/cftime.git
diff --git a/ci/requirements-py36-pandas-dev.yml b/ci/requirements-py36-pandas-dev.yml
@@ -12,11 +12,12 @@ dependencies:
   - matplotlib
   - netcdf4
   - pytest
+  - pytest-env
+  - pytest-cov
+  - coveralls
   - flake8
   - numpy
   - scipy
   - toolz
   - pip:
-    - coveralls
-    - pytest-cov
     - git+https://github.com/pydata/pandas.git
diff --git a/ci/requirements-py36-pynio-dev.yml b/ci/requirements-py36-pynio-dev.yml
@@ -13,14 +13,14 @@ dependencies:
   - netcdf4
   - pynio=dev
   - pytest
+  - pytest-env
+  - pytest-cov
+  - coveralls
   - numpy
   - pandas
   - scipy
   - seaborn
   - toolz
   - rasterio
   - bottleneck
-  - pip:
-    - coveralls
-    - pytest-cov
-    - pydap
+  - pydap
diff --git a/ci/requirements-py36-rasterio.yml b/ci/requirements-py36-rasterio.yml
@@ -11,14 +11,14 @@ dependencies:
   - matplotlib
   - netcdf4
   - pytest
+  - pytest-env
+  - pytest-cov
+  - coveralls
   - numpy
   - pandas
   - scipy
   - seaborn
   - toolz
   - rasterio>=1.0
   - bottleneck
-  - pip:
-    - coveralls
-    - pytest-cov
-    - pydap
+  - pydap
diff --git a/ci/requirements-py36-windows.yml b/ci/requirements-py36-windows.yml
@@ -11,6 +11,7 @@ dependencies:
   - matplotlib
   - netcdf4
   - pytest
+  - pytest-env
   - numpy
   - pandas
   - scipy
diff --git a/ci/requirements-py36-zarr-dev.yml b/ci/requirements-py36-zarr-dev.yml
@@ -8,6 +8,9 @@ dependencies:
   - distributed
   - matplotlib
   - pytest
+  - pytest-env
+  - pytest-cov
+  - coveralls
   - flake8
   - numpy
   - pandas
@@ -16,6 +19,4 @@ dependencies:
   - toolz
   - bottleneck
   - pip:
-    - coveralls
-    - pytest-cov
     - git+https://github.com/zarr-developers/zarr.git
diff --git a/ci/requirements-py36.yml b/ci/requirements-py36.yml
@@ -11,6 +11,9 @@ dependencies:
   - matplotlib
   - netcdf4
   - pytest
+  - pytest-cov
+  - pytest-env
+  - coveralls
   - flake8
   - numpy
   - pandas
@@ -22,9 +25,10 @@ dependencies:
   - zarr
   - pseudonetcdf>=3.0.1
   - eccodes
+  - cdms2
+  - pynio
+  - iris>=1.10
+  - pydap
+  - lxml
   - pip:
-    - coveralls
-    - pytest-cov
-    - pydap
-    - lxml
     - cfgrib>=0.9.2
diff --git a/ci/requirements-py37-windows.yml b/ci/requirements-py37-windows.yml
@@ -2,22 +2,20 @@ name: test_env
 channels:
   - conda-forge
 dependencies:
-  - python=2.7
+  - python=3.7
+  - cftime
   - dask
   - distributed
   - h5py
   - h5netcdf
   - matplotlib
-  - pathlib2
+  - netcdf4
   - pytest
-  - flake8
-  - mock
+  - pytest-env
   - numpy
   - pandas
   - scipy
   - seaborn
   - toolz
   - rasterio
   - zarr
-  - pip:
-    - netcdf4
diff --git a/ci/requirements-py37.yml b/ci/requirements-py37.yml
@@ -11,6 +11,9 @@ dependencies:
   - matplotlib
   - netcdf4
   - pytest
+  - pytest-cov
+  - pytest-env
+  - coveralls
   - flake8
   - numpy
   - pandas
@@ -21,10 +24,8 @@ dependencies:
   - bottleneck
   - zarr
   - pseudonetcdf>=3.0.1
+  - lxml
   - eccodes
+  - pydap
   - pip:
-    - coveralls
-    - pytest-cov
-    - pydap
-    - lxml
     - cfgrib>=0.9.2
diff --git a/doc/installing.rst b/doc/installing.rst
@@ -6,7 +6,7 @@ Installation
 Required dependencies
 ---------------------
 
-- Python 2.7 [1]_, 3.5, 3.6, or 3.7
+- Python 3.5, 3.6, or 3.7
 - `numpy <http://www.numpy.org/>`__ (1.12 or later)
 - `pandas <http://pandas.pydata.org/>`__ (0.19.2 or later)
 
@@ -111,14 +111,4 @@ To run these benchmark tests in a local machine, first install
 - `airspeed-velocity <https://asv.readthedocs.io/en/latest/>`__: a tool for benchmarking Python packages over their lifetime.
 
 and run
-``asv run  # this will install some conda environments in ./.asv/envs``
-
-.. [1] Xarray plans to drop support for python 2.7 at the end of 2018. This
-   means that new releases of xarray published after this date will only be
-   installable on python 3+ environments, but older versions of xarray will
-   always be available to python 2.7 users. For more information see the
-   following references:
-
-      - `Xarray Github issue discussing dropping Python 2 <https://github.com/pydata/xarray/issues/1829>`__
-      - `Python 3 Statement <http://www.python3statement.org/>`__
-      - `Tips on porting to Python 3 <https://docs.python.org/3/howto/pyporting.html>`__
+``asv run  # this will install some conda environments in ./.asv/envs``
diff --git a/doc/whats-new.rst b/doc/whats-new.rst
@@ -21,6 +21,10 @@ v0.11.2 (unreleased)
 Breaking changes
 ~~~~~~~~~~~~~~~~
 
+- Remove support for Python 2. This is the first version of xarray that is
+  Python 3 only. (:issue:`1876`).
+  By `Joe Hamman <https://github.com/jhamman>`_.
+
 Enhancements
 ~~~~~~~~~~~~
 
diff --git a/setup.cfg b/setup.cfg
@@ -7,6 +7,8 @@ testpaths=xarray/tests
 # Fixed upstream in https://github.com/kwgoodman/bottleneck/pull/199
 filterwarnings =
     ignore:Using a non-tuple sequence for multidimensional indexing is deprecated:FutureWarning
+env =
+    UVCDAT_ANONYMOUS_LOG=no
 
 [flake8]
 max-line-length=79
diff --git a/setup.py b/setup.py
