Skip to content

remove enum import for PY2 compat, xref #22802 #24170

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

Jump to bottom
Merged
merged 2 commits into from
Dec 11, 2018
Merged

remove enum import for PY2 compat, xref #22802 #24170

merged 2 commits into from
Dec 11, 2018

Conversation

jreback
Copy link
Contributor

@jreback jreback commented Dec 9, 2018 •
edited
Loading

xref #22802

@jreback jreback added this to the 0.24.0 milestone Dec 9, 2018
@jreback jreback mentioned this pull request Dec 9, 2018
Closed
3 tasks
@jreback
Copy link
Contributor Author

jreback commented Dec 9, 2018

@TomAugspurger

@codecov
Copy link

codecov bot commented Dec 9, 2018

Codecov Report

Merging #24170 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master   #24170   +/-   ##
=======================================
  Coverage   92.21%   92.21%           
=======================================
  Files         162      162           
  Lines       51721    51721           
=======================================
  Hits        47692    47692           
  Misses       4029     4029
Flag Coverage Δ
#multiple 90.61% <ø> (ø) ⬆️
#single 43.03% <ø> (ø) ⬆️

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 0ac1197...7397955. Read the comment docs.

@codecov
Copy link

codecov bot commented Dec 9, 2018 •
edited
Loading

Codecov Report

Merging #24170 into master will decrease coverage by <.01%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master   #24170      +/-   ##
==========================================
- Coverage   92.21%   92.21%   -0.01%     
==========================================
  Files         162      162              
  Lines       51763    51763              
==========================================
- Hits        47734    47733       -1     
- Misses       4029     4030       +1
Flag Coverage Δ
#multiple 90.61% <ø> (ø) ⬆️
#single 43% <ø> (-0.01%) ⬇️
Impacted Files Coverage Δ
pandas/io/json/json.py 92.61% <0%> (-0.48%) ⬇️
pandas/util/testing.py 87.51% <0%> (+0.09%) ⬆️

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 7f75389...98898dc. Read the comment docs.

@jreback
Copy link
Contributor Author

jreback commented Dec 9, 2018

this is quite tricky to test as would have to uninstall enum34 first.

@TomAugspurger
Copy link
Contributor

I wonder if we could do something like

  1. Build the wheel as part of the normal install
  2. run the tests
  3. create a new environment with just pytz and python-dateutil
  4. Install the previously built wheel into that environment with --no-deps
  5. Ensure that a basic "import pandas" works.

We could also do this in the pandas-ci repo.

TomAugspurger
TomAugspurger approved these changes Dec 9, 2018
View reviewed changes
pandas/_libs/tslibs/timestamps.pyx
@@ -152,20 +164,17 @@ def round_nsint64(values, mode, freq):
:obj:`ndarray`
"""

if not isinstance(mode, RoundTo):
raise ValueError('mode should be a RoundTo member')
Copy link
Contributor

Choose a reason for hiding this comment

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

Not sure if it matters (probably doesn't) but it seems like bad modes will now raise an AssertionError instead of a ValueError.

@TomAugspurger
Copy link
Contributor

Just a few questions, none of them probably matter.

The testing can be done separately I think (would be good to verify before we tag 0.24).

@effigies
Copy link

I'll be able to confirm that this works in the absence of enum34, once this hits the nightly builds.

@jreback
Copy link
Contributor Author

jreback commented Dec 11, 2018

@TomAugspurger updated

@jreback jreback merged commit c994e98 into pandas-dev:master Dec 11, 2018
@effigies effigies mentioned this pull request Dec 11, 2018
Merged
thoo added a commit to thoo/pandas that referenced this pull request Dec 12, 2018
@thoo
Merge remote-tracking branch 'upstream/master' into flake8_whatsnew21
f6314b0 
* upstream/master:
  pct change bug issue 21200 (pandas-dev#21235)
  DOC: Fix summaries not ending with a period (pandas-dev#24190)
  DOC: Add back currentmodule to api.rst (pandas-dev#24232)
  DOC: Fixed implicit imports for whatsnew (v >= version 20.0) (pandas-dev#24199)
  remove enum import for PY2 compat, xref pandas-dev#22802 (pandas-dev#24170)
  CI: Simplify Azure Pipelines configuration files (pandas-dev#23111)
  REF/TST: Add more pytest idiom to indexing/multiindex/test_getitem.py (pandas-dev#24053)
@effigies
Copy link

Just a note that our tests based on the nightly builds are now passing. Thanks!

@jreback
Copy link
Contributor Author

jreback commented Dec 12, 2018

great! @effigies

@chris-b1 chris-b1 mentioned this pull request Jan 9, 2019
Merged
4 tasks
Pingviinituutti pushed a commit to Pingviinituutti/pandas that referenced this pull request Feb 28, 2019
@jreback @Pingviinituutti
remove enum import for PY2 compat, xref pandas-dev#22802 (pandas-dev#…
126e0cc 
…24170)
Pingviinituutti pushed a commit to Pingviinituutti/pandas that referenced this pull request Feb 28, 2019
@jreback @Pingviinituutti
remove enum import for PY2 compat, xref pandas-dev#22802 (pandas-dev#…
ec4a12e 
…24170)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@TomAugspurger TomAugspurger TomAugspurger approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
0.24.0
Development

Successfully merging this pull request may close these issues.
3 participants
@jreback @TomAugspurger @effigies