Merge branch 'main' into 24743_contour_kwargs

Author: chahak13

.appveyor.yml

@@ -22,10 +22,10 @@ environment:
                  --cov-report= --cov=lib --log-level=DEBUG
 
   matrix:
-    - PYTHON_VERSION: "3.8"
+    - PYTHON_VERSION: "3.9"
       CONDA_INSTALL_LOCN: "C:\\Miniconda3-x64"
       TEST_ALL: "no"
-    - PYTHON_VERSION: "3.9"
+    - PYTHON_VERSION: "3.10"
       CONDA_INSTALL_LOCN: "C:\\Miniconda3-x64"
       TEST_ALL: "no"
 

.circleci/config.yml

@@ -205,9 +205,9 @@ commands:
 #
 
 jobs:
-  docs-python38:
+  docs-python39:
     docker:
-      - image: cimg/python:3.8
+      - image: cimg/python:3.9
     resource_class: large
     steps:
       - checkout
@@ -234,7 +234,8 @@ jobs:
 
       - add_ssh_keys:
           fingerprints:
-            - "6b:83:76:a5:7d:bd:ce:19:a4:e3:81:e0:80:16:a4:fe"
+            - "be:c3:c1:d8:fb:a1:0e:37:71:72:d7:a3:40:13:8f:14"
+
       - deploy:
           name: "Deploy new docs"
           command: ./.circleci/deploy-docs.sh
@@ -249,4 +250,4 @@ workflows:
     jobs:
       # NOTE: If you rename this job, then you must update the `if` condition
       # and `circleci-jobs` option in `.github/workflows/circleci.yml`.
-      - docs-python38
+      - docs-python39

.flake8

@@ -1,5 +1,5 @@
 [flake8]
-max-line-length = 79
+max-line-length = 88
 select =
     # flake8 default
     C90, E, F, W,
@@ -36,7 +36,6 @@ exclude =
     doc/tutorials
     # External files.
     tools/gh_api.py
-    tools/github_stats.py
     .tox
     .eggs
 
@@ -84,6 +83,7 @@ per-file-ignores =
     tutorials/introductory/quick_start.py: E703
     tutorials/introductory/animation_tutorial.py: E501
     tutorials/text/annotations.py: E402, E501
+    tutorials/text/mathtext.py: E501
     tutorials/text/text_intro.py: E402
     tutorials/text/text_props.py: E501
     tutorials/text/usetex.py: E501

.git-blame-ignore-revs

@@ -9,3 +9,6 @@ c1a33a481b9c2df605bcb9bef9c19fe65c3dac21
 
 # chore: fix spelling errors
 686c9e5a413e31c46bb049407d5eca285bcab76d
+
+# chore: pyupgrade --py39-plus
+4d306402bb66d6d4c694d8e3e14b91054417070e

.github/workflows/cibuildsdist.yml

@@ -37,7 +37,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-20.04]
-        python-version: ['3.8', '3.9', '3.10', '3.11']
+        python-version: ['3.9', '3.10', '3.11']
 
     steps:
       - uses: actions/checkout@v3

.github/workflows/cibuildwheel.yml

@@ -62,7 +62,7 @@ jobs:
           fetch-depth: 0
 
       - name: Build wheels for CPython 3.11
-        uses: pypa/cibuildwheel@v2.11.3
+        uses: pypa/cibuildwheel@v2.12.0
         env:
           CIBW_BUILD: "cp311-*"
           CIBW_SKIP: "*-musllinux*"
@@ -75,7 +75,7 @@ jobs:
           CIBW_ARCHS: ${{ matrix.cibw_archs }}
 
       - name: Build wheels for CPython 3.10
-        uses: pypa/cibuildwheel@v2.11.3
+        uses: pypa/cibuildwheel@v2.12.0
         env:
           CIBW_BUILD: "cp310-*"
           CIBW_SKIP: "*-musllinux*"
@@ -88,7 +88,7 @@ jobs:
           CIBW_ARCHS: ${{ matrix.cibw_archs }}
 
       - name: Build wheels for CPython 3.9
-        uses: pypa/cibuildwheel@v2.11.3
+        uses: pypa/cibuildwheel@v2.12.0
         env:
           CIBW_BUILD: "cp39-*"
           CIBW_SKIP: "*-musllinux*"
@@ -100,23 +100,10 @@ jobs:
           MPL_DISABLE_FH4: "yes"
           CIBW_ARCHS: ${{ matrix.cibw_archs }}
 
-      - name: Build wheels for CPython 3.8
-        uses: pypa/[email protected]
-        env:
-          CIBW_BUILD: "cp38-*"
-          CIBW_SKIP: "*-musllinux*"
-          CIBW_MANYLINUX_X86_64_IMAGE: manylinux2010
-          CIBW_MANYLINUX_I686_IMAGE: manylinux2010
-          CIBW_BEFORE_BUILD: >-
-            pip install certifi numpy==1.19.2 &&
-            git clean -fxd build
-          MPL_DISABLE_FH4: "yes"
-          CIBW_ARCHS: ${{ matrix.cibw_archs }}
-
       - name: Build wheels for PyPy
-        uses: pypa/cibuildwheel@v2.11.3
+        uses: pypa/cibuildwheel@v2.12.0
         env:
-          CIBW_BUILD: "pp38-* pp39-*"
+          CIBW_BUILD: "pp39-*"
           CIBW_SKIP: "*-musllinux*"
           CIBW_BEFORE_BUILD: >-
             pip install certifi oldest-supported-numpy &&

.github/workflows/circleci.yml

@@ -3,7 +3,7 @@ name: "CircleCI artifact handling"
 on: [status]
 jobs:
   circleci_artifacts_redirector_job:
-    if: "${{ github.event.context == 'ci/circleci: docs-python38' }}"
+    if: "${{ github.event.context == 'ci/circleci: docs-python39' }}"
     permissions:
       statuses: write
     runs-on: ubuntu-latest
@@ -14,11 +14,11 @@ jobs:
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           artifact-path: 0/doc/build/html/index.html
-          circleci-jobs: docs-python38
+          circleci-jobs: docs-python39
           job-title: View the built docs
 
   post_warnings_as_review:
-    if: "${{ github.event.context == 'ci/circleci: docs-python38' }}"
+    if: "${{ github.event.context == 'ci/circleci: docs-python39' }}"
     permissions:
       contents: read
       checks: write