Skip to content

Commit 2b8725d

Browse files
authored
Drop support for EOL PyPy3.10 (#4979)
1 parent 2944b2a commit 2b8725d

5 files changed

Lines changed: 7 additions & 11 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,6 @@ jobs:
5858
experimental: false
5959
nox-session: test-3.12
6060
# pypy
61-
- python-version: "pypy-3.10"
62-
os: ubuntu-24.04
63-
experimental: false
64-
nox-session: test-pypy3.10
6561
- python-version: "pypy-3.11"
6662
os: ubuntu-24.04
6763
experimental: false

‎changelog/4979.removal.rst‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Dropped support for end-of-life PyPy3.10.

‎docs/contributing.rst‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ We use some external dependencies, multiple interpreters and code coverage
3636
analysis while running test suite. Our ``noxfile.py`` handles much of this for
3737
you::
3838

39-
$ nox --reuse-existing-virtualenvs --sessions test-3.12 test-pypy3.10
39+
$ nox --reuse-existing-virtualenvs --sessions test-3.12 test-pypy3.11
4040
[ Nox will create virtualenv if needed, install the specified dependencies, and run the commands in order.]
4141

4242

@@ -48,8 +48,8 @@ like so::
4848
$ which python3.12
4949
~/.pyenv/versions/3.12.1/bin/python3.12
5050

51-
$ which pypy3.10
52-
~/.pyenv/versions/pypy3.10-7.3.13/bin/pypy3.10
51+
$ which pypy3.11
52+
~/.pyenv/versions/pypy3.11-7.3.22/bin/pypy3.11
5353

5454

5555
There is also a nox command for running all of our tests and multiple python
@@ -128,7 +128,7 @@ that is marked with the `"💰 Bounty $X00" label <https://github.com/urllib3/ur
128128
- The list above isn't an exhaustive list of criteria or rules for how/when money is distributed.
129129
**The final say on whether money will be distributed is up to maintainers.**
130130

131-
This program is an experiment so if you have positive or negative feedback on the process you can contact the maintainers through one of the above channels.
131+
This program is an experiment so if you have positive or negative feedback on the process you can contact the maintainers through one of the above channels.
132132

133133
Note that this program isn't a "bug bounty" program, we don't distribute funds to reporters of bugs or security vulnerabilities at this time.
134134

@@ -178,7 +178,7 @@ While writing documentation you should follow these guidelines:
178178
- Comments should always go above a code section rather than below with the exception of print
179179
statements where the comment containing the result goes below.
180180
- Imports should be their own section separated from the rest of the example with a line of whitespace.
181-
- Imports should minimized if possible. Use import urllib3 instead of from urllib3 import X.
181+
- Imports should minimized if possible. Use import urllib3 instead of from urllib3 import X.
182182
- Sort imports similarly to isort, standard library first and third-party (like urllib3) come after.
183183
- No whitespace is required between the sections as normally would be in case of isort.
184184
- Add print statements along with a comment below them showing the output, potentially compressed.

‎docs/v2-migration-guide.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ for requests and ``HTTPResponse.json()`` method on responses:
286286
**✨ Optimized for Python 3.10+**
287287
---------------------------------
288288

289-
urllib3 2.x specifically targets CPython 3.10+ and PyPy 7.3.17+ (compatible with CPython 3.10)
289+
urllib3 2.x specifically targets CPython 3.10+ and PyPy v7.3.20+ (compatible with CPython 3.11)
290290
and dropping support for Python versions 2.7, and 3.5 to 3.9.
291291

292292
By dropping end-of-life Python versions we're able to optimize

‎noxfile.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,6 @@ def tests_impl(
113113
"3.14",
114114
"3.14t",
115115
"3.15",
116-
"pypy3.10",
117116
"pypy3.11",
118117
]
119118
)

0 commit comments

Comments
 (0)