Skip to content

Commit 95e25fd

Browse files
cwhansekandersolar
andauthored
Advance numpy from 1.12.0 to 1.16.0 (#1400)
* bump numpy * repair inverter *_multi tests * whatsnew * numpy 1.16 elsewhere * Update docs/sphinx/source/whatsnew/v0.9.1.rst Co-authored-by: Kevin Anderson <57452607+kanderso-nrel@users.noreply.github.com> Co-authored-by: Kevin Anderson <57452607+kanderso-nrel@users.noreply.github.com>
1 parent f86d71d commit 95e25fd

File tree

9 files changed

+14
-12
lines changed

9 files changed

+14
-12
lines changed

benchmarks/asv.conf.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@
115115
// minimum supported versions
116116
{
117117
"python": "3.6",
118-
"numpy": "1.12.0",
118+
"numpy": "1.16.0",
119119
"pandas": "0.22.0",
120120
"scipy": "1.2.0",
121121
// Note: these don't have a minimum in setup.py

ci/requirements-py36-min.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ dependencies:
1515
- pip:
1616
- dataclasses
1717
- h5py==3.1.0
18-
- numpy==1.12.0
18+
- numpy==1.16.0
1919
- pandas==0.22.0
2020
- scipy==1.2.0
2121
- pytest-rerunfailures # conda version is >3.6

ci/requirements-py36.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ dependencies:
1010
- netcdf4
1111
- nose
1212
- numba
13-
- numpy >= 1.12.0
13+
- numpy >= 1.16.0
1414
- pandas >= 0.22.0
1515
- pip
1616
- pytest

ci/requirements-py37.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ dependencies:
1010
- netcdf4
1111
- nose
1212
- numba
13-
- numpy >= 1.12.0
13+
- numpy >= 1.16.0
1414
- pandas >= 0.22.0
1515
- pip
1616
- pytest

ci/requirements-py38.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ dependencies:
1010
- netcdf4
1111
- nose
1212
- numba
13-
- numpy >= 1.12.0
13+
- numpy >= 1.16.0
1414
- pandas >= 0.22.0
1515
- pip
1616
- pytest

ci/requirements-py39.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ dependencies:
1010
# - netcdf4 # pulls in a different version of numpy with ImportError
1111
- nose
1212
# - numba # python 3.9 compat in early 2021
13-
- numpy >= 1.12.0
13+
- numpy >= 1.16.0
1414
- pandas >= 0.22.0
1515
- pip
1616
- pytest

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ Documentation
4040

4141
Requirements
4242
~~~~~~~~~~~~
43+
* numpy >= 1.16.0 is now required for all python versions. (:pull:`1400`)
44+
4345

4446
Contributors
4547
~~~~~~~~~~~~

pvlib/tests/test_inverter.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -106,16 +106,16 @@ def test_sandia_multi(cec_inverter_parameters):
106106
pdcs = idcs * vdcs
107107
pacs = inverter.sandia_multi((vdcs, vdcs), (pdcs, pdcs),
108108
cec_inverter_parameters)
109-
assert_series_equal(pacs, pd.Series([-0.020000, 132.004308, 250.000000]))
109+
assert_series_equal(pacs, pd.Series([-0.020000, 132.004278, 250.000000]))
110110
# with lists instead of tuples
111111
pacs = inverter.sandia_multi([vdcs, vdcs], [pdcs, pdcs],
112112
cec_inverter_parameters)
113-
assert_series_equal(pacs, pd.Series([-0.020000, 132.004308, 250.000000]))
113+
assert_series_equal(pacs, pd.Series([-0.020000, 132.004278, 250.000000]))
114114
# with arrays instead of tuples
115115
pacs = inverter.sandia_multi(np.array([vdcs, vdcs]),
116116
np.array([pdcs, pdcs]),
117117
cec_inverter_parameters)
118-
assert_series_equal(pacs, pd.Series([-0.020000, 132.004308, 250.000000]))
118+
assert_allclose(pacs, np.array([-0.020000, 132.004278, 250.000000]))
119119

120120

121121
def test_sandia_multi_length_error(cec_inverter_parameters):
@@ -184,10 +184,10 @@ def test_pvwatts_multi():
184184
# with Series
185185
pdc = pd.Series(pdc)
186186
out = inverter.pvwatts_multi((pdc, pdc), pdc0, 0.95)
187-
assert_series_equal(expected, out)
187+
assert_series_equal(pd.Series(expected), out)
188188
# with list instead of tuple
189189
out = inverter.pvwatts_multi([pdc, pdc], pdc0, 0.95)
190-
assert_series_equal(expected, out)
190+
assert_series_equal(pd.Series(expected), out)
191191

192192

193193
INVERTER_TEST_MEAS = DATA_DIR / 'inverter_fit_snl_meas.csv'

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
MAINTAINER_EMAIL = 'holmgren@email.arizona.edu'
3939
URL = 'https://github.com/pvlib/pvlib-python'
4040

41-
INSTALL_REQUIRES = ['numpy >= 1.12.0',
41+
INSTALL_REQUIRES = ['numpy >= 1.16.0',
4242
'pandas >= 0.22.0',
4343
'pytz',
4444
'requests',

0 commit comments

Comments
 (0)