Merge remote-tracking branch 'upstream/master'

Author: alexandermorgan

docs/sphinx/source/installation.rst

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

docs/sphinx/source/whatsnew/v0.7.0.rst

@@ -8,6 +8,7 @@ recommend all users of v0.6.3 upgrade to this release after checking API
 compatibility notes.
 
 **Python 2.7 support ended on June 1, 2019.** (:issue:`501`)
+**Python 2.7 support ended on June 1, 2019**. (:issue:`501`)
 **Minimum numpy version is now 1.10.4. Minimum pandas version is now 0.18.1.**
 
 Bug fixes
@@ -26,4 +27,4 @@ Contributors
 * Mark Campanellli (:ghuser:`markcampanelli`)
 * Will Holmgren (:ghuser:`wholmgren`)
 * Oscar Dowson (:ghuser:`odow`)
-* Alexander Morgan (:ghuser:`alexandermorgan`)
+* Alexander Morgan (:ghuser:`alexandermorgan`)