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

Drop Python 3.7, add PyPy 3.10 and CPython 3.12 #609

Merged
merged 2 commits into from
Jul 10, 2023
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
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python: ['3.7', '3.8', '3.9', '3.10', '3.11']
python: ['3.8', '3.9', '3.10', '3.11', '3.12-dev']
steps:
- name: Checkout
uses: actions/checkout@v3
Expand All @@ -39,7 +39,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python: ['3.7', '3.8', '3.9', '3.10', '3.11', 'pypy3.9']
python: ['3.8', '3.9', '3.10', '3.11', '3.12-dev', 'pypy3.9', 'pypy-3.10']
steps:
- name: Checkout
uses: actions/checkout@v3
Expand All @@ -63,7 +63,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python: ['3.7', '3.8', '3.9', '3.10', '3.11']
python: ['3.8', '3.9', '3.10', '3.11', '3.12-dev']
steps:
- name: Checkout
uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ jobs:
- name: Setup python
uses: actions/setup-python@v4
with:
python-version: '3.9'
python-version: '3.x'
- name: Run lint
run: ./lint.sh
8 changes: 4 additions & 4 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ Vital statistics

**Bug tracker and source code:** https://github.com/python-trio/trustme

**Tested on:** Python 3.7+, CPython and PyPy
**Tested on:** Python 3.8+, CPython and PyPy

**License:** MIT or Apache 2, your choice.

Expand Down Expand Up @@ -73,14 +73,14 @@ Programmatic usage:
# trustme is happy either way.
# ----- or -----
# Save the PEM-encoded data to a file to use in non-Python test
# suites:
ca.cert_pem.write_to_path("ca.pem")
server_cert.private_key_and_cert_chain_pem.write_to_path("server.pem")
# ----- or -----
# Put the PEM-encoded data in a temporary file, for libraries that
# insist on that:
with ca.cert_pem.tempfile() as ca_temp_path:
Expand Down
6 changes: 3 additions & 3 deletions docs-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#
# This file is autogenerated by pip-compile with python 3.7
# To update, run:
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# pip-compile docs-requirements.in
# pip-compile --resolver=backtracking docs-requirements.in
#
alabaster==0.7.13
# via sphinx
Expand Down
2 changes: 1 addition & 1 deletion docs/source/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ works. It demonstrates a simple TLS server and client that connect to
each other using :mod:`trustme`\-generated certs.

This example requires `Trio <https://trio.readthedocs.io>`__ (``pip
install -U trio``) and Python 3.7+. Note that while :mod:`trustme` is
install -U trio``) and Python 3.8+. Note that while :mod:`trustme` is
maintained by the Trio project, :mod:`trustme` is happy to work with
any networking library.

Expand Down
1 change: 1 addition & 0 deletions newsfragments/609.feature.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Add support for PyPy 3.10 and Python 3.12.
1 change: 1 addition & 0 deletions newsfragments/609.removal.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Remove support for Python 3.7.
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
},
package_dir={'': 'src'},
url="https://github.com/python-trio/trustme",
python_requires=">=3.7",
python_requires=">=3.8",
install_requires=[
"cryptography>=3.1",
"idna>=2.0",
Expand All @@ -32,11 +32,11 @@
"Programming Language :: Python :: Implementation :: PyPy",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3 :: Only",
"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",
"Programming Language :: Python :: 3.12",
"Topic :: System :: Networking",
"Topic :: Security :: Cryptography",
"Topic :: Software Development :: Testing",
Expand Down
4 changes: 2 additions & 2 deletions test-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#
# This file is autogenerated by pip-compile with Python 3.8
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# pip-compile test-requirements.in
# pip-compile --resolver=backtracking test-requirements.in
#
attrs==23.1.0
# via service-identity
Expand Down