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

DOC: use new pydata-sphinx-theme name #32840

Merged

Conversation

jorisvandenbossche
Copy link
Member

Following pydata/pydata-sphinx-theme#102, need to use the new package name

We could actually also start using the released version. But going to merge this soon when CI passes (as I think doc build in other PRs will start to fail)

@jorisvandenbossche jorisvandenbossche added this to the 1.0.4 milestone Mar 19, 2020
@jorisvandenbossche jorisvandenbossche merged commit bfa29f1 into pandas-dev:master Mar 19, 2020
@lumberbot-app
Copy link

lumberbot-app bot commented Mar 19, 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 bfa29f10d4115fada208848e6e7756040525e42d
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #32840: DOC: use new pydata-sphinx-theme name'
  1. Push to a named branch :
git push YOURFORK 1.0.x:auto-backport-of-pr-32840-on-1.0.x
  1. Create a PR against branch 1.0.x, I would have named this PR:

"Backport PR #32840 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.

ShaharNaveh pushed a commit to ShaharNaveh/pandas that referenced this pull request Mar 20, 2020
jorisvandenbossche pushed a commit that referenced this pull request Mar 20, 2020
…name) (#32848)

* Backport PR #32840 on branch 1.0.x (DOC: use new pydata-sphinx-theme name)

* Adding `okwarning`

Co-authored-by: MomIsBestFriend <>
SeeminSyed pushed a commit to CSCD01-team01/pandas that referenced this pull request Mar 22, 2020
jbrockmendel pushed a commit to jbrockmendel/pandas that referenced this pull request Mar 23, 2020
jbrockmendel pushed a commit to jbrockmendel/pandas that referenced this pull request Mar 25, 2020
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