Thanks to visit codestin.com
Credit goes to github.com

Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions .github/workflows/cibuildwheel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
fetch-depth: 0
persist-credentials: false

- uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
- uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
name: Install Python
with:
python-version: '3.11'
Expand Down Expand Up @@ -143,7 +143,7 @@ jobs:
path: dist/

- name: Build wheels for CPython 3.14
uses: pypa/cibuildwheel@c923d83ad9c1bc00211c5041d0c3f73294ff88f6 # v3.1.4
uses: pypa/cibuildwheel@352e01339f0a173aa2a3eb57f01492e341e83865 # v3.1.3
with:
package-dir: dist/${{ needs.build_sdist.outputs.SDIST_NAME }}
env:
Expand All @@ -153,7 +153,7 @@ jobs:
CIBW_MANYLINUX_X86_64_IMAGE: manylinux_2_28

- name: Build wheels for CPython 3.13
uses: pypa/cibuildwheel@c923d83ad9c1bc00211c5041d0c3f73294ff88f6 # v3.1.4
uses: pypa/cibuildwheel@352e01339f0a173aa2a3eb57f01492e341e83865 # v3.1.3
with:
package-dir: dist/${{ needs.build_sdist.outputs.SDIST_NAME }}
env:
Expand All @@ -162,23 +162,23 @@ jobs:
CIBW_ARCHS: ${{ matrix.cibw_archs }}

- name: Build wheels for CPython 3.12
uses: pypa/cibuildwheel@c923d83ad9c1bc00211c5041d0c3f73294ff88f6 # v3.1.4
uses: pypa/cibuildwheel@352e01339f0a173aa2a3eb57f01492e341e83865 # v3.1.3
with:
package-dir: dist/${{ needs.build_sdist.outputs.SDIST_NAME }}
env:
CIBW_BUILD: "cp312-*"
CIBW_ARCHS: ${{ matrix.cibw_archs }}

- name: Build wheels for CPython 3.11
uses: pypa/cibuildwheel@c923d83ad9c1bc00211c5041d0c3f73294ff88f6 # v3.1.4
uses: pypa/cibuildwheel@352e01339f0a173aa2a3eb57f01492e341e83865 # v3.1.3
with:
package-dir: dist/${{ needs.build_sdist.outputs.SDIST_NAME }}
env:
CIBW_BUILD: "cp311-*"
CIBW_ARCHS: ${{ matrix.cibw_archs }}

- name: Build wheels for PyPy
uses: pypa/cibuildwheel@c923d83ad9c1bc00211c5041d0c3f73294ff88f6 # v3.1.4
uses: pypa/cibuildwheel@352e01339f0a173aa2a3eb57f01492e341e83865 # v3.1.3
with:
package-dir: dist/${{ needs.build_sdist.outputs.SDIST_NAME }}
env:
Expand Down Expand Up @@ -215,9 +215,9 @@ jobs:
run: ls dist

- name: Generate artifact attestation for sdist and wheel
uses: actions/attest-build-provenance@977bb373ede98d70efdf65b84cb5f73e068dcc2a # v3.0.0
uses: actions/attest-build-provenance@e8998f949152b193b063cb0ec769d69d929409be # v2.4.0
with:
subject-path: dist/matplotlib-*

- name: Publish package distributions to PyPI
uses: pypa/gh-action-pypi-publish@ed0c53931b1dc9bd32cbe73a98c7f6766f8a527e # v1.13.0
uses: pypa/gh-action-pypi-publish@76f52bc884231f62b9a034ebfe128415bbaabdfc # v1.12.4
2 changes: 1 addition & 1 deletion .github/workflows/circleci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:

- name: Set up reviewdog
if: "${{ steps.fetch-artifacts.outputs.count != 0 }}"
uses: reviewdog/action-setup@d8edfce3dd5e1ec6978745e801f9c50b5ef80252 # v1.4.0
uses: reviewdog/action-setup@e04ffabe3898a0af8d0fb1af00c188831c4b5893 # v1.3.2
with:
reviewdog_version: latest

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
persist-credentials: false

- name: Initialize CodeQL
uses: github/codeql-action/init@f1f6e5f6af878fb37288ce1c627459e94dbf7d01 # v3.30.1
uses: github/codeql-action/init@96f518a34f7a870018057716cc4d7a5c014bd61c # v3.29.10
with:
languages: ${{ matrix.language }}

