Skip to content

Advance numpy from 1.12.0 to 1.16.0 #1400

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Feb 11, 2022
Merged

Advance numpy from 1.12.0 to 1.16.0 #1400

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
21aa199
bump numpy
cwhanse Feb 9, 2022
c3d9156
repair inverter *_multi tests
cwhanse Feb 9, 2022
697065c
whatsnew
cwhanse Feb 9, 2022
8db8e79
numpy 1.16 elsewhere
cwhanse Feb 9, 2022
8bdef14
Update docs/sphinx/source/whatsnew/v0.9.1.rst
cwhanse Feb 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion benchmarks/asv.conf.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ci/requirements-py36-min.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ci/requirements-py36.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ dependencies:
- netcdf4
- nose
- numba
- numpy >= 1.12.0
- numpy >= 1.16.0
- pandas >= 0.22.0
- pip
- pytest
Expand Down
2 changes: 1 addition & 1 deletion ci/requirements-py37.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ dependencies:
- netcdf4
- nose
- numba
- numpy >= 1.12.0
- numpy >= 1.16.0
- pandas >= 0.22.0
- pip
- pytest
Expand Down
2 changes: 1 addition & 1 deletion ci/requirements-py38.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ dependencies:
- netcdf4
- nose
- numba
- numpy >= 1.12.0
- numpy >= 1.16.0
- pandas >= 0.22.0
- pip
- pytest
Expand Down
2 changes: 1 addition & 1 deletion ci/requirements-py39.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions docs/sphinx/source/whatsnew/v0.9.1.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ Documentation

Requirements
~~~~~~~~~~~~
* numpy >= 1.16.0 is now required for all python versions.


Contributors
~~~~~~~~~~~~
Expand Down
10 changes: 5 additions & 5 deletions pvlib/tests/test_inverter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
MAINTAINER_EMAIL = '[email protected]'
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',
Expand Down