Drop Python 2 and 3.4 (#728)

markcampanelli · wholmgren · commit d68617c03a2b · 2019-05-20T14:58:45.000-07:00
* Drop Python 2 and 3.4

* Fix travis for 3.7 and update azure

* Remove six dependency

* Add min Travis build with consistent requirements and fixed tests

* Pin pvfactors also in setup.py

* Fix python version comparison for 3.7 patches

* Revert unneeded test change

* Remove Python 2 mock usages

* Address code review comments

* Appease the stickler

* Check for Python version range in setup.py

* Use more succint range syntax
diff --git a/.travis.yml b/.travis.yml
@@ -11,12 +11,8 @@ sudo: false # if false, use TravisCI's container based build
 # someday add os: osx to specify osx, but python not yet supported on Travis
 matrix:
     include:
-    - python: 2.7
-      env: CONDA_ENV=py27-min
-    - python: 2.7
-      env: CONDA_ENV=py27
-    - python: 3.4
-      env: CONDA_ENV=py34
+    - python: 3.5
+      env: CONDA_ENV=py35-min
     - python: 3.5
       env: CONDA_ENV=py35
     - python: 3.6
@@ -38,19 +34,15 @@ cache:
 # setup miniconda for numpy, scipy, pandas, etc.
 before_install:
     - echo "before install"
-    - if [[ "$TRAVIS_PYTHON_VERSION" == "2.7" ]]; then
-        export PYVER="2";
-      else
-        export PYVER="3";
-      fi
+    - export PYVER="3"
     - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
         export OSSTR="MacOSX-x86_64.sh";
       else
         export OSSTR="Linux-x86_64.sh";
         export PATH=/usr/lib/ccache:$PATH;
       fi
     - export BASE="http://repo.continuum.io/miniconda/Miniconda"
-    - export CONDAVER="4.5.4"
+    - export CONDAVER="4.6.14"
     - wget $BASE$PYVER-$CONDAVER-$OSSTR -O miniconda.sh;
     - bash miniconda.sh -b -p $HOME/miniconda
     - export PATH="$HOME/miniconda/bin:$PATH"
@@ -63,14 +55,6 @@ install:
     - echo "install"
     - conda env create --file ci/requirements-$CONDA_ENV.yml
     - source activate test_env # all envs are named test_env in the yml files
-    # needed to make sure that pandas is compiled against the right
-    # version of numpy
-    - if [[ "$CONDA_ENV" == "py27-min" ]]; then
-        pip uninstall numpy --yes;
-        pip uninstall pandas --yes;
-        pip install --no-cache-dir numpy==1.10.1;
-        pip install --no-cache-dir pandas==0.16.0;
-      fi
     - conda list
     - echo $PATH
     - ls -l /home/travis/miniconda/envs/test_env/lib
diff --git a/README.md b/README.md
@@ -32,10 +32,9 @@ Installation
 pvlib-python releases may be installed using the ``pip`` and ``conda`` tools.
 Please see the [Installation page](http://pvlib-python.readthedocs.io/en/latest/installation.html) of the documentation for complete instructions.
 
-pvlib-python is compatible with Python versions 2.7 and 3.4-3.7.
+pvlib-python is compatible with Python 3.5 and above.
 
-**Python 2.7 support will end on June 1, 2019**. Releases made after this
-date will require Python 3.
+**Python 2.7 support ended on June 1, 2019, with pvlib-python 0.6.3.**
 
 
 Contributing
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -13,8 +13,6 @@ jobs:
 
   strategy:
     matrix:
-      Python27:
-        python.version: '27'
       Python35:
         python.version: '35'
       Python36:
@@ -68,8 +66,6 @@ jobs:
 
   strategy:
     matrix:
-      Python27-windows:
-        python.version: '27'
       Python35-windows:
         python.version: '35'
       Python36-windows:
diff --git a/ci/requirements-py27-min.yml b/ci/requirements-py27-min.yml
diff --git a/ci/requirements-py27.yml b/ci/requirements-py27.yml
diff --git a/ci/requirements-py34.yml b/ci/requirements-py34.yml
diff --git a/ci/requirements-py35-min.yml b/ci/requirements-py35-min.yml
@@ -0,0 +1,16 @@
+name: test_env
+channels:
+    - defaults
+dependencies:
+    - coveralls
+    - nose
+    - numpy=1.10.1
+    - pandas=0.18.0
+    - pip
+    - pytest
+    - pytest-cov
+    - pytest-mock
+    - pytest-timeout
+    - python=3.5
+    - pytz
+    - requests
diff --git a/ci/requirements-py35.yml b/ci/requirements-py35.yml
@@ -3,21 +3,25 @@ channels:
     - defaults
     - conda-forge
 dependencies:
-    - python=3.5
-    - numpy
-    - scipy
-    - pytables
-    - pandas
-    - pytz
+    - coveralls
+    - cython
     - ephem
+    - netcdf4
+    - nose
     - numba
-    - siphon
+    - numpy
+    - pandas
+    - pip
+    - pytables  # tables when using pip+PyPI
     - pytest
     - pytest-cov
-    - nose
+    - pytest-mock
+    - pytest-timeout
+    - python=3.5
+    - pytz
+    - requests
+    - scipy
     - shapely  # pvfactors dependency
+    - siphon  # conda-forge
     - pip:
-        - coveralls
-        - pytest-mock
-        - pytest-timeout
         - pvfactors==1.0.1
diff --git a/ci/requirements-py36.yml b/ci/requirements-py36.yml
@@ -3,21 +3,25 @@ channels:
     - defaults
     - conda-forge
 dependencies:
-    - python=3.6
-    - numpy
-    - scipy
-    - pytables
-    - pandas
-    - pytz
+    - coveralls
+    - cython
     - ephem
+    - netcdf4
+    - nose
     - numba
-    - siphon
+    - numpy
+    - pandas
+    - pip
+    - pytables  # tables when using pip+PyPI
     - pytest
     - pytest-cov
-    - nose
+    - pytest-mock
+    - pytest-timeout
+    - python=3.6
+    - pytz
+    - requests
+    - scipy
     - shapely  # pvfactors dependency
+    - siphon  # conda-forge
     - pip:
-        - coveralls
-        - pytest-mock
-        - pytest-timeout
         - pvfactors==1.0.1
diff --git a/ci/requirements-py37.yml b/ci/requirements-py37.yml
@@ -3,21 +3,25 @@ channels:
     - defaults
     - conda-forge
 dependencies:
-    - python=3.7
-    - numpy
-    - scipy
-    - pytables
-    - pandas
-    - pytz
+    - coveralls
+    - cython
     - ephem
+    - netcdf4
+    - nose
     - numba
-    - siphon
+    - numpy
+    - pandas
+    - pip
+    - pytables  # tables when using pip+PyPI
     - pytest
     - pytest-cov
-    - nose
+    - pytest-mock
+    - pytest-timeout
+    - python=3.7
+    - pytz
+    - requests
+    - scipy
     - shapely  # pvfactors dependency
+    - siphon  # conda-forge
     - pip:
-        - coveralls
-        - pytest-mock
-        - pytest-timeout
         - pvfactors==1.0.1
diff --git a/docs/environment.yml b/docs/environment.yml
@@ -4,7 +4,6 @@ channels:
     - defaults
 dependencies:
     - python=3.6
-    - mock  # needed for local python 2.7 builds
     - numpy=1.14.2
     - scipy
     - pytables
diff --git a/docs/sphinx/source/conf.py b/docs/sphinx/source/conf.py
@@ -16,10 +16,8 @@
 import os
 
 # Mock modules so RTD works
-try:
-    from mock import Mock as MagicMock
-except ImportError:
-    from unittest.mock import MagicMock
+from unittest.mock import MagicMock
+
 
 class Mock(MagicMock):
     @classmethod
diff --git a/docs/sphinx/source/contributing.rst b/docs/sphinx/source/contributing.rst
@@ -196,7 +196,7 @@ pvlib python generally follows the `PEP 8 -- Style Guide for Python Code
 <https://www.python.org/dev/peps/pep-0008/>`_. Maximum line length for code
 is 79 characters.
 
-Code must be compatible with python 2.7 and 3.4+.
+Code must be compatible with Python 3.5 and above.
 
 pvlib python uses a mix of full and abbreviated variable names. See
 :ref:`variables_style_rules`. We could be better about consistency.
diff --git a/docs/sphinx/source/installation.rst b/docs/sphinx/source/installation.rst
@@ -201,8 +201,7 @@ Any changes that you make to this pvlib-python will be available inside
 your environment. If you run a git checkout, branch, or pull command the
 result will be applied to your pvlib-python installation. This
 is great for development. Note, however, that you will need to use
-Python's ``reload`` function (`python 2
-<https://docs.python.org/2/library/functions.html#reload>`_, `python 3
+Python's ``reload`` function (`python 3
 <https://docs.python.org/3/library/importlib.html#importlib.reload>`_)
 if you make changes to pvlib during an interactive Python
 session (including a Jupyter notebook). Restarting the Python
@@ -216,7 +215,7 @@ environment) when you start a new shell or terminal.
 Compatibility
 -------------
 
-pvlib-python is compatible with Python versions 2.7 and 3.4-3.7.
+pvlib-python is compatible with Python 3.5 and above.
 
 pvlib-python requires Pandas and Numpy. The minimum version requirements
 are specified in
@@ -228,7 +227,7 @@ be installed separately using pip or conda. These packages/features
 include:
 
 * scipy: single diode model, clear sky detection
-* pytables: Linke turbidity look up for clear sky models
+* pytables (tables on PyPI): Linke turbidity look up for clear sky models
 * numba: fastest solar position calculations
 * pyephem: solar positions calculations using an astronomical library
 * siphon: forecasting PV power using the pvlib.forecast module
diff --git a/docs/sphinx/source/whatsnew.rst b/docs/sphinx/source/whatsnew.rst
@@ -6,6 +6,7 @@ What's New
 
 These are new features and improvements of note in each release.
 
+.. include:: whatsnew/v0.7.0.rst
 .. include:: whatsnew/v0.6.3.rst
 .. include:: whatsnew/v0.6.2.rst
 .. include:: whatsnew/v0.6.1.rst
diff --git a/docs/sphinx/source/whatsnew/v0.7.0.rst b/docs/sphinx/source/whatsnew/v0.7.0.rst
@@ -0,0 +1,15 @@
+.. _whatsnew_0700:
+
+v0.7.0 (MONTH DAY, YEAR)
+---------------------
+
+This is a major release that drops support for Python 2 and Python 3.4. We
+recommend all users of v0.6.3 upgrade to this release.
+
+**Python 2.7 support ended on June 1, 2019**. (:issue:`501`)
+
+
+Contributors
+~~~~~~~~~~~~
+* Mark Campanellli (:ghuser:`markcampanelli`)
+* Will Holmgren (:ghuser:`wholmgren`)
diff --git a/pvlib/test/test_location.py b/pvlib/test/test_location.py
@@ -1,9 +1,5 @@
 import datetime
-try:
-    from unittest.mock import ANY
-except ImportError:
-    # python 2
-    from mock import ANY
+from unittest.mock import ANY
 
 import numpy as np
 from numpy import nan
diff --git a/pvlib/test/test_modelchain.py b/pvlib/test/test_modelchain.py
@@ -1,9 +1,4 @@
 import sys
-try:
-    from unittest.mock import ANY
-except ImportError:
-    # python 2
-    from mock import ANY
 
 import numpy as np
 import pandas as pd
diff --git a/pvlib/test/test_pvsystem.py b/pvlib/test/test_pvsystem.py
diff --git a/setup.py b/setup.py
