diff --git a/benchmarks/asv.conf.json b/benchmarks/asv.conf.json index d82365b2c7..c7da42acf2 100644 --- a/benchmarks/asv.conf.json +++ b/benchmarks/asv.conf.json @@ -115,7 +115,7 @@ // minimum supported versions { "python": "3.6", - "numpy": "1.12.0", + "numpy": "1.16.0", "pandas": "0.22.0", "scipy": "1.2.0", // Note: these don't have a minimum in setup.py diff --git a/ci/requirements-py36-min.yml b/ci/requirements-py36-min.yml index e605e53584..495099cf8f 100644 --- a/ci/requirements-py36-min.yml +++ b/ci/requirements-py36-min.yml @@ -15,7 +15,7 @@ dependencies: - pip: - dataclasses - h5py==3.1.0 - - numpy==1.12.0 + - numpy==1.16.0 - pandas==0.22.0 - scipy==1.2.0 - pytest-rerunfailures # conda version is >3.6 diff --git a/ci/requirements-py36.yml b/ci/requirements-py36.yml index 222ea92d99..295bedda7c 100644 --- a/ci/requirements-py36.yml +++ b/ci/requirements-py36.yml @@ -10,7 +10,7 @@ dependencies: - netcdf4 - nose - numba - - numpy >= 1.12.0 + - numpy >= 1.16.0 - pandas >= 0.22.0 - pip - pytest diff --git a/ci/requirements-py37.yml b/ci/requirements-py37.yml index 83db4b7f49..241cafe128 100644 --- a/ci/requirements-py37.yml +++ b/ci/requirements-py37.yml @@ -10,7 +10,7 @@ dependencies: - netcdf4 - nose - numba - - numpy >= 1.12.0 + - numpy >= 1.16.0 - pandas >= 0.22.0 - pip - pytest diff --git a/ci/requirements-py38.yml b/ci/requirements-py38.yml index 8fecb52197..6ff5d2da0f 100644 --- a/ci/requirements-py38.yml +++ b/ci/requirements-py38.yml @@ -10,7 +10,7 @@ dependencies: - netcdf4 - nose - numba - - numpy >= 1.12.0 + - numpy >= 1.16.0 - pandas >= 0.22.0 - pip - pytest diff --git a/ci/requirements-py39.yml b/ci/requirements-py39.yml index d1283b489e..32abde067a 100644 --- a/ci/requirements-py39.yml +++ b/ci/requirements-py39.yml @@ -10,7 +10,7 @@ dependencies: # - netcdf4 # pulls in a different version of numpy with ImportError - nose # - numba # python 3.9 compat in early 2021 - - numpy >= 1.12.0 + - numpy >= 1.16.0 - pandas >= 0.22.0 - pip - pytest diff --git a/docs/sphinx/source/whatsnew/v0.9.1.rst b/docs/sphinx/source/whatsnew/v0.9.1.rst index 5ff19a4fd5..c744a44c3f 100644 --- a/docs/sphinx/source/whatsnew/v0.9.1.rst +++ b/docs/sphinx/source/whatsnew/v0.9.1.rst @@ -40,6 +40,8 @@ Documentation Requirements ~~~~~~~~~~~~ +* numpy >= 1.16.0 is now required for all python versions. (:pull:`1400`) + Contributors ~~~~~~~~~~~~ diff --git a/pvlib/tests/test_inverter.py b/pvlib/tests/test_inverter.py index 9717a7ba4a..4962d3e495 100644 --- a/pvlib/tests/test_inverter.py +++ b/pvlib/tests/test_inverter.py @@ -106,16 +106,16 @@ def test_sandia_multi(cec_inverter_parameters): pdcs = idcs * vdcs pacs = inverter.sandia_multi((vdcs, vdcs), (pdcs, pdcs), cec_inverter_parameters) - assert_series_equal(pacs, pd.Series([-0.020000, 132.004308, 250.000000])) + assert_series_equal(pacs, pd.Series([-0.020000, 132.004278, 250.000000])) # with lists instead of tuples pacs = inverter.sandia_multi([vdcs, vdcs], [pdcs, pdcs], cec_inverter_parameters) - assert_series_equal(pacs, pd.Series([-0.020000, 132.004308, 250.000000])) + assert_series_equal(pacs, pd.Series([-0.020000, 132.004278, 250.000000])) # with arrays instead of tuples pacs = inverter.sandia_multi(np.array([vdcs, vdcs]), np.array([pdcs, pdcs]), cec_inverter_parameters) - assert_series_equal(pacs, pd.Series([-0.020000, 132.004308, 250.000000])) + assert_allclose(pacs, np.array([-0.020000, 132.004278, 250.000000])) def test_sandia_multi_length_error(cec_inverter_parameters): @@ -184,10 +184,10 @@ def test_pvwatts_multi(): # with Series pdc = pd.Series(pdc) out = inverter.pvwatts_multi((pdc, pdc), pdc0, 0.95) - assert_series_equal(expected, out) + assert_series_equal(pd.Series(expected), out) # with list instead of tuple out = inverter.pvwatts_multi([pdc, pdc], pdc0, 0.95) - assert_series_equal(expected, out) + assert_series_equal(pd.Series(expected), out) INVERTER_TEST_MEAS = DATA_DIR / 'inverter_fit_snl_meas.csv' diff --git a/setup.py b/setup.py index b2cbf486d5..a635a0036b 100755 --- a/setup.py +++ b/setup.py @@ -38,7 +38,7 @@ MAINTAINER_EMAIL = 'holmgren@email.arizona.edu' URL = 'https://github.com/pvlib/pvlib-python' -INSTALL_REQUIRES = ['numpy >= 1.12.0', +INSTALL_REQUIRES = ['numpy >= 1.16.0', 'pandas >= 0.22.0', 'pytz', 'requests',