Expand All @@ -43,4 +43,4 @@ jobs:
pip install --user -v .

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@f1f6e5f6af878fb37288ce1c627459e94dbf7d01 # v3.30.1
uses: github/codeql-action/analyze@96f518a34f7a870018057716cc4d7a5c014bd61c # v3.29.10
2 changes: 1 addition & 1 deletion .github/workflows/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ jobs:
pull-requests: write
runs-on: ubuntu-latest
steps:
- uses: actions/labeler@634933edcd8ababfe52f92936142cc22ac488b1b # v6.0.1
- uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9 # v5.0.0
with:
sync-labels: true
12 changes: 6 additions & 6 deletions .github/workflows/linting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
with:
fetch-depth: 0
persist-credentials: false
- uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
- uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
with:
python-version: "3.x"
- uses: pre-commit/action@2c7b3805fd2a0fd8c1884dcaebf91fc102a13ecd # v3.0.1
Expand All @@ -32,15 +32,15 @@ jobs:
persist-credentials: false

- name: Set up Python 3
uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
with:
python-version: '3.11'

- name: Install ruff
run: pip3 install ruff

- name: Set up reviewdog
uses: reviewdog/action-setup@d8edfce3dd5e1ec6978745e801f9c50b5ef80252 # v1.4.0
uses: reviewdog/action-setup@e04ffabe3898a0af8d0fb1af00c188831c4b5893 # v1.3.9

- name: Run ruff
env:
Expand All @@ -61,15 +61,15 @@ jobs:
persist-credentials: false

- name: Set up Python 3
uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
with:
python-version: '3.11'

- name: Install mypy
run: pip3 install -r requirements/testing/mypy.txt -r requirements/testing/all.txt

- name: Set up reviewdog
uses: reviewdog/action-setup@d8edfce3dd5e1ec6978745e801f9c50b5ef80252 # v1.4.0
uses: reviewdog/action-setup@e04ffabe3898a0af8d0fb1af00c188831c4b5893 # v1.3.9

- name: Run mypy
env:
Expand All @@ -92,7 +92,7 @@ jobs:
persist-credentials: false

