8000 Bump pandas to 0.25.0; test updates by kandersolar · Pull Request #1448 · pvlib/pvlib-python · GitHub
[go: up one dir, main page]

Skip to content

Bump pandas to 0.25.0; test updates #1448

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.

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 15 commits into from
Apr 28, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
helpful comments
  • Loading branch information
kandersolar committed Apr 25, 2022
commit efc38739321dd48635e0b3e993981c84322b947b
5 changes: 3 additions & 2 deletions pvlib/solarposition.py
Original file line number Diff line number Diff line change
Expand Up @@ -575,8 +575,9 @@ def sun_rise_set_transit_ephem(times, latitude, longitude,
trans = []
for thetime in times:
thetime = thetime.to_pydatetime()
# pyephem drops timezone when converting to its internal datetime
# format, so handle timezone explicitly here
# older versions of pyephem ignore timezone when converting to its
# internal datetime format, so convert to UTC here to support
# all versions. GH #1449
obs.date = ephem.Date(thetime.astimezone(pytz.UTC))
sunrise.append(_ephem_to_timezone(rising(sun), tzinfo))
sunset.append(_ephem_to_timezone(setting(sun), tzinfo))
Expand Down
4 changes: 4 additions & 0 deletions pvlib/tests/test_conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,10 @@ def test__check_pandas_assert_kwargs(mocker, function_name, pd_version,
# test that conftest._check_pandas_assert_kwargs returns appropriate
# kwargs for the assert_x_equal functions

# NOTE: be careful about mixing mocker.patch and pytest.MonkeyPatch!
# they do not coordinate their cleanups, so it is safest to only
# use one or the other. GH #1447

# patch the pandas assert; not interested in actually calling them,
# plus we want to spy on how they get called.
spy = mocker.patch('pandas.testing.' + function_name)
Expand Down
0