Skip to content

make core.config self-contained#25613

Merged
jreback merged 6 commits intopandas-dev:masterfrom
jbrockmendel:upstream2
Mar 19, 2019
Merged

make core.config self-contained#25613
jreback merged 6 commits intopandas-dev:masterfrom
jbrockmendel:upstream2

Conversation

@jbrockmendel
Copy link
Copy Markdown
Member

@jbrockmendel jbrockmendel commented Mar 9, 2019

Broken off from #25176

WillAyd
WillAyd reviewed Mar 9, 2019
View reviewed changes
pandas/core/config.py Outdated

import pandas.compat as compat
from pandas.compat import lmap, map, u
try:
Copy link
Copy Markdown
Member

@WillAyd WillAyd Mar 9, 2019

Choose a reason for hiding this comment

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

Assuming this is targeted for 0.25 do we even need to bother with this?

Copy link
Copy Markdown
Member Author

@jbrockmendel jbrockmendel Mar 9, 2019

Choose a reason for hiding this comment

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

I figure until we actually start ripping out compat code (any day now I hope) its easier to leave this in and keep the ball rolling on these

Copy link
Copy Markdown
Member

@gfyoung gfyoung Mar 9, 2019

Choose a reason for hiding this comment

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

We could just wait until 0.24.2 comes out before merging this.

@codecov
Copy link
Copy Markdown

codecov bot commented Mar 9, 2019

Codecov Report

Merging #25613 into master will decrease coverage by <.01%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master   #25613      +/-   ##
==========================================
- Coverage   91.26%   91.26%   -0.01%     
==========================================
  Files         173      173              
  Lines       52968    52969       +1     
==========================================
  Hits        48340    48340              
- Misses       4628     4629       +1
Flag Coverage Δ
#multiple 89.83% <100%> (ø) ⬆️
#single 41.71% <42.85%> (ø) ⬆️
Impacted Files Coverage Δ
pandas/core/config.py 87.08% <100%> (+0.04%) ⬆️
pandas/util/testing.py 87.57% <0%> (-0.1%) ⬇️

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 cc4a7e5...b0080f1. Read the comment docs.

@codecov
Copy link
Copy Markdown

codecov bot commented Mar 9, 2019 •
edited
Loading

Codecov Report

Merging #25613 into master will increase coverage by <.01%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master   #25613      +/-   ##
==========================================
+ Coverage   91.26%   91.26%   +<.01%     
==========================================
  Files         172      172              
  Lines       52965    52961       -4     
==========================================
- Hits        48337    48334       -3     
+ Misses       4628     4627       -1
Flag Coverage Δ
#multiple 89.82% <100%> (-0.01%) ⬇️
#single 41.73% <11.11%> (-0.02%) ⬇️
Impacted Files Coverage Δ
pandas/core/config.py 86.82% <100%> (-0.18%) ⬇️
pandas/util/testing.py 89.44% <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 c975fc4...600da0b. Read the comment docs.

@jreback
Copy link
Copy Markdown
Contributor

jreback commented Mar 9, 2019

prob simpler to wait till we start ripping PY2 out, soon, just as release 0.24.2

@jreback jreback added the Clean label Mar 9, 2019
@jbrockmendel
Copy link
Copy Markdown
Member Author

jbrockmendel commented Mar 9, 2019

Another option: unicode is only used to define is_unicode, which is never used anywhere. Could just remove both of em.

@jbrockmendel
Copy link
Copy Markdown
Member Author

jbrockmendel commented Mar 17, 2019

Just rebased. Removed the compat code, since it was only necessary for is_unicode, which is never used anywhere. Should be good to go.

This was referenced Mar 17, 2019
Closed
Merged
WillAyd
WillAyd requested changes Mar 19, 2019
View reviewed changes
pandas/core/config.py Outdated
raise OptionError('No such keys(s)')

s = u('')
s = u''
Copy link
Copy Markdown
Member

@WillAyd WillAyd Mar 19, 2019

Choose a reason for hiding this comment

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

Can get rid of the u prefix now, no?

Copy link
Copy Markdown
Member Author

@jbrockmendel jbrockmendel Mar 19, 2019

Choose a reason for hiding this comment

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

Are we "full speed ahead" on ripping out py2? If not, let's hold off. I'd like to get this and #25757 merged since there are nice follow-ups.

Copy link
Copy Markdown
Contributor

@jreback jreback Mar 19, 2019

Choose a reason for hiding this comment

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

yes, you can remove PY2 things

Copy link
Copy Markdown
Member Author

@jbrockmendel jbrockmendel Mar 19, 2019

Choose a reason for hiding this comment

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

OK, just pushed.

@jreback jreback added this to the 0.25.0 milestone Mar 19, 2019
@jreback
Copy link
Copy Markdown
Contributor

jreback commented Mar 19, 2019

lgtm. merge master ping on green.

@jbrockmendel
Copy link
Copy Markdown
Member Author

jbrockmendel commented Mar 19, 2019

ping

@jreback jreback merged commit 15a6534 into pandas-dev:master Mar 19, 2019
@jreback
Copy link
Copy Markdown
Contributor

jreback commented Mar 19, 2019

thanks!

@jbrockmendel jbrockmendel deleted the upstream2 branch March 19, 2019 23:32
sighingnow added a commit to sighingnow/pandas that referenced this pull request Mar 20, 2019
@sighingnow
Merge remote-tracking branch 'origin/master' into fix-25557
bce25c9 
* origin/master:
  DOC: clean bug fix section in whatsnew (pandas-dev#25792)
  DOC: Fixed PeriodArray api ref (pandas-dev#25526)
  Move locale code out of tm, into _config (pandas-dev#25757)
  Unpin pycodestyle (pandas-dev#25789)
  Add test for rdivmod on EA array (GH23287) (pandas-dev#24047)
  ENH: Support datetime.timezone objects (pandas-dev#25065)
  Cython language level 3 (pandas-dev#24538)
  API: concat on sparse values (pandas-dev#25719)
  TST: assert_produces_warning works with filterwarnings (pandas-dev#25721)
  make core.config self-contained (pandas-dev#25613)
  CLN: replace %s syntax with .format in pandas.io.parsers (pandas-dev#24721)
  TST: Check pytables<3.5.1 when skipping (pandas-dev#25773)
  DOC: Fix typo in docstring of DataFrame.memory_usage  (pandas-dev#25770)
  Replace dicts with OrderedDicts in groupby aggregation functions (pandas-dev#25693)
  TST: Fixturize tests/frame/test_missing.py (pandas-dev#25640)
  DOC: Improve the docsting of Series.iteritems (pandas-dev#24879)
  DOC: Fix function name. (pandas-dev#25751)
  Implementing iso_week_year support for to_datetime (pandas-dev#25541)
  DOC: clarify corr behaviour when using a callable (pandas-dev#25732)
  remove unnecessary check_output (pandas-dev#25755)

# Conflicts:
#	doc/source/whatsnew/v0.25.0.rst
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jreback jreback jreback left review comments

@WillAyd WillAyd WillAyd requested changes

+1 more reviewer

@gfyoung gfyoung gfyoung left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

Clean

Projects

None yet

Milestone

0.25.0

Development

Successfully merging this pull request may close these issues.

4 participants

@jbrockmendel @jreback @WillAyd @gfyoung