Revert "Make tables a required dependency (pvlib#1287)"

This reverts commit 65782fd.

Author: kandersolar

azure-pipelines.yml

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

ci/azure/posix_no_39.yml

@@ -5,7 +5,6 @@ dependencies:
     - coveralls
     - nose
     - pip
-    - pytables  # tables when using pip+PyPI
     - pytest
     - pytest-cov
     - pytest-mock
@@ -21,4 +20,3 @@ 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-min.yml

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

ci/requirements-py36.yml

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

ci/requirements-py37.yml

@@ -232,8 +232,7 @@ Documentation
 
 Requirements
 ~~~~~~~~~~~~
-* ``dataclasses`` is required for python 3.6 (:pull:`1076`)
-* ``tables`` is now required instead of optional (:issue:`1286`, :pull:`1287`)
+* ``dataclasses`` is required for python 3.6
 
 Contributors
 ~~~~~~~~~~~~

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

@@ -11,7 +11,6 @@
 import pandas as pd
 from scipy.optimize import minimize_scalar
 from scipy.linalg import hankel
-import tables
 
 from pvlib import atmosphere, tools
 
@@ -187,6 +186,13 @@ 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')

pvlib/clearsky.py

@@ -105,6 +105,15 @@ def assert_frame_equal(left, right, **kwargs):
     not has_statsmodels, reason='requires statsmodels')
 
 
+try:
+    import tables
+    has_tables = True
+except ImportError:
+    has_tables = False
+
+requires_tables = pytest.mark.skipif(not has_tables, reason='requires tables')
+
+
 try:
     import ephem
     has_ephem = True

pvlib/tests/conftest.py

@@ -16,7 +16,7 @@
 from pvlib import atmosphere
 from pvlib import irradiance
 
-from .conftest import DATA_DIR
+from .conftest import requires_tables, DATA_DIR
 
 
 def test_ineichen_series():
@@ -189,6 +189,7 @@ def test_ineichen_altitude():
     assert_frame_equal(expected, out)
 
 
+@requires_tables
 def test_lookup_linke_turbidity():
     times = pd.date_range(start='2014-06-24', end='2014-06-25',
                           freq='12h', tz='America/Phoenix')
@@ -201,6 +202,7 @@ def test_lookup_linke_turbidity():
     assert_series_equal(expected, out)
 
 
+@requires_tables
 def test_lookup_linke_turbidity_leapyear():
     times = pd.date_range(start='2016-06-24', end='2016-06-25',
                           freq='12h', tz='America/Phoenix')
@@ -213,6 +215,7 @@ def test_lookup_linke_turbidity_leapyear():
     assert_series_equal(expected, out)
 
 
+@requires_tables
 def test_lookup_linke_turbidity_nointerp():
     times = pd.date_range(start='2014-06-24', end='2014-06-25',
                           freq='12h', tz='America/Phoenix')
@@ -223,6 +226,7 @@ def test_lookup_linke_turbidity_nointerp():
     assert_series_equal(expected, out)
 
 
+@requires_tables
 def test_lookup_linke_turbidity_months():
     times = pd.date_range(start='2014-04-01', end='2014-07-01',
                           freq='1M', tz='America/Phoenix')
@@ -233,6 +237,7 @@ def test_lookup_linke_turbidity_months():
     assert_series_equal(expected, out)
 
 
+@requires_tables
 def test_lookup_linke_turbidity_months_leapyear():
     times = pd.date_range(start='2016-04-01', end='2016-07-01',
                           freq='1M', tz='America/Phoenix')
@@ -243,6 +248,7 @@ def test_lookup_linke_turbidity_months_leapyear():
     assert_series_equal(expected, out)
 
 
+@requires_tables
 def test_lookup_linke_turbidity_nointerp_months():
     times = pd.date_range(start='2014-04-10', end='2014-07-10',
                           freq='1M', tz='America/Phoenix')
@@ -474,6 +480,7 @@ def test_simplified_solis_nans_series():
     assert_frame_equal(expected, out)
 
 
+@requires_tables
 def test_linke_turbidity_corners():
     """Test Linke turbidity corners out of bounds."""
     months = pd.DatetimeIndex('%d/1/2016' % (m + 1) for m in range(12))

pvlib/tests/test_clearsky.py

@@ -15,7 +15,7 @@
 from pvlib.location import Location
 from pvlib.solarposition import declination_spencer71
 from pvlib.solarposition import equation_of_time_spencer71
-from .conftest import requires_ephem
+from .conftest import requires_ephem, requires_tables
 
 
 def test_location_required():
@@ -77,6 +77,7 @@ def times():
                          freq='3H')
 
 
+@requires_tables
 def test_get_clearsky(mocker, times):
     tus = Location(32.2, -111, 'US/Arizona', 700, 'Tucson')
     m = mocker.spy(pvlib.clearsky, 'ineichen')