Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

DOC: Bump to the sphinx-gallery release#21291

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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged

Conversation

QuLogic
Copy link
Member

PR Summary

Now that it's out, we don't need to depend on a random commit.

PR Checklist

  • [n/a] Has pytest style unit tests (andpytest passes).
  • IsFlake 8 compliant (runflake8 on changed files to check).
  • [n/a] New features are documented, with examples if plot related.
  • Documentation is sphinx and numpydoc compliant (the docs shouldbuild without error).
  • Conforms to Matplotlib style conventions (installflake8-docstrings and runflake8 --docstring-convention=all).
  • [n/a] New features have an entry indoc/users/next_whats_new/ (follow instructions in README.rst there).
  • [n/a] API changes documented indoc/api/next_api_changes/ (follow instructions in README.rst there).

@greglucas
Copy link
Contributor

Also updateenvironment.yml in the base of the repository?

Now that it's out, we don't need to depend on a random commit.
@QuLogicQuLogicforce-pushed thesphinx-gallery-release branch fromce33c2e to0fca630CompareOctober 6, 2021 02:11
@QuLogic
Copy link
MemberAuthor

I always forget about that...

@@ -32,13 +32,10 @@ dependencies:
- scipy
- sphinx>=1.8.1,!=2.0.0
- sphinx-copybutton
- sphinx-gallery>=0.10
- pip
- pip:
Copy link
Contributor

Choose a reason for hiding this comment

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

We could put a cross-reference in the conda environment file so that only one location would be the source of truth.

Suggested change
-pip:
-pip:
--r file:requirements/doc/doc-requirements.txt

Copy link
Member

Choose a reason for hiding this comment

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

I‘m somewhat sceptical on mixing conda and pip packages more than necessary. That could cause unnecessary dependency conflicts. If you think we need something better than manual syncing, please open an issue to discuss options.

@@ -32,13 +32,10 @@ dependencies:
- scipy
- sphinx>=1.8.1,!=2.0.0
- sphinx-copybutton
- sphinx-gallery>=0.10
- pip
- pip:
Copy link
Member

Choose a reason for hiding this comment

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

I‘m somewhat sceptical on mixing conda and pip packages more than necessary. That could cause unnecessary dependency conflicts. If you think we need something better than manual syncing, please open an issue to discuss options.

@timhoffmtimhoffm merged commit97ba9d4 intomatplotlib:masterOct 6, 2021
@lumberbot-app
Copy link

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 v3.5.x$ git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
$ git cherry-pick -m1 97ba9d41efaaf06351d3c531c20a9c448b682b40
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #21291: DOC: Bump to the sphinx-gallery release'
  1. Push to a named branch :
git push YOURFORK v3.5.x:auto-backport-of-pr-21291-on-v3.5.x
  1. Create a PR against branch v3.5.x, I would have named this PR:

"Backport PR#21291 on branch v3.5.x (DOC: Bump to the sphinx-gallery release)"

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!

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

If these instruction are inaccurate, feel free tosuggest an improvement.

@QuLogicQuLogic deleted the sphinx-gallery-release branchOctober 6, 2021 20:17
QuLogic pushed a commit to QuLogic/matplotlib that referenced this pull requestOct 6, 2021
tacaswell added a commit that referenced this pull requestOct 7, 2021
…3.5.xBackport PR#21291 on branch v3.5.x (DOC: Bump to the sphinx-gallery release)
tacaswell pushed a commit to tacaswell/matplotlib that referenced this pull requestOct 12, 2021
tacaswell pushed a commit that referenced this pull requestOct 20, 2021
Sign up for freeto join this conversation on GitHub. Already have an account?Sign in to comment
Reviewers

@jklymakjklymakjklymak approved these changes

@timhoffmtimhoffmtimhoffm approved these changes

@greglucasgreglucasgreglucas approved these changes

Assignees
No one assigned
Projects
None yet
Milestone
v3.5.0
Development

Successfully merging this pull request may close these issues.

4 participants
@QuLogic@greglucas@jklymak@timhoffm

[8]ページ先頭

©2009-2025 Movatter.jp