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

Support pandas 1.0 #263

Merged
merged 9 commits into from
Jan 30, 2020
Merged

Support pandas 1.0 #263

merged 9 commits into from
Jan 30, 2020

Conversation

khaeru
Copy link
Member

@khaeru khaeru commented Jan 30, 2020

Pandas 1.0 is released. This PR makes one adjustment necessary to support pandas 1.0 in ixmp.

Details

The following tests failed:

  • test_reporting.test_reporting_aggregate
  • test_reporting_utils.TestQuantity.test_assert

The following tests trigger a segfault with pandas 1.0:

  • test_reporting.test_reporter_add_product
  • test_reporting.test_reporter_from_dantzig
  • test_reporting.test_reporting_units
  • test_reporting.test_report_size
  • test_reporting.test_reporting_filters

The common cause seems to be a call to pd.Series.to_series() in reporting.utils.AttrSeries.__init__(); the former was removed in pandas 1.0. When the resulting AttributeError occured inside some new, C- or other compiled code in pandas, it triggered the segfault.

Supersedes #261, fixing CI errors on AppVeyor.

PR checklist

  • Tests added. N/A
  • Documentation added. N/A
  • Release notes updated.

@khaeru khaeru added this to the 3.0 milestone Jan 30, 2020
@khaeru khaeru mentioned this pull request Jan 30, 2020
3 tasks
@khaeru khaeru self-assigned this Jan 30, 2020
@khaeru khaeru modified the milestones: 3.0, 2.1 Jan 30, 2020
@khaeru
Copy link
Member Author

khaeru commented Jan 30, 2020

Tests appear to pass as of 82561be.

@khaeru khaeru requested a review from zikolach January 30, 2020 13:44
@codecov
Copy link

codecov bot commented Jan 30, 2020

Codecov Report

Merging #263 into master will increase coverage by 0.00%.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master     #263   +/-   ##
=======================================
  Coverage   93.91%   93.92%           
=======================================
  Files          18       18           
  Lines        2037     2040    +3     
=======================================
+ Hits         1913     1916    +3     
  Misses        124      124           

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update c2e8929...02fa848. Read the comment docs.

Copy link
Contributor

@zikolach zikolach left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @khaeru for fixing it quickly!

@khaeru khaeru merged commit c46ef9c into master Jan 30, 2020
@khaeru khaeru deleted the pandas-1.0 branch January 30, 2020 14:43
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.

2 participants