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)
 

docs/sphinx/source/index.rst

@@ -278,7 +278,7 @@ Let's first examine how pvlib handles time when it imports a TMY3 file.
 
 The metadata has a ``'TZ'`` key with a value of ``-9.0``. This is the
 UTC offset in hours in which the data has been recorded. The
-:py:func:`~pvlib.tmy.readtmy3` function read the data in the file,
+:py:func:`~pvlib.iotools.read_tmy3` function read the data in the file,
 created a :py:class:`~pandas.DataFrame` with that data, and then
 localized the DataFrame's index to have this fixed offset. Here, we
 print just a few of the rows and columns of the large dataframe.
@@ -289,7 +289,7 @@ print just a few of the rows and columns of the large dataframe.
 
     tmy3_data.loc[tmy3_data.index[0:3], ['GHI', 'DNI', 'AOD']]
 
-The :py:func:`~pvlib.tmy.readtmy2` function also returns a DataFrame
+The :py:func:`~pvlib.iotools.read_tmy2` function also returns a DataFrame
 with a localized DatetimeIndex.
 
 Solar position

docs/sphinx/source/introtutorial.rst

@@ -49,6 +49,16 @@ Breaking changes
   :py:meth:`~pvlib.pvsystem.PVSystem.calcparams_desoto` and
   :py:meth:`~pvlib.pvsystem.PVSystem.calcparams_cec` (:issue:`1118`, :pull:`1222`)
 
+* Switched the order of the outputs from the PSM3 iotools, notably
+  :py:func:`~pvlib.iotools.get_psm3` and :py:func:`~pvlib.iotools.read_psm3`
+  (:issue:`1245`, :pull:`1268`)
+
+* Changed the naming of the inputs ``startdate``/``enddate`` to ``start``/``end`` in
+  :py:func:`~pvlib.iotools.get_ecmwf_macc`
+  (:issue:`1245`, :pull:`1268`)
+
+* Change the naming of the inputs ``lat``/``lon`` to ``latitude``/``longitude`` in
+  :py:func:`~pvlib.iotools.get_pvgis_tmy` (:issue:`1245`, :pull:`1268`)
 
 Deprecations
 ~~~~~~~~~~~~
@@ -115,11 +125,13 @@ Enhancements
   :func:`~pvlib.iotools.get_pvgis_hourly` for reading and retrieving hourly
   solar radiation data and PV power output from PVGIS. (:pull:`1186`,
   :issue:`849`)
+* Added ``map_variables`` option to :func:`~pvlib.iotools.get_pvgis_tmy` and
+  :func:`~pvlib.iotools.read_pvgis_tmy` (:issue:`1250`, :pull:`1268`)
 * Add :func:`~pvlib.iotools.get_bsrn` and :func:`~pvlib.iotools.read_bsrn`
   for retrieving and reading BSRN solar radiation data files.
   (:pull:`1254`, :pull:`1145`, :issue:`1015`)
 * Add :func:`~pvlib.iotools.get_cams`,
-  :func:`~pvlib.iotools.parse_cams`, and 
+  :func:`~pvlib.iotools.parse_cams`, and
   :func:`~pvlib.iotools.read_cams`
   for retrieving, parsing, and reading CAMS Radiation and McClear time-series
   files. (:pull:`1175`)
@@ -171,9 +183,9 @@ Enhancements
 Bug fixes
 ~~~~~~~~~
 * Corrected an error in :py:func:`~pvlib.irradiance.perez` where the horizon
-  irradiance component was prevented from taking negative values. Negative 
-  values are intentional according to the original publication. Changes in 
-  output are expected to be small and primarily occur at low irradiance 
+  irradiance component was prevented from taking negative values. Negative
+  values are intentional according to the original publication. Changes in
+  output are expected to be small and primarily occur at low irradiance
   conditions.
   (:issue:`1238`, :pull:`1239`)
 * Pass weather data to solar position calculations in
@@ -196,6 +208,12 @@ Bug fixes
   (:issue:`1257`, :pull:`1258`)
 * Changed deprecated use of ``.astype()`` to ``.view()`` in :py:mod:`~pvlib.solarposition`.
   (:pull:`1256`, :issue:`1261`, :pull:`1262`)
+* Fix :py:func:`~pvlib.tracking.singleaxis` AOI wrong when sun behind module.
+  (:pull:`1273`, :issue:`1221`)
+* Fix :py:meth:`~pvlib.forecast.ForecastModel.get_data` failure to correct for
+  non-UTC timezones. (:issue:`1237`, :pull:`1285`)
+* Fixed :py:class:`~pvlib.forecast.HRRR` by changing model name to reflect change on the server. (:issue:`1291`,
+  :pull:`1292`)
 
 Testing
 ~~~~~~~
