Merge remote-tracking branch 'upstream/main' into bugfix/29860-handle-nan-inf

Author: AdarshDec

.flake8

@@ -31,7 +31,7 @@ jobs:
           persist-credentials: false
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@1b549b9259bda1cb5ddde3b41741a82a2d15a841  # v3.28.13
+        uses: github/codeql-action/init@fc7e4a0fa01c3cca5fd6a1fddec5c0740c977aa2  # v3.28.14
         with:
           languages: ${{ matrix.language }}
 
@@ -42,4 +42,4 @@ jobs:
           pip install --user -v .
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@1b549b9259bda1cb5ddde3b41741a82a2d15a841  # v3.28.13
+        uses: github/codeql-action/analyze@fc7e4a0fa01c3cca5fd6a1fddec5c0740c977aa2  # v3.28.14

.github/workflows/codeql-analysis.yml

@@ -6,8 +6,8 @@ permissions:
   contents: read
 
 jobs:
-  flake8:
-    name: flake8
+  ruff:
+    name: ruff
     runs-on: ubuntu-latest
     permissions:
       checks: write
@@ -21,19 +21,19 @@ jobs:
         with:
           python-version: '3.10'
 
-      - name: Install flake8
-        run: pip3 install -r requirements/testing/flake8.txt
+      - name: Install ruff
+        run: pip3 install ruff
 
       - name: Set up reviewdog
         uses: reviewdog/action-setup@e04ffabe3898a0af8d0fb1af00c188831c4b5893  # v1.3.9
 
-      - name: Run flake8
+      - name: Run ruff
         env:
           REVIEWDOG_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           set -o pipefail
-          flake8 --docstring-convention=all | \
-            reviewdog -f=pep8 -name=flake8 \
+          ruff check --output-format rdjson | \
+            reviewdog -f=rdjson \
               -tee -reporter=github-check -filter-mode nofilter
   mypy:
     name: mypy

.github/workflows/reviewdog.yml

@@ -41,15 +41,14 @@ repos:
         args: ["--config-file=pyproject.toml", "lib/matplotlib"]
         files: lib/matplotlib  # Only run when files in lib/matplotlib are changed.
         pass_filenames: false
-  - repo: https://github.com/pycqa/flake8
-    rev: 7.1.1
+
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    # Ruff version.
+    rev: v0.11.0
     hooks:
-      - id: flake8
-        additional_dependencies:
-          - pydocstyle>5.1.0
-          - flake8-docstrings>1.4.0
-          - flake8-force
-        args: ["--docstring-convention=all"]
+      # Run the linter.
+      - id: ruff
+        args: [--fix, --show-fixes]
   - repo: https://github.com/codespell-project/codespell
     rev: v2.3.0
     hooks:

.pre-commit-config.yaml

@@ -0,0 +1,4 @@
+New minimum version of pyparsing
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The minimum required version of ``pyparsing`` has been updated from 2.3.1 to 3.0.0.

doc/api/next_api_changes/development/29745-DS.rst

@@ -15,22 +15,28 @@ consistency, and maintainability of the code base.
 
 .. _code-style:
 
-PEP8, as enforced by flake8
-===========================
+PEP8, as enforced by ruff
+=========================
 
-Formatting should follow the recommendations of PEP8_, as enforced by flake8_.
+Formatting should follow the recommendations of PEP8_, as enforced by ruff_.
 Matplotlib modifies PEP8 to extend the maximum line length to 88
-characters. You can check flake8 compliance from the command line with ::
+characters. You can check PEP8 compliance from the command line with ::
+
+    python -m pip install ruff
+    ruff check /path/to/module.py
+
+or your editor may provide integration with it. To check all files,
+and fix any errors in-place (where possible) run ::
+
+    ruff check --fix
 
-    python -m pip install flake8
-    flake8 /path/to/module.py
 
-or your editor may provide integration with it.  Note that Matplotlib intentionally
-does not use the black_ auto-formatter (1__), in particular due to its inability
-to understand the semantics of mathematical expressions (2__, 3__).
+Matplotlib intentionally does not use the black_ auto-formatter (1__),
+in particular due to its inability to understand the semantics of
+mathematical expressions (2__, 3__).
 
 .. _PEP8: https://www.python.org/dev/peps/pep-0008/
