Merge branch 'master' of https://github.com/pvlib/pvlib-python

Author: cwhanse

.gitignore

@@ -86,3 +86,6 @@ coverage.xml
 #Ignore some notebooks
 *.ipynb
 !docs/tutorials/*.ipynb
+
+#Ignore Mac DS_store files
+*.DS_Store

.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

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
@@ -81,3 +80,10 @@ If you use pvlib-python in a published work, please cite:
 Please also cite the DOI corresponding to the specific version of
 pvlib-python that you used. pvlib-python DOIs are listed at
 [Zenodo.org](https://zenodo.org/search?page=1&size=20&q=conceptrecid:593284&all_versions&sort=-version)
+
+NumFOCUS
+========
+
+pvlib python is a [NumFOCUS Affiliated Project](https://numfocus.org/sponsored-projects/affiliated-projects)
+
+[![NumFocus Affliated Projects](https://i0.wp.com/numfocus.org/wp-content/uploads/2019/06/AffiliatedProject.png)](https://numfocus.org/sponsored-projects/affiliated-projects)

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:

ci/requirements-py27-min.yml

@@ -0,0 +1,17 @@
+name: test_env
+channels:
+    - defaults
+dependencies:
+    - coveralls
+    - nose
+    - pip
+    - pytest
+    - pytest-cov
+    - pytest-mock
+    - pytest-timeout
+    - python=3.5
+    - pytz
+    - requests
+    - pip:
+        - numpy==1.10.4
+        - pandas==0.18.1

ci/requirements-py27.yml

@@ -3,22 +3,26 @@ 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
         - nrel-pysam
         - pvfactors==1.0.1

ci/requirements-py34.yml

@@ -3,22 +3,26 @@ 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
         - nrel-pysam==1.2.1
-        - pytest-timeout
         - pvfactors==1.0.1

ci/requirements-py35-min.yml

@@ -3,22 +3,26 @@ 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
         - nrel-pysam
-        - pytest-timeout
         - pvfactors==1.0.1

ci/requirements-py35.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

ci/requirements-py36.yml

@@ -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

ci/requirements-py37.yml

@@ -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.

docs/environment.yml

@@ -77,6 +77,15 @@ non-editable way, use one of the following commands to install pvlib-python::
     # another option if you know what you are doing
     pip install pvlib[optional]
 
+.. note::
+
+    By default, pvlib will not install some infrequently used dependencies.
+    If you run into an error such as
+    `ModuleNotFoundError: No module named 'netCDF4'`
+    you can either install pvlib with all optional dependencies using
+    `pip install pvlib[optional]`, or you can install pvlib from conda-forge
+    `conda create -n pvlib -c conda-forge pvlib-python; conda activate pvlib`.
+
 If your system complains that you don't have access privileges or asks
 for a password then you're probably trying to install pvlib into your
 system's Python distribution. This is usually a bad idea and you should
@@ -201,8 +210,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 +224,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 +236,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

docs/sphinx/source/conf.py

@@ -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