Skip to content

Commit

Permalink
Revert change in minimum pandas version
Browse files Browse the repository at this point in the history
  • Loading branch information
markcampanelli committed Dec 23, 2024
1 parent 14715ed commit 545c196
Show file tree
Hide file tree
Showing 9 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion benchmarks/asv.conf.json
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@
"python": "3.9",
"build": "",
"numpy": "1.19.5",
"pandas": "1.4.0",
"pandas": "1.3.0",
"scipy": "1.6.0",
// Note: these don't have a minimum in setup.py
"h5py": "3.1.0",
Expand Down
2 changes: 1 addition & 1 deletion ci/requirements-py3.10.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ dependencies:
- h5py
- numba
- numpy >= 1.17.3
- pandas >= 1.4.0
- pandas >= 1.3.0
- pip
- pytest
- pytest-cov
Expand Down
2 changes: 1 addition & 1 deletion ci/requirements-py3.11.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ dependencies:
- h5py
- numba
- numpy >= 1.17.3
- pandas >= 1.4.0
- pandas >= 1.3.0
- pip
- pytest
- pytest-cov
Expand Down
2 changes: 1 addition & 1 deletion ci/requirements-py3.12.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ dependencies:
- h5py
- numba
- numpy >= 1.17.3
- pandas >= 1.4.0
- pandas >= 1.3.0
- pip
- pytest
- pytest-cov
Expand Down
2 changes: 1 addition & 1 deletion ci/requirements-py3.9-min.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ dependencies:
- pip:
- h5py==3.0.0
- numpy==1.19.3
- pandas==1.4.0 # min version of pvlib
- pandas==1.3.0 # min version of pvlib
- scipy==1.6.0
- pytest-rerunfailures # conda version is >3.6
- pytest-remotedata # conda package is 0.3.0, needs > 0.3.1
Expand Down
2 changes: 1 addition & 1 deletion ci/requirements-py3.9.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ dependencies:
- h5py
- numba
- numpy >= 1.17.3
- pandas >= 1.4.0
- pandas >= 1.3.0
- pip
- pytest
- pytest-cov
Expand Down
1 change: 0 additions & 1 deletion docs/sphinx/source/whatsnew/v0.11.3.rst
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ Testing

Requirements
~~~~~~~~~~~~
* Minimum version of pandas advanced from 1.3.0 to 1.4.0. (:pull:`2341`)


Contributors
Expand Down
7 changes: 4 additions & 3 deletions pvlib/tests/test_tools.py
Original file line number Diff line number Diff line change
Expand Up @@ -275,11 +275,12 @@ def test_localize_to_utc(input, expected):
got = tools.localize_to_utc(**input)

if isinstance(got, (pd.Series, pd.DataFrame)):
# Older pandas versions have wonky dtype check on index.
# Older pandas versions have wonky dtype equality check on timestamp
# index, so check the values as numpy.ndarray and indices one by one.
np.testing.assert_array_equal(got.to_numpy(), expected.to_numpy())

for index_got, index_expected in zip(got.index, expected.index):
assert index_got == index_expected

np.testing.assert_array_equal(got.to_numpy(), expected.to_numpy())
else:
assert got == expected

Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ authors = [
requires-python = ">=3.9"
dependencies = [
'numpy >= 1.19.3',
'pandas >= 1.4.0',
'pandas >= 1.3.0',
'pytz',
'requests',
'scipy >= 1.6.0',
Expand Down

0 comments on commit 545c196

Please sign in to comment.