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: Fix xarray example #57510

Merged
merged 5 commits into from Feb 20, 2024
Merged

DOC: Fix xarray example #57510

merged 5 commits into from Feb 20, 2024

Conversation

phofl
Copy link
Member

@phofl phofl commented Feb 19, 2024

  • closes #xxxx (Replace xxxx with the GitHub issue number)
  • Tests added and passed if fixing a bug or adding a new feature
  • All code checks passed.
  • Added type annotations to new arguments/methods/functions.
  • Added an entry in the latest doc/source/whatsnew/vX.X.X.rst file if fixing a bug or adding a new feature.

@phofl phofl added the Docs label Feb 19, 2024
@phofl phofl added this to the 2.2.1 milestone Feb 19, 2024
@@ -3124,12 +3124,12 @@ def to_xarray(self):
<xarray.Dataset>
Copy link
Member

Choose a reason for hiding this comment

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

IMO we should just skip this doctest

@mroeschke mroeschke merged commit 33a1cd7 into pandas-dev:main Feb 20, 2024
47 checks passed
@mroeschke
Copy link
Member

Thanks @phofl

Copy link

lumberbot-app bot commented Feb 20, 2024

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 2.2.x
git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
git cherry-pick -x -m1 33a1cd7163ce712e5a38fdb5d2e04de203b3ddf9
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am 'Backport PR #57510: DOC: Fix xarray example'
  1. Push to a named branch:
git push YOURFORK 2.2.x:auto-backport-of-pr-57510-on-2.2.x
  1. Create a PR against branch 2.2.x, I would have named this PR:

"Backport PR #57510 on branch 2.2.x (DOC: Fix xarray example)"

And apply the correct labels and milestones.

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

Remember to remove the Still Needs Manual Backport label once the PR gets merged.

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

@phofl phofl deleted the doc_xarray branch February 20, 2024 20:46
phofl added a commit to phofl/pandas that referenced this pull request Feb 20, 2024
* DOC: Fix xarray example

* Update

* Skip doctest

* Igore another doctest

---------

Co-authored-by: Matthew Roeschke <10647082+mroeschke@users.noreply.github.com>

(cherry picked from commit 33a1cd7)
mroeschke pushed a commit that referenced this pull request Feb 20, 2024
DOC: Fix xarray example (#57510)

* DOC: Fix xarray example

* Update

* Skip doctest

* Igore another doctest

---------

Co-authored-by: Matthew Roeschke <10647082+mroeschke@users.noreply.github.com>

(cherry picked from commit 33a1cd7)
pmhatre1 pushed a commit to pmhatre1/pandas-pmhatre1 that referenced this pull request May 7, 2024
* DOC: Fix xarray example

* Update

* Skip doctest

* Igore another doctest

---------

Co-authored-by: Matthew Roeschke <10647082+mroeschke@users.noreply.github.com>
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.

None yet

2 participants