-.. _flake8: https://flake8.pycqa.org/
+.. _ruff: https://docs.astral.sh/ruff/
 .. _black: https://black.readthedocs.io/
 .. __: https://github.com/matplotlib/matplotlib/issues/18796
 .. __: https://github.com/psf/black/issues/148

doc/devel/coding_guide.rst

@@ -163,9 +163,10 @@ the tests, they should now pass.
 
 It is preferred that new tests use ``style='mpl20'`` as this leads to smaller
 figures and reflects the newer look of default Matplotlib plots. Also, if the
-texts (labels, tick labels, etc) are not really part of what is tested, use
-``remove_text=True`` as this will lead to smaller figures and reduce possible
-issues with font mismatch on different platforms.
+texts (labels, tick labels, etc) are not really part of what is tested, use the
+``remove_text=True`` argument or add the ``text_placeholders`` fixture as this
+will lead to smaller figures and reduce possible issues with font mismatch on
+different platforms.
 
 
 Compare two methods of creating an image

doc/devel/testing.rst

@@ -29,7 +29,7 @@ reference.
 * `NumPy <https://numpy.org>`_ (>= 1.23)
 * `packaging <https://pypi.org/project/packaging/>`_ (>= 20.0)
 * `Pillow <https://pillow.readthedocs.io/en/latest/>`_ (>= 9.0)
-* `pyparsing <https://pypi.org/project/pyparsing/>`_ (>= 2.3.1)
+* `pyparsing <https://pypi.org/project/pyparsing/>`_ (>= 3)
 
 
 .. _optional_dependencies:
@@ -346,7 +346,6 @@ otherwise they must be installed manually:
 - pikepdf_ used in some tests for the pgf and pdf backends
 - psutil_ used in testing the interactive backends
 - pytest-cov_ (>= 2.3.1) to collect coverage information
-- pytest-flake8_ to test coding standards using flake8_
 - pytest-timeout_ to limit runtime in case of stuck tests
 - pytest-xdist_ to run tests in parallel
 - pytest-xvfb_ to run tests without windows popping up (Linux)
@@ -373,15 +372,13 @@ them will be skipped by pytest.
 .. _Ghostscript: https://ghostscript.com/
 .. _Inkscape: https://inkscape.org
 .. _WenQuanYi Zen Hei: http://wenq.org/en/
-.. _flake8: https://pypi.org/project/flake8/
 .. _nbconvert: https://pypi.org/project/nbconvert/
 .. _nbformat: https://pypi.org/project/nbformat/
 .. _pandas: https://pypi.org/project/pandas/
 .. _pikepdf: https://pypi.org/project/pikepdf/
 .. _psutil: https://pypi.org/project/psutil/
 .. _pytz: https://fonts.google.com/noto/use#faq
 .. _pytest-cov: https://pytest-cov.readthedocs.io/en/latest/
-.. _pytest-flake8: https://pypi.org/project/pytest-flake8/
 .. _pytest-timeout: https://pypi.org/project/pytest-timeout/
 .. _pytest-xdist: https://pypi.org/project/pytest-xdist/
 .. _pytest-xvfb: https://pypi.org/project/pytest-xvfb/

doc/install/dependencies.rst

@@ -0,0 +1,9 @@
+Figure size units
+-----------------
+
+When creating figures, it is now possible to define figure sizes in cm or pixel.
+
+Up to now the figure size is specified via ``plt.figure(..., figsize=(6, 4))``,
+and the given numbers are interpreted as inches. It is now possible to add a
+unit string to the tuple, i.e. ``plt.figure(..., figsize=(600, 400, "px"))``.
+Supported unit strings are "in", "cm", "px".

doc/users/next_whats_new/figsize_unit.rst

@@ -24,7 +24,7 @@ dependencies:
   - pillow>=9
   - pkg-config
   - pygobject
-  - pyparsing>=2.3.1
+  - pyparsing>=3
   - pyqt
   - python>=3.10
   - python-dateutil>=2.1
@@ -55,8 +55,6 @@ dependencies:
   # testing
   - black<24
   - coverage
-  - flake8>=3.8,<7.2
-  - flake8-docstrings>=1.4.0
   - gtk4
   - ipykernel
   - nbconvert[execute]!=6.0.0,!=6.0.1,!=7.3.0,!=7.3.1
@@ -72,4 +70,5 @@ dependencies:
   - pytest-xdist
   - tornado
   - pytz
+  - ruff
   - tox