Merge branch 'master' into era5

pvlib · AdamRJensen · Jun 16, 2021 · Jun 17, 2021 · Jun 17, 2021 · Jul 27, 2021
commit 6cd44b1e0b746153e8fc36bcff48a89d39dc7b36
diff --git a/ci/requirements-py36.yml b/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

diff --git a/ci/requirements-py37.yml b/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

diff --git a/docs/sphinx/source/whatsnew/v0.9.0.rst b/docs/sphinx/source/whatsnew/v0.9.0.rst
@@ -236,7 +236,8 @@ Documentation
 
 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

diff --git a/setup.py b/setup.py
@@ -54,7 +54,8 @@
                  'pytest-remotedata']
 EXTRAS_REQUIRE = {
     'optional': ['cython', 'ephem', 'netcdf4', 'nrel-pysam', 'numba',
-                 'pvfactors', 'siphon', 'statsmodels', 'tables',
+
+                 'pvfactors', 'siphon', 'statsmodels',
                  'cftime >= 1.1.1', 'xarray', 'dask', 'cdsapi'],
     'doc': ['ipython', 'matplotlib', 'sphinx == 3.1.2',
             'sphinx_rtd_theme==0.5.0', 'sphinx-gallery', 'docutils == 0.15.2',