Merge remote-tracking branch 'upstream/main' into translate-readme-zh

zhuj05 · zhuj05 · commit 2fbd10afcff2 · 2026-04-08T15:25:10.000+08:00
diff --git a/.github/workflows/cibuildwheel.yml b/.github/workflows/cibuildwheel.yml
@@ -146,7 +146,7 @@ jobs:
           path: dist/
 
       - name: Build wheels for CPython 3.14
-        uses: pypa/cibuildwheel@ee02a1537ce3071a004a6b08c41e72f0fdc42d9a  # v3.4.0
+        uses: pypa/cibuildwheel@8d2b08b68458a16aeb24b64e68a09ab1c8e82084  # v3.4.1
         with:
           package-dir: dist/${{ needs.build_sdist.outputs.SDIST_NAME }}
         env:
@@ -156,7 +156,7 @@ jobs:
           CIBW_MANYLINUX_X86_64_IMAGE: manylinux_2_28
 
       - name: Build wheels for CPython 3.13
-        uses: pypa/cibuildwheel@ee02a1537ce3071a004a6b08c41e72f0fdc42d9a  # v3.4.0
+        uses: pypa/cibuildwheel@8d2b08b68458a16aeb24b64e68a09ab1c8e82084  # v3.4.1
         with:
           package-dir: dist/${{ needs.build_sdist.outputs.SDIST_NAME }}
         env:
@@ -165,23 +165,23 @@ jobs:
           CIBW_ARCHS: ${{ matrix.cibw_archs }}
 
       - name: Build wheels for CPython 3.12
-        uses: pypa/cibuildwheel@ee02a1537ce3071a004a6b08c41e72f0fdc42d9a  # v3.4.0
+        uses: pypa/cibuildwheel@8d2b08b68458a16aeb24b64e68a09ab1c8e82084  # v3.4.1
         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@ee02a1537ce3071a004a6b08c41e72f0fdc42d9a  # v3.4.0
+        uses: pypa/cibuildwheel@8d2b08b68458a16aeb24b64e68a09ab1c8e82084  # v3.4.1
         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@ee02a1537ce3071a004a6b08c41e72f0fdc42d9a  # v3.4.0
+        uses: pypa/cibuildwheel@8d2b08b68458a16aeb24b64e68a09ab1c8e82084  # v3.4.1
         with:
           package-dir: dist/${{ needs.build_sdist.outputs.SDIST_NAME }}
         env:
diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml
@@ -18,7 +18,7 @@ jobs:
       - uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405  # v6.2.0
         with:
           python-version: "3.x"
-      - uses: j178/prek-action@79f765515bd648eb4d6bb1b17277b7cb22cb6468  # v2.0.0
+      - uses: j178/prek-action@53276d8b0d10f8b6672aa85b4588c6921d0370cc  # v2.0.1
         with:
           extra_args: --hook-stage manual --all-files
 
diff --git a/.github/workflows/pr_welcome.yml b/.github/workflows/pr_welcome.yml
@@ -16,7 +16,7 @@ jobs:
       issues: write
       pull-requests: write
     steps:
-      - uses: plbstl/first-contribution@4fb1541ce2706255850d56c5684552607be1ae9b  # v4.2.0
+      - uses: plbstl/first-contribution@7c31f41b0e7a70adfcae06cf964679f61af6780b  # v4.3.0
         with:
           labels: first-contribution
           pr-opened-msg: >+
diff --git a/.github/workflows/wasm.yml b/.github/workflows/wasm.yml
@@ -50,7 +50,7 @@ jobs:
           python-version: '3.13'
 
       - name: Build wheels for wasm
-        uses: pypa/cibuildwheel@ee02a1537ce3071a004a6b08c41e72f0fdc42d9a  # v3.4.0
+        uses: pypa/cibuildwheel@8d2b08b68458a16aeb24b64e68a09ab1c8e82084  # v3.4.1
         env:
           CIBW_BUILD: "cp312-*"
           CIBW_PLATFORM: "pyodide"
diff --git a/doc/devel/contribute.rst b/doc/devel/contribute.rst
@@ -185,32 +185,42 @@ If you have developed an extension to Matplotlib, please consider adding it to o
 
 .. _generative_ai:
 
+Use of Generative AI
+====================
+
+Generative AI tools are evolving rapidly and can be helpful. As with any tool,
+the resulting contribution is the responsibility of the contributor. We
+expect dedicated and authentic engagement in our community. In particular when
+using AI, carefully consider what and how to communicate, question results,
+think things through thoroughly and make well-informed decisions.
+
+Some examples of acceptable and unacceptable AI uses are:
+
+.. grid:: 1 1 2 2
+
+  .. grid-item::
+
+    :octicon:`check;1em;sd-text-success` **Acceptable uses**
+
+    - Gaining understanding of the existing code
+    - Getting solution ideas
+    - Translating or proof-reading your comments or PR descriptions. Please keep
+      the wording as close as possible to your original wording.
+
+  .. grid-item::
+
+    :octicon:`x;1em;sd-text-danger`  **Unacceptable uses**
+
+    - External AI tooling (e.g. bots, agents) directly interacting with the project;
+      including creating issues, PRs or commenting on GitHub or Discourse.
+    - Solving topics that you wouldn't be able to solve yourself without AI
+    - Using AI output without ensuring that you fully understand the output or
+      without verifying that it is the correct approach.
 
-Restrictions on Generative AI Usage
-===================================
-
-We expect authentic engagement in our community.
-
-- Do not post output from Large Language Models or similar generative AI as
-  comments on GitHub or our discourse server, as such comments tend to be
-  formulaic and low content.
-- If you use generative AI tools as an aid in developing code or documentation
-  changes, ensure that you fully understand the proposed changes and can
-  explain why they are the correct approach.
-- If you use AI for translation or grammar correction, please keep the wording as close
-  as possible to the original wording. It is much easier to come to a mutual
-  understanding when we are working off a direct translation of your words/thoughts
-  rather than a text an LLM may have embellished with possibly spurious information.
-
-Make sure you have added value based on your personal competency to your
-contributions. Just taking some input, feeding it to an AI and posting the
-result is not of value to the project. To preserve precious core developer
-capacity, we reserve the right to rigorously reject seemingly AI generated
-low-value contributions.
-
-In particular, it is also strictly forbidden to post AI generated
-content to issues or PRs via automated tooling such as bots or agents. We
-may ban such users and/or report them to GitHub.
+To ensure project health and preserve limited core developer capacity, we will flag
+and reject low-value contributions that we believe are AI generated. We may ban
+and/or report users to GitHub if they harm the project or its community through
+irresponsible use of AI.
 
 .. _new_contributors:
 
diff --git a/lib/matplotlib/legend.py b/lib/matplotlib/legend.py
@@ -1363,7 +1363,7 @@ def _parse_legend_args(axs, *args, handles=None, labels=None, **kwargs):
                            f"len(handles) = {len(handles)} "
                            f"len(labels) = {len(labels)}")
     # if got both handles and labels as kwargs, make same length
-    if handles and labels:
+    if handles is not None and labels is not None:
         handles, labels = zip(*zip(handles, labels))
 
     elif handles is not None and labels is None:
