Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for Python 3.11 and drop EOL 3.6 #364

Merged
merged 6 commits into from
Nov 6, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 19 additions & 20 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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",

Expand All @@ -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
Expand All @@ -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
Expand All @@ -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 }}

Expand Down Expand Up @@ -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"

Expand All @@ -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 }}
10 changes: 5 additions & 5 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down Expand Up @@ -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]
1 change: 1 addition & 0 deletions changelog/364.feature.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Python 3.11 is now officially supported.
1 change: 1 addition & 0 deletions changelog/364.removal.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Python 3.6 is no longer supported.
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
version = ".".join(release.split(".")[:2])


language = None
language = "en"

pygments_style = "sphinx"
# html_logo = "_static/img/plug.png"
Expand Down
4 changes: 2 additions & 2 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -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=
Expand Down