@@ -214,10 +232,12 @@ Documentation
 * Clarified how statistics are calculated for :py:func:`pvlib.clearsky.detect_clearsky`
   (:issue:`1070`, :pull:`1243`)
 * Add gallery examples using the new ``Mount`` classes (:pull:`1266`)
+* Add "powered by pvlib" logos (:pull:`1277`)
 
 Requirements
 ~~~~~~~~~~~~
-* ``dataclasses`` is required for python 3.6
+* ``dataclasses`` is required for python 3.6 (:pull:`1076`)
+* ``tables`` is now required instead of optional (:issue:`1286`, :pull:`1287`)
 * xarray, dask, and cdsapi are now optional requirements. (:pull:`1264`)
 
 Contributors

docs/sphinx/source/timetimezones.rst

@@ -11,6 +11,7 @@
 import pandas as pd
 from scipy.optimize import minimize_scalar
 from scipy.linalg import hankel
+import tables
 
 from pvlib import atmosphere, tools
 
@@ -186,13 +187,6 @@ def lookup_linke_turbidity(time, latitude, longitude, filepath=None,
     # 1st row: 89.9583 S, 2nd row: 89.875 S
     # 1st column: 179.9583 W, 2nd column: 179.875 W
 
-    try:
-        import tables
-    except ImportError:
-        raise ImportError('The Linke turbidity lookup table requires tables. '
-                          'You can still use clearsky.ineichen if you '
-                          'supply your own turbidities.')
-
     if filepath is None:
         pvlib_path = os.path.dirname(os.path.abspath(__file__))
         filepath = os.path.join(pvlib_path, 'data', 'LinkeTurbidities.h5')

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

@@ -183,7 +183,12 @@ def set_query_time_range(self, start, end):
         self.end = pd.Timestamp(end)
         if self.start.tz is None or self.end.tz is None:
             raise TypeError('start and end must be tz-localized')
-        self.query.time_range(self.start, self.end)
+        # don't assume that siphon or the server can handle anything other
+        # than UTC
+        self.query.time_range(
+            self.start.tz_convert('UTC'),
+            self.end.tz_convert('UTC')
+        )
 
     def set_query_latlon(self):
         '''
@@ -412,10 +417,14 @@ def set_time(self, time):
         -------
         pandas.DatetimeIndex
         '''
+        # np.masked_array with elements like real_datetime(2021, 8, 17, 16, 0)
+        # and dtype=object
         times = num2date(time[:].squeeze(), time.units,
                          only_use_cftime_datetimes=False,
                          only_use_python_datetimes=True)
-        self.time = pd.DatetimeIndex(pd.Series(times), tz=self.location.tz)
+        # convert to pandas, localize to UTC, convert to desired timezone
+        self.time = pd.DatetimeIndex(
+            times, tz='UTC').tz_convert(self.location.tz)
 
     def cloud_cover_to_ghi_linear(self, cloud_cover, ghi_clear, offset=35,
                                   **kwargs):
@@ -977,7 +986,7 @@ class HRRR(ForecastModel):
 
     def __init__(self, set_type='best'):
         model_type = 'Forecast Model Data'
-        model = 'NCEP HRRR CONUS 2.5km'
+        model = 'HRRR CONUS 2.5km Forecasts'
 
         self.variables = {
             'temp_air': 'Temperature_height_above_ground',

pvlib/clearsky.py

@@ -57,10 +57,11 @@ def _empty_dataframe_from_logical_records(logical_records):
     columns = []
     for lr in logical_records:
         columns += BSRN_COLUMNS[lr][2:]
+    columns = [c for c in columns if c != 'empty']
     return pd.DataFrame(columns=columns)
 
 
-def get_bsrn(start, end, station, username, password,
+def get_bsrn(station, start, end, username, password,
              logical_records=('0100',), local_path=None):
     """
     Retrieve ground measured irradiance data from the BSRN FTP server.
@@ -73,12 +74,12 @@ def get_bsrn(start, end, station, username, password,
 
     Parameters
     ----------
+    station: str
+        3-letter BSRN station abbreviation
     start: datetime-like
         First day of the requested period
     end: datetime-like
         Last day of the requested period
-    station: str
-        3-letter BSRN station abbreviation
     username: str
         username for accessing the BSRN FTP server
     password: str