Merge pull request #364 from hugovk/main

Add support for Python 3.11 and drop EOL 3.6
pytest-dev · Nov 6, 2022 · 4ec84ec · 4ec84ec
2 parents 70fde45 + 600f298
commit 4ec84ec
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 29 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -19,16 +19,16 @@ jobs:
       fail-fast: false
       matrix:
         name: [
-          "windows-py36",
-          "windows-py310",
+          "windows-py37",
+          "windows-py311",
           "windows-pypy3",
 
-          "ubuntu-py36",
           "ubuntu-py37-pytestmain",
           "ubuntu-py37",
           "ubuntu-py38",
           "ubuntu-py39",
           "ubuntu-py310",
+          "ubuntu-py311",
           "ubuntu-pypy3",
           "ubuntu-benchmark",
 
@@ -37,23 +37,18 @@ jobs:
         ]
 
         include:
-          - name: "windows-py36"
-            python: "3.6"
+          - name: "windows-py37"
+            python: "3.7"
             os: windows-latest
-            tox_env: "py36"
-          - name: "windows-py310"
+            tox_env: "py37"
+          - name: "windows-py311"
             python: "3.10"
             os: windows-latest
-            tox_env: "py310"
+            tox_env: "py311"
           - name: "windows-pypy3"
-            python: "pypy3"
+            python: "pypy3.9"
             os: windows-latest
             tox_env: "pypy3"
-          - name: "ubuntu-py36"
-            python: "3.6"
-            os: ubuntu-latest
-            tox_env: "py36"
-            use_coverage: true
           - name: "ubuntu-py37-pytestmain"
             python: "3.7"
             os: ubuntu-latest
@@ -78,9 +73,13 @@ jobs:
             python: "3.10"
             os: ubuntu-latest
             tox_env: "py310"
+          - name: "ubuntu-py311"
+            python: "3.11"
+            os: ubuntu-latest
+            tox_env: "py311"
             use_coverage: true
           - name: "ubuntu-pypy3"
-            python: "pypy3"
+            python: "pypy3.9"
             os: ubuntu-latest
             tox_env: "pypy3"
             use_coverage: true
@@ -98,12 +97,12 @@ jobs:
             tox_env: "docs"
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         fetch-depth: 0
 
     - name: Set up Python ${{ matrix.python }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python }}
 
@@ -131,11 +130,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@v4
         with:
           python-version: "3.8"
 
@@ -148,7 +147,7 @@ jobs:
         run: python setup.py sdist bdist_wheel
 
       - name: Publish package
-        uses: pypa/gh-action-pypi-publish@v1.4.1
+        uses: pypa/gh-action-pypi-publish@v1.5.1
         with:
           user: __token__
           password: ${{ secrets.pypi_token }}
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,14 +1,14 @@
 repos:
 -   repo: https://github.com/ambv/black
-    rev: 21.7b0
+    rev: 22.10.0
     hooks:
     -   id: black
         args: [--safe, --quiet]
 -   repo: https://github.com/asottile/blacken-docs
-    rev: v1.10.0
+    rev: v1.12.1
     hooks:
     -   id: blacken-docs
-        additional_dependencies: [black==21.7b0]
+        additional_dependencies: [black==22.10.0]
 -   repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v2.1.0
     hooks:
@@ -36,7 +36,7 @@ repos:
     hooks:
     -   id: rst-backticks
 -   repo: https://github.com/asottile/pyupgrade
-    rev: v2.23.3
+    rev: v3.2.0
     hooks:
     -   id: pyupgrade
-        args: [--py36-plus]
+        args: [--py37-plus]
diff --git a/changelog/364.feature.rst b/changelog/364.feature.rst
@@ -0,0 +1 @@
+Python 3.11 is now officially supported.
diff --git a/changelog/364.removal.rst b/changelog/364.removal.rst
@@ -0,0 +1 @@
+Python 3.6 is no longer supported.
diff --git a/docs/conf.py b/docs/conf.py
@@ -33,7 +33,7 @@
 version = ".".join(release.split(".")[:2])
 
 
-language = None
+language = "en"
 
 pygments_style = "sphinx"
 # html_logo = "_static/img/plug.png"

diff --git a/setup.cfg b/setup.cfg
@@ -22,18 +22,18 @@ classifiers =
     Programming Language :: Python :: Implementation :: PyPy
     Programming Language :: Python :: 3
     Programming Language :: Python :: 3 :: Only
-    Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
     Programming Language :: Python :: 3.10
+    Programming Language :: Python :: 3.11
 
 [options]
 packages =
     pluggy
 install_requires =
     importlib-metadata>=0.12;python_version<"3.8"
-python_requires = >=3.6
+python_requires = >=3.7
 package_dir =
     =src
 setup_requires =

diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist=linting,docs,py{36,37,38,39,310,py3},py{36,37}-pytest{main}
+envlist=linting,docs,py{37,38,39,310,311,py3},py{37}-pytest{main}
 
 [testenv]
 commands=