From 11aeef490f0b9ba614ff09fd10dc7b6f2b0d35ac Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Sun, 6 Nov 2022 00:14:51 +0200 Subject: [PATCH 1/6] Add support for Python 3.11 --- .github/workflows/main.yml | 25 +++++++++++++++---------- setup.cfg | 1 + tox.ini | 2 +- 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6d7ef5ca..7ff197cb 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -20,7 +20,7 @@ jobs: matrix: name: [ "windows-py36", - "windows-py310", + "windows-py311", "windows-pypy3", "ubuntu-py36", @@ -29,6 +29,7 @@ jobs: "ubuntu-py38", "ubuntu-py39", "ubuntu-py310", + "ubuntu-py311", "ubuntu-pypy3", "ubuntu-benchmark", @@ -41,12 +42,12 @@ jobs: python: "3.6" os: windows-latest tox_env: "py36" - - name: "windows-py310" + - 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" @@ -78,9 +79,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 +103,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 +136,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 +153,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/setup.cfg b/setup.cfg index adb6d4fc..2d224e4e 100644 --- a/setup.cfg +++ b/setup.cfg @@ -27,6 +27,7 @@ classifiers = Programming Language :: Python :: 3.8 Programming Language :: Python :: 3.9 Programming Language :: Python :: 3.10 + Programming Language :: Python :: 3.11 [options] packages = diff --git a/tox.ini b/tox.ini index b833a9fe..237c5e81 100644 --- 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{36,37,38,39,310,311,py3},py{36,37}-pytest{main} [testenv] commands= From 2f47a2e8e4acf26c80b74d22c8c68a8f269497cf Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Sun, 6 Nov 2022 00:21:45 +0200 Subject: [PATCH 2/6] Update pre-commit --- .pre-commit-config.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index b5611783..1ba583a8 100644 --- 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] From 1766a944e3790bd47847ab2ac70b1618ebc305b5 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Sun, 6 Nov 2022 00:22:21 +0200 Subject: [PATCH 3/6] Fix docs --- docs/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/conf.py b/docs/conf.py index f1ce4c03..a2c41e8d 100644 --- 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" From ea6a31f9f8bb559cb73bc9548933a78e793321e6 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Sun, 6 Nov 2022 00:30:22 +0200 Subject: [PATCH 4/6] Drop support for EOL Python 3.6 --- .github/workflows/main.yml | 14 ++++---------- .pre-commit-config.yaml | 2 +- setup.cfg | 3 +-- tox.ini | 2 +- 4 files changed, 7 insertions(+), 14 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7ff197cb..3946c6ad 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -19,11 +19,10 @@ jobs: fail-fast: false matrix: name: [ - "windows-py36", + "windows-py37", "windows-py311", "windows-pypy3", - "ubuntu-py36", "ubuntu-py37-pytestmain", "ubuntu-py37", "ubuntu-py38", @@ -38,10 +37,10 @@ jobs: ] include: - - name: "windows-py36" - python: "3.6" + - name: "windows-py37" + python: "3.7" os: windows-latest - tox_env: "py36" + tox_env: "py37" - name: "windows-py311" python: "3.10" os: windows-latest @@ -50,11 +49,6 @@ jobs: 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 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 1ba583a8..56b97f81 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -39,4 +39,4 @@ repos: rev: v3.2.0 hooks: - id: pyupgrade - args: [--py36-plus] + args: [--py37-plus] diff --git a/setup.cfg b/setup.cfg index 2d224e4e..d39f6466 100644 --- a/setup.cfg +++ b/setup.cfg @@ -22,7 +22,6 @@ 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 @@ -34,7 +33,7 @@ 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 index 237c5e81..f97657af 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist=linting,docs,py{36,37,38,39,310,311,py3},py{36,37}-pytest{main} +envlist=linting,docs,py{37,38,39,310,311,py3},py{37}-pytest{main} [testenv] commands= From 290d98f7723b88603b9a25a24080a41bdf6b546e Mon Sep 17 00:00:00 2001 From: Bruno Oliveira Date: Sat, 5 Nov 2022 20:37:23 -0300 Subject: [PATCH 5/6] Create 364.removal.rst --- changelog/364.removal.rst | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog/364.removal.rst diff --git a/changelog/364.removal.rst b/changelog/364.removal.rst new file mode 100644 index 00000000..6daecd16 --- /dev/null +++ b/changelog/364.removal.rst @@ -0,0 +1 @@ +Python 3.6 is no longer supported. From 600f29896f64642c3838d6f3cd8b8ff392886bd2 Mon Sep 17 00:00:00 2001 From: Bruno Oliveira Date: Sat, 5 Nov 2022 20:37:53 -0300 Subject: [PATCH 6/6] Create 364.feature.rst --- changelog/364.feature.rst | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog/364.feature.rst diff --git a/changelog/364.feature.rst b/changelog/364.feature.rst new file mode 100644 index 00000000..a991347a --- /dev/null +++ b/changelog/364.feature.rst @@ -0,0 +1 @@ +Python 3.11 is now officially supported.