- name: eslint
uses: reviewdog/action-eslint@556a3fdaf8b4201d4d74d406013386aa4f7dab96 # v1.34.0
uses: reviewdog/action-eslint@2fee6dd72a5419ff4113f694e2068d2a03bb35dd # v1.33.2
with:
filter_mode: nofilter
github_token: ${{ secrets.GITHUB_TOKEN }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/mypy-stubtest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ jobs:
persist-credentials: false

- name: Set up Python 3
uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
with:
python-version: '3.11'

- name: Set up reviewdog
uses: reviewdog/action-setup@d8edfce3dd5e1ec6978745e801f9c50b5ef80252 # v1.4.0
uses: reviewdog/action-setup@e04ffabe3898a0af8d0fb1af00c188831c4b5893 # v1.3.9

- name: Install tox
run: python -m pip install tox
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pr_welcome.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ jobs:
steps:
- uses: actions/first-interaction@753c925c8d1ac6fede23781875376600628d9b5d # v3.0.0
with:
repo_token: ${{ secrets.GITHUB_TOKEN }}
pr_message: >+
repo-token: ${{ secrets.GITHUB_TOKEN }}
pr-message: >+
Thank you for opening your first PR into Matplotlib!


Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/stale-tidy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
if: github.repository == 'matplotlib/matplotlib'
runs-on: ubuntu-latest
steps:
- uses: actions/stale@3a9db7e6a41a89f618792c92c0e97cc736e1b13f # v10.0.0
- uses: actions/stale@5bef64f19d7facfb25b37b414482c7164d639639 # v9.1.0
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
operations-per-run: 300
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
if: github.repository == 'matplotlib/matplotlib'
runs-on: ubuntu-latest
steps:
- uses: actions/stale@3a9db7e6a41a89f618792c92c0e97cc736e1b13f # v10.0.0
- uses: actions/stale@5bef64f19d7facfb25b37b414482c7164d639639 # v9.1.0
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
operations-per-run: 20
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ jobs:
persist-credentials: false

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
with:
python-version: ${{ matrix.python-version }}
allow-prereleases: true
Expand Down Expand Up @@ -396,7 +396,7 @@ jobs:
fi
- name: Upload code coverage
if: ${{ !cancelled() && github.event_name != 'schedule' }}
uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 # v5.5.1
uses: codecov/codecov-action@18283e04ce6e62d37312384ff67231eb8fd56d24 # v5.4.3
with:
name: "${{ matrix.python-version }} ${{ matrix.os }} ${{ matrix.name-suffix }}"
token: ${{ secrets.CODECOV_TOKEN }}
Expand Down
4 changes: 0 additions & 4 deletions doc/api/next_api_changes/behavior/30532-TH.rst

This file was deleted.

4 changes: 0 additions & 4 deletions doc/api/next_api_changes/deprecations/30364-AS.rst

This file was deleted.

16 changes: 9 additions & 7 deletions doc/devel/contribute.rst
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@ Ways to contribute
* **You are a Matplotlib user, and you see a bug, a potential improvement, or
something that annoys you, and you can fix it.**

You can search our `issue tracker <https://github.com/matplotlib/matplotlib/issues>`__
for an existing issue that describes your problem or
You can search our issue tracker for an existing issue that describes your problem or
open a new issue to inform us of the problem you observed and discuss the best approach
to fix it. If your contributions would not be captured on GitHub (social media,
communication, educational content), you can also reach out to us on gitter_,
Expand All @@ -43,11 +42,14 @@ Ways to contribute

Awesome — you have a focus on a specific application and domain and can
start there. In this case, maintainers can help you figure out the best
implementation; `open an issue <https://github.com/matplotlib/matplotlib/issues/new/choose>`__
in our issue tracker, and we'll be happy to discuss technical approaches.
implementation; open an issue or pull request with a starting point, and we'll
be happy to discuss technical approaches.

If you can implement the solution yourself, even better! Consider contributing
the change as a :ref:`pull request <how-to-pull-request>` right away.
If you prefer, you can use the `GitHub functionality for "draft" pull requests
<https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/changing-the-stage-of-a-pull-request#converting-a-pull-request-to-a-draft>`__
and request early feedback on whatever you are working on, but you should be
aware that maintainers may not review your contribution unless it has the
"Ready to review" state on GitHub.

* **You are new to Matplotlib, both as a user and contributor, and want to start
contributing but have yet to develop a particular interest.**
Expand Down Expand Up @@ -285,7 +287,7 @@ guide you through each step:
4. Check existing pull requests (e.g., :ghpull:`28476`) and filter by the issue number to make sure the issue is not in progress:

* If the issue has a pull request (is in progress), tag the user working on the issue, and ask to collaborate (optional).
* If there is no pull request, :ref:`create a new pull request <how-to-pull-request>`.
* If a pull request does not exist, create a `draft pull request <https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-pull-requests#draft-pull-requests>`_ and follow the `pull request guidelines <https://matplotlib.org/devdocs/devel/pr_guide.html>`_.
5. Please familiarize yourself with the pull request template (see below),
and ensure you understand/are able to complete the template when you open your pull request.
Additional information can be found in the `pull request guidelines <https://matplotlib.org/devdocs/devel/pr_guide.html>`_.
Expand Down
6 changes: 3 additions & 3 deletions doc/devel/development_workflow.rst
Original file line number Diff line number Diff line change
Expand Up @@ -179,9 +179,9 @@ Enter a title for the set of changes with some explanation of what you've done.
Mention anything you'd like particular attention for - such as a
complicated change or some code you are not happy with.

If you don't think your request is ready to be merged, make a
:ref:`draft pull request <draft-pr>` and state what aspects you want to have
feedback on. This is a good way of getting some preliminary code review.
If you don't think your request is ready to be merged, just say so in your pull
request message and use the "Draft PR" feature of GitHub. This is a good way of
getting some preliminary code review.

For more guidance on the mechanics of making a pull request, see GitHub's
`pull request tutorial <https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request-from-a-fork>`_.
Expand Down
73 changes: 24 additions & 49 deletions doc/devel/pr_guide.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ We value contributions from people with all levels of experience. In particular,
if this is your first PR not everything has to be perfect. We'll guide you
through the PR process. Nevertheless, please try to follow our guidelines as well
as you can to help make the PR process quick and smooth. If your pull request is
incomplete or a work-in-progress, please mark it as a :ref:`draft pull request <draft-pr>`
incomplete or a work-in-progress, please mark it as a `draft pull requests <https://docs.github.com/en/github/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-pull-requests#draft-pull-requests>`_
on GitHub and specify what feedback from the developers would be helpful.

Please be patient with reviewers. We try our best to respond quickly, but we have
Expand Down Expand Up @@ -109,32 +109,15 @@ Workflow
* The PR should :ref:`target the main branch <pr-branch-selection>`.
* Tag with descriptive :ref:`labels <pr-labels>`.
* Set the :ref:`milestone <pr-milestones>`.
* :ref:`Review <pr-review>` the contents.
* Approve if all of the above topics are handled.
* Keep an eye on the :ref:`number of commits <pr-squashing>`.
* :ref:`Merge <pr-merging>` if a :ref:`sufficient number of approvals <pr-approval>` is reached.
* Approve if all of the above topics are handled.
* :ref:`Merge <pr-merging>` if a sufficient number of approvals is reached.

.. _pr-guidelines-details:

Detailed guidelines
===================

.. _draft-pr:

Draft PRs
---------

Authors may create a `draft PR`_ (or change to draft status later) if the code
is not yet ready for a regular full review. Typical use cases are posting code
as a basis for discussion or signalling that you intend to rework the code as
a result of feedback. Authors should clearly communicate why the PR has draft
status and what needs to be done to make it ready for review. In particular,
they should explicitly ask for targeted feedback if needed. By default,
reviewers will not look at the code of a draft PR and only respond to specific
questions by the author.

.. _draft PR: https://docs.github.com/en/github/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-pull-requests#draft-pull-requests

.. _pr-documentation:

Documentation
Expand Down Expand Up @@ -191,27 +174,10 @@ All Pull Requests should target the main branch. The milestone tag triggers
an :ref:`automatic backport <automated-backports>` for milestones which have
a corresponding branch.

.. _pr-review:

Review
------

* Do not let perfect be the enemy of the good, particularly for
documentation or example PRs. If you find yourself making many
small suggestions, either open a PR against the original branch,
push changes to the contributor branch, or merge the PR and then
open a new PR against upstream.

* If you push to a contributor branch leave a comment explaining what
you did, ex "I took the liberty of pushing a small clean-up PR to
your branch, thanks for your work.". If you are going to make
substantial changes to the code or intent of the PR please check
with the contributor first.

.. _pr-approval:
.. _pr-merging:

Approval
--------
Merging
-------
As a guiding principle, we require two `approvals`_ from core developers (those
with commit rights) before merging a pull request. This two-pairs-of-eyes
strategy shall ensure a consistent project direction and prevent accidental
Expand Down Expand Up @@ -247,22 +213,18 @@ Some explicit rules following from this:
A core dev should only champion one PR at a time and we should try to keep
the flow of championed PRs reasonable.

After giving the last required approval, the author of the approval should
merge the PR. PR authors should not self-merge except for when another reviewer
explicitly allows it (e.g., "Approve modulo CI passing, may self merge when
green", or "Take or leave the comments. You may self merge".).

.. _pr-automated-tests:

Automated tests
---------------
Before being merged, a PR should pass the :ref:`automated-tests`. If you are
unsure why a test is failing, ask on the PR or in our :ref:`communication-channels`

.. _pr-merging:

Merging
-------
After giving the last required :ref:`approval <pr-approval>`, the author of the
approval should merge the PR. PR authors should not self-merge except for when
another reviewer explicitly allows it (e.g., "Approve modulo CI passing, may
self-merge when green", or "Take or leave the comments. You may self merge".).

.. _pr-squashing:

Number of commits and squashing
Expand All @@ -274,6 +236,19 @@ Number of commits and squashing
about it is to eliminate binary files (ex multiple test image
re-generations) and to remove upstream merges.

* Do not let perfect be the enemy of the good, particularly for
documentation or example PRs. If you find yourself making many
small suggestions, either open a PR against the original branch,
push changes to the contributor branch, or merge the PR and then
open a new PR against upstream.

* If you push to a contributor branch leave a comment explaining what
you did, ex "I took the liberty of pushing a small clean-up PR to
your branch, thanks for your work.". If you are going to make
substantial changes to the code or intent of the PR please check
with the contributor first.


.. _branches_and_backports:

Branches and backports
Expand Down
Loading
Loading