Merge branch 'era5' of https://github.com/AdamRJensen/pvlib-python into era5

Author: AdamRJensen

README.md

@@ -111,11 +111,24 @@ Please see the [Contributing page](http://pvlib-python.readthedocs.io/en/stable/
 The long-term success of pvlib-python requires substantial community support.
 
 
-License
-=======
+Citing
+======
+
+If you use pvlib-python in a published work, please cite:
+
+  William F. Holmgren, Clifford W. Hansen, and Mark A. Mikofski.
+  "pvlib python: a python package for modeling solar energy systems."
+  Journal of Open Source Software, 3(29), 884, (2018).
+  https://doi.org/10.21105/joss.00884
 
-BSD 3-clause
+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)
 
+If you use pvlib-python in a commercial or publicly-available application, please
+consider displaying one of the "powered by pvlib" logos:
+
+<img src="docs/sphinx/source/_images/pvlib_powered_logo_vert.png" width="300"><img src="docs/sphinx/source/_images/pvlib_powered_logo_horiz.png" width="300">
 
 Getting support
 ===============
@@ -133,19 +146,12 @@ change something about pvlib, then please make an issue on our
 [GitHub issues page](https://github.com/pvlib/pvlib-python/issues).
 
 
-Citing
-======
 
-If you use pvlib-python in a published work, please cite:
+License
+=======
 
-  William F. Holmgren, Clifford W. Hansen, and Mark A. Mikofski.
-  "pvlib python: a python package for modeling solar energy systems."
-  Journal of Open Source Software, 3(29), 884, (2018).
-  https://doi.org/10.21105/joss.00884
+BSD 3-clause.
 
-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
 ========

azure-pipelines.yml

@@ -12,7 +12,7 @@ jobs:
     vmImage: ubuntu-16.04
 
 
-- template: ci/azure/posix.yml
+- template: ci/azure/posix_no_39.yml
   parameters:
     name: Test_bare_macOS
     vmImage: macOS-10.14

ci/azure/posix_no_39.yml

@@ -0,0 +1,39 @@
+parameters:
+  name: ''
+  vmImage: ''
+
+jobs:
+- job: ${{ parameters.name }}
+  pool:
+    vmImage: ${{ parameters.vmImage }}
+  strategy:
+    matrix:
+      Python36:
+        python.version: '3.6'
+      Python37:
+        python.version: '3.7'
+      Python38:
+        python.version: '3.8'
+
+  steps:
+  - task: UsePythonVersion@0
+    inputs:
+      versionSpec: '$(python.version)'
+
+  - script: |
+      pip install pytest pytest-cov pytest-mock requests-mock pytest-timeout pytest-azurepipelines pytest-rerunfailures pytest-remotedata
+      pip install -e .
+      pytest pvlib --junitxml=junit/test-results.xml --cov=com --cov-report=xml --cov-report=html
+    displayName: 'Test with pytest'
+
+  - task: PublishTestResults@2
+    condition: succeededOrFailed()
+    inputs:
+      testResultsFiles: '**/test-*.xml'
+      testRunTitle: 'Publish test results for Python $(python.version)'
+
+  - task: PublishCodeCoverageResults@1
+    inputs:
+      codeCoverageTool: Cobertura
+      summaryFileLocation: '$(System.DefaultWorkingDirectory)/**/coverage.xml'
+      reportDirectory: '$(System.DefaultWorkingDirectory)/**/htmlcov'

ci/requirements-py36-min.yml

@@ -5,6 +5,7 @@ dependencies:
     - coveralls
     - nose
     - pip
+    - pytables  # tables when using pip+PyPI
     - pytest
     - pytest-cov
     - pytest-mock
@@ -20,3 +21,4 @@ dependencies:
         - pytest-rerunfailures # conda version is >3.6
         - pytest-remotedata # conda package is 0.3.0, needs > 0.3.1
         - requests-mock
+        - numexpr==2.6.2 # needed for tables, but newest version is not compatible with numpy 1.12

ci/requirements-py36.yml

@@ -3,6 +3,7 @@ channels:
     - defaults
     - conda-forge
 dependencies:
+    - blosc=1.14.3  # newest version breaks tables (pytables) on windows
     - cdsapi
     - coveralls
     - cython

ci/requirements-py37.yml

@@ -3,6 +3,7 @@ channels:
     - defaults
     - conda-forge
 dependencies:
+    - blosc=1.14.3  # newest version breaks tables (pytables) on windows
     - cdsapi
     - coveralls
     - cython

docs/sphinx/source/_images/pvlib_powered_logo_horiz.png

@@ -9,8 +9,7 @@ functions and classes for simulating the performance of photovoltaic
 energy systems. pvlib python was originally ported from the PVLIB MATLAB
 toolbox developed at Sandia National Laboratories and it implements many
 of the models and methods developed at the Labs. More information on
-Sandia Labs PV performance modeling programs can be found at
-https://pvpmc.sandia.gov/. We collaborate with the PVLIB MATLAB project,
+Sandia Labs PV performance modeling programs can be found at the `PVPMC <https://pvpmc.sandia.gov/>`_. We collaborate with the PVLIB MATLAB project,
 but operate independently of it.
 
 The source code for pvlib python is hosted on `github
@@ -50,6 +49,16 @@ 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>`_
 
+If you use pvlib-python in a commercial or publicly-available
+application, please consider displaying one of the "powered by pvlib"
+logos:
+
+.. image:: _images/pvlib_powered_logo_horiz.png
+  :width: 300
+
+.. image:: _images/pvlib_powered_logo_vert.png
+  :width: 300
+
 Additional pvlib python publications include:
 
 * J. S. Stein, “The photovoltaic performance modeling
@@ -73,6 +82,10 @@ Additional pvlib python publications include:
   "An Open Source Solar Power Forecasting Tool Using PVLIB-Python,"
   in 43rd Photovoltaic Specialists Conference, 2016.
 
+License
+=======
+
+`BSD 3-clause <https://github.com/pvlib/pvlib-python/LICENSE>`_.
 
 NumFOCUS
 ========
@@ -83,7 +96,6 @@ pvlib python is a `NumFOCUS Affiliated Project <https://numfocus.org/sponsored-p
   :target: https://numfocus.org/sponsored-projects/affiliated-projects
   :alt: NumFocus Affliated Projects
 
-
 Contents
 ========
 

docs/sphinx/source/_images/pvlib_powered_logo_vert.png

@@ -52,24 +52,13 @@ the :ref:`iotools` module. In this example we will be using PVGIS, one of the
 data sources available, to retrieve a Typical Meteorological Year (TMY) which
 includes irradiation, temperature and wind speed.
 
-.. note:: PVGIS uses different naming conventions, so it is required to rename
-   the weather data variables before using them. Data is already UTC-localized,
-   so conversion to local timezone is optional.
-
 .. ipython:: python
 
-    variables_translation = {
-        "Gb(n)": "dni",
-        "G(h)": "ghi",
-        "Gd(h)": "dhi",
-        "T2m": "temp_air",
-        "WS10m": "wind_speed",
-    }
     tmys = []
     for location in coordinates:
         latitude, longitude, name, altitude, timezone = location
-        weather = pvlib.iotools.get_pvgis_tmy(latitude, longitude)[0]
-        weather = weather.rename(columns=variables_translation)
+        weather = pvlib.iotools.get_pvgis_tmy(latitude, longitude,
+                                              map_variables=True)[0]
         weather.index.name = "utc_time"
         tmys.append(weather)