Skip to content

0.21.1 backports (round 1) #18697

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 85 commits into from
Dec 11, 2017

Conversation

TomAugspurger
Copy link
Contributor

Reminder: don't squash before merging.

discort and others added 30 commits December 8, 2017 12:24
Previously, MultiIndex columns weren't being
overwritten when header was passed in for to_csv.

Closes pandas-devgh-5539

(cherry picked from commit e1f3a70)
…s-dev#18157)

CI: don't show miniconda output on install
COMPAT: compat with numpy >= 1.14 on str repr
TST: temp disable python-dateutil from master

closes pandas-dev#18123

(cherry picked from commit 8dac633)
…1.0 whatsnew (pandas-dev#18204)

* DOC: clarfiy sum of empty Series case in 0.21.0 whatsnew

* DOC: emphasize matplotlib changes

(cherry picked from commit 85e6864)
* STYLE: clean up flake8 exceptions

* TST: skip if no bs4 for some html tests

* TST: fix local timezone checking with .timestamp()

(cherry picked from commit 96a5274)
topper-123 and others added 19 commits December 8, 2017 13:04
* API: Restore implicit converter registration

* Remove matplotlib from blacklist

* fixup! Remove matplotlib from blacklist

* Add option for toggling formatters

* Remove move

* Handle no matplotlib

* Cleanup

* Test no register

* Restore original state

* Added deregister

* Doc, naming

* Naming

* Added deprecation

* PEP8

* Fix typos

* Rename it all

* Missed one

* Check version

* No warnings by default

* Update release notes

* Test fixup

- actually switch the default to not warn
- We do overwrite matplotlib's formatters

* Doc update

* Fix deprecation message

* Test added by default
* BUG: LatexFormatter.write_result multi-index

Fixed GH issue 14484:
`LatexFormatter.write_result`` now does not print blanks if a
higher-order index differs from the previous row.
Also added testcase for this.

* MAINT: Address reviewer comments

Closes pandas-devgh-14484
Closes pandas-devgh-17499
@TomAugspurger
Copy link
Contributor Author

@jreback @jorisvandenbossche the failure in https://travis-ci.org/pandas-dev/pandas/jobs/313729058 is our old friend, the clipboard failures, since #17723 wasn't backported.

This should be good to go, and then I'll need to make sure I didn't miss any on this round. I'll merge later today.

@jreback
Copy link
Contributor

jreback commented Dec 9, 2017

hmm i though i has a commit where i moves the clipboard tests

but oh well

@jreback jreback added this to the 0.21.1 milestone Dec 9, 2017
Copy link
Contributor

@jreback jreback left a comment

Choose a reason for hiding this comment

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

very minor doc issue. otherwise lgtm.

@@ -54,40 +83,57 @@ Documentation Changes

.. _whatsnew_0211.bug_fixes:

Bug Fixes
Copy link
Contributor

Choose a reason for hiding this comment

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

I think we need a section header here for all the bug fixes (can do in followup)

Copy link
Member

Choose a reason for hiding this comment

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

That should go in a normal PR to master, we should not do any fixes here (apart from possible merge conflicts)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ah, that was my fault. I messed up a merge conflict I think when cherry picking.

Copy link
Member

Choose a reason for hiding this comment

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

ah, yes, this one indeed seems like a wrong merge

@jorisvandenbossche
Copy link
Member

@TomAugspurger This can be merged? (the failure is a clipboard related, so I think can be ignored)

@TomAugspurger
Copy link
Contributor Author

Oh, yes. I thought I had.

@TomAugspurger TomAugspurger merged commit 8bede1a into pandas-dev:0.21.x Dec 11, 2017
@TomAugspurger TomAugspurger deleted the 0.21.1-backports-1 branch December 11, 2017 17:24
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.