Skip to content

DOC: combine regressions in section in v1.0.1 whatsnew #31607

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

Conversation

jorisvandenbossche
Copy link
Member

Similarly how we did it for 0.24.x, gathering all regressions in the first section of the whatsnew (as those are the most important part of 1.0.1)

cc @TomAugspurger

@jorisvandenbossche jorisvandenbossche added this to the 1.0.1 milestone Feb 3, 2020
@jorisvandenbossche
Copy link
Member Author

Given that there is not much remaining in the "Bug fixes" section, I can probably remove the subtitles there?

@TomAugspurger
Copy link
Contributor

I can probably remove the subtitles there?

Agreed.

@TomAugspurger
Copy link
Contributor

This will cause merge conflicts with outstanding PRs. What order do you want to merge these in?

@jorisvandenbossche
Copy link
Member Author

I can fixup conflicts later here, or also help fixing conflicts in the other PRs. Doesn't matter really to me

@TomAugspurger
Copy link
Contributor

Let's just merge this since it's already passing.

@TomAugspurger TomAugspurger merged commit a9d2450 into pandas-dev:master Feb 3, 2020
@lumberbot-app
Copy link

lumberbot-app bot commented Feb 3, 2020

Owee, I'm MrMeeseeks, Look at me.

There seem to be a conflict, please backport manually. Here are approximate instructions:

  1. Checkout backport branch and update it.
$ git checkout 1.0.x
$ git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
$ git cherry-pick -m1 a9d24502f50045456fe94abb91b867318fcaf54a
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #31607: DOC: combine regressions in section in v1.0.1 whatsnew'
  1. Push to a named branch :
git push YOURFORK 1.0.x:auto-backport-of-pr-31607-on-1.0.x
  1. Create a PR against branch 1.0.x, I would have named this PR:

"Backport PR #31607 on branch 1.0.x"

And apply the correct labels and milestones.

Congratulation you did some good work ! Hopefully your backport PR will be tested by the continuous integration and merged soon!

If these instruction are inaccurate, feel free to suggest an improvement.

@jorisvandenbossche jorisvandenbossche deleted the doc-whatsnew-101 branch February 3, 2020 14:27
jorisvandenbossche added a commit to jorisvandenbossche/pandas that referenced this pull request Feb 3, 2020
)

* DOC: combine regressions in section in v1.0.1 whatsnew

* move more

* label

* remove bug fixes subsections

* fix rst
TomAugspurger pushed a commit that referenced this pull request Feb 3, 2020
* DOC: combine regressions in section in v1.0.1 whatsnew

* move more

* label

* remove bug fixes subsections

* fix rst
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants