Skip to content
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

Work around pydata/pandas-dev#39168 #391

Merged
merged 2 commits into from
Jan 14, 2021
Merged

Work around pydata/pandas-dev#39168 #391

merged 2 commits into from
Jan 14, 2021

Conversation

khaeru
Copy link
Member

@khaeru khaeru commented Jan 14, 2021

Closes #390.

How to review

Note that the CI checks all pass.

PR checklist

  • Add or expand tests. N/A
  • Add, expand, or update documentation.
  • Update release notes.

@khaeru khaeru added this to the 3.2 milestone Jan 14, 2021
@khaeru khaeru self-assigned this Jan 14, 2021
@codecov
Copy link

codecov bot commented Jan 14, 2021

Codecov Report

Merging #391 (7ca00cd) into master (62f07ce) will decrease coverage by 0.0%.
The diff coverage is 100.0%.

@@           Coverage Diff            @@
##           master    #391     +/-   ##
========================================
- Coverage    96.8%   96.8%   -0.1%     
========================================
  Files          46      46             
  Lines        5334    5334             
========================================
- Hits         5168    5167      -1     
- Misses        166     167      +1     
Impacted Files Coverage Δ
ixmp/tests/core/test_timeseries.py 100.0% <100.0%> (ø)
ixmp/utils.py 95.8% <0.0%> (-0.5%) ⬇️

@khaeru khaeru merged commit 36c09e2 into master Jan 14, 2021
@khaeru khaeru deleted the issue/390 branch January 14, 2021 09:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Adjust for pandas 1.2.0
1 participant