Skip to content

Commit 532ace5

Browse files
cclausscclauss
authored
Merge pull request python-hyper#150 to drop support for end-of-life versions of Python
Drop support for end-of-life versions of Python
2 parents 0b2b332 + ae771c6 commit 532ace5

File tree

5 files changed

+79
-74
lines changed

5 files changed

+79
-74
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,19 @@ jobs:
1010
tox:
1111
runs-on: ubuntu-latest
1212
strategy:
13-
max-parallel: 5
13+
fail-fast: false
1414
matrix:
1515
python-version:
16-
- 3.6
17-
- 3.7
18-
- 3.8
19-
- 3.9
20-
- pypy3
16+
- "3.10"
17+
- "3.11"
18+
- "3.12"
19+
- "3.13"
20+
- "3.14"
21+
- "pypy3.11"
2122

2223
steps:
23-
- uses: actions/checkout@v2
24-
- uses: actions/setup-python@v2
24+
- uses: actions/checkout@v6
25+
- uses: actions/setup-python@v6
2526
with:
2627
python-version: ${{ matrix.python-version }}
2728
- name: Install tox

‎docs/source/conf.py‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,22 @@
1414
import sys
1515
import re
1616

17-
sys.path.insert(0, os.path.abspath('../..'))
17+
sys.path.insert(0, os.path.abspath("../.."))
1818

1919
PROJECT_ROOT = os.path.dirname(__file__)
2020
# Get the version
2121
version_regex = r'__version__ = ["\']([^"\']*)["\']'
22-
with open(os.path.join(PROJECT_ROOT, '../../', 'src/priority/__init__.py')) as file_:
22+
with open(os.path.join(PROJECT_ROOT, "../../", "src/priority/__init__.py")) as file_:
2323
text = file_.read()
2424
match = re.search(version_regex, text)
2525
version = match.group(1)
2626

2727

2828
# -- Project information -----------------------------------------------------
2929

30-
project = 'priority'
31-
copyright = '2021, Cory Benfield'
32-
author = 'Cory Benfield'
30+
project = "priority"
31+
copyright = "2021, Cory Benfield"
32+
author = "Cory Benfield"
3333
release = version
3434

3535
# -- General configuration ------------------------------------------------
@@ -38,29 +38,29 @@
3838
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
3939
# ones.
4040
extensions = [
41-
'sphinx.ext.autodoc',
42-
'sphinx.ext.intersphinx',
43-
'sphinx.ext.viewcode',
41+
"sphinx.ext.autodoc",
42+
"sphinx.ext.intersphinx",
43+
"sphinx.ext.viewcode",
4444
]
4545

4646
# Add any paths that contain templates here, relative to this directory.
47-
templates_path = ['_templates']
47+
templates_path = ["_templates"]
4848

4949
# The master toctree document.
50-
master_doc = 'index'
50+
master_doc = "index"
5151

5252
# List of patterns, relative to source directory, that match files and
5353
# directories to ignore when looking for source files.
5454
exclude_patterns = []
5555

5656
# Example configuration for intersphinx: refer to the Python standard library.
57-
intersphinx_mapping = {'python': ('http://docs.python.org/', None)}
57+
intersphinx_mapping = {"python": ("http://docs.python.org/", None)}
5858

5959
# -- Options for HTML output ----------------------------------------------
6060

6161
# The theme to use for HTML and HTML Help pages. See the documentation for
6262
# a list of builtin themes.
63-
html_theme = 'default'
63+
html_theme = "default"
6464

6565
# Add any paths that contain custom static files (such as style sheets) here,
6666
# relative to this directory. They are copied after the builtin static files,

‎setup.py‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77

88
PROJECT_ROOT = os.path.dirname(__file__)
99

10-
with open(os.path.join(PROJECT_ROOT, 'README.rst')) as file_:
10+
with open(os.path.join(PROJECT_ROOT, "README.rst")) as file_:
1111
long_description = file_.read()
1212

1313
version_regex = r'__version__ = ["\']([^"\']*)["\']'
14-
with open(os.path.join(PROJECT_ROOT, 'src/priority/__init__.py')) as file_:
14+
with open(os.path.join(PROJECT_ROOT, "src/priority/__init__.py")) as file_:
1515
text = file_.read()
1616
match = re.search(version_regex, text)
1717
if match:
@@ -20,36 +20,36 @@
2020
raise RuntimeError("No version number found!")
2121

2222
setup(
23-
name='priority',
23+
name="priority",
2424
version=version,
25-
description='A pure-Python implementation of the HTTP/2 priority tree',
25+
description="A pure-Python implementation of the HTTP/2 priority tree",
2626
long_description=long_description,
27-
long_description_content_type='text/x-rst',
28-
author='Cory Benfield',
29-
author_email='cory@lukasa.co.uk',
30-
url='https://github.com/python-hyper/priority/',
27+
long_description_content_type="text/x-rst",
28+
author="Cory Benfield",
29+
author_email="cory@lukasa.co.uk",
30+
url="https://github.com/python-hyper/priority/",
3131
project_urls={
32-
'Documentation': 'https://python-hyper.org/projects/priority/',
33-
'Source': 'https://github.com/python-hyper/priority/',
34-
'Tracker': 'https://github.com/python-hyper/priority/issues',
35-
'Changelog': 'https://github.com/python-hyper/priority/blob/master/HISTORY.rst',
32+
"Documentation": "https://python-hyper.org/projects/priority/",
33+
"Source": "https://github.com/python-hyper/priority/",
34+
"Tracker": "https://github.com/python-hyper/priority/issues",
35+
"Changelog": "https://github.com/python-hyper/priority/blob/master/HISTORY.rst",
3636
},
37-
packages=find_packages(where='src'),
38-
package_data={'priority': ['py.typed']},
39-
package_dir={'': 'src'},
40-
python_requires='>=3.6.1',
41-
license='MIT License',
37+
packages=find_packages(where="src"),
38+
package_data={"priority": ["py.typed"]},
39+
package_dir={"": "src"},
40+
python_requires=">=3.10.0",
41+
license="MIT License",
4242
classifiers=[
43-
'Development Status :: 5 - Production/Stable',
44-
'Intended Audience :: Developers',
45-
'License :: OSI Approved :: MIT License',
46-
'Programming Language :: Python',
47-
'Programming Language :: Python :: 3',
48-
'Programming Language :: Python :: 3.6',
49-
'Programming Language :: Python :: 3.7',
50-
'Programming Language :: Python :: 3.8',
51-
'Programming Language :: Python :: 3.9',
52-
'Programming Language :: Python :: Implementation :: CPython',
53-
'Programming Language :: Python :: Implementation :: PyPy',
43+
"Development Status :: 5 - Production/Stable",
44+
"Intended Audience :: Developers",
45+
"License :: OSI Approved :: MIT License",
46+
"Programming Language :: Python",
47+
"Programming Language :: Python :: 3",
48+
"Programming Language :: Python :: 3.10",
49+
"Programming Language :: Python :: 3.11",
50+
"Programming Language :: Python :: 3.12",
51+
"Programming Language :: Python :: 3.13",
52+
"Programming Language :: Python :: Implementation :: CPython",
53+
"Programming Language :: Python :: Implementation :: PyPy",
5454
],
5555
)

‎test/test_priority.py‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,8 @@ def test_streams_are_well_ordered(self, streams_and_weights):
118118
assert sorted(streams_by_id) == streams_by_id
119119

120120
@given(
121-
integers(min_value=1, max_value=2 ** 24),
122-
integers(min_value=1, max_value=2 ** 24),
121+
integers(min_value=1, max_value=2**24),
122+
integers(min_value=1, max_value=2**24),
123123
)
124124
def test_stream_ordering(self, a, b):
125125
"""
@@ -554,7 +554,7 @@ def __init__(self):
554554
self.stream_ids = set([0])
555555
self.blocked_stream_ids = set()
556556

557-
@rule(stream_id=integers()) # type: ignore[no-untyped-call]
557+
@rule(stream_id=integers())
558558
def insert_stream(self, stream_id):
559559
try:
560560
self.tree.insert_stream(stream_id)
@@ -574,24 +574,24 @@ def _run_action(self, action, stream_id):
574574
else:
575575
assert stream_id in self.stream_ids
576576

577-
@rule(stream_id=integers()) # type: ignore[no-untyped-call]
577+
@rule(stream_id=integers())
578578
def remove_stream(self, stream_id):
579579
self._run_action(self.tree.remove_stream, stream_id)
580580
if stream_id != 0:
581581
self.stream_ids.discard(stream_id)
582582

583-
@rule(stream_id=integers()) # type: ignore[no-untyped-call]
583+
@rule(stream_id=integers())
584584
def block_stream(self, stream_id):
585585
self._run_action(self.tree.block, stream_id)
586586
if (stream_id != 0) and (stream_id in self.stream_ids):
587587
self.blocked_stream_ids.add(stream_id)
588588

589-
@rule(stream_id=integers()) # type: ignore[no-untyped-call]
589+
@rule(stream_id=integers())
590590
def unblock_stream(self, stream_id):
591591
self._run_action(self.tree.unblock, stream_id)
592592
self.blocked_stream_ids.discard(stream_id)
593593

594-
@invariant() # type: ignore[no-untyped-call]
594+
@invariant()
595595
def check_next_stream_consistent(self):
596596
"""
597597
If we ask priority for the next stream, it always returns a sensible

‎tox.ini‎

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,23 @@
11
[tox]
2-
envlist = py36, py37, py38, py39, pypy3, lint, docs, packaging
2+
envlist = py310, py311, py312, py313, py314, pypy3, lint, docs, packaging
33

44
[gh-actions]
55
python =
6-
3.6: py36
7-
3.7: py37
8-
3.8: py38
9-
3.9: py39, lint, docs, packaging
6+
3.10: py310, lint, docs, packaging
7+
3.11: py311
8+
3.12: py312
9+
3.13: py313
10+
3.14: py314
1011
pypy3: pypy3
1112

1213
[testenv]
1314
passenv =
1415
GITHUB_*
1516
deps =
16-
pytest>=6.2,<7
17-
pytest-cov>=2.10,<3
18-
pytest-xdist>=2.1,<3
19-
hypothesis>=6.9,<7
17+
pytest
18+
pytest-cov
19+
pytest-xdist
20+
hypothesis
2021
commands =
2122
pytest --cov-report=xml --cov-report=term --cov=priority {posargs}
2223

@@ -26,31 +27,34 @@ commands = pytest {posargs}
2627

2728
[testenv:lint]
2829
deps =
29-
flake8>=3.8,<4
30-
black==21.6b0
30+
flake8
31+
black
32+
hypothesis
3133
mypy==0.910
32-
{[testenv]deps}
34+
pytest>=6.2,<7
35+
typed_ast
36+
# {[testenv]deps}
3337
commands =
3438
flake8 src/ test/
3539
black --check --diff src/ test/
3640
mypy src/ test/
3741

3842
[testenv:docs]
3943
deps =
40-
sphinx>=3.5,<5
41-
whitelist_externals = make
44+
sphinx
45+
allowlist_externals = make
4246
changedir = {toxinidir}/docs
4347
commands =
4448
make clean
4549
make html
4650

4751
[testenv:packaging]
48-
basepython = python3.9
52+
basepython = python3.10
4953
deps =
50-
check-manifest==0.46
51-
readme-renderer==29.0
52-
twine>=3.4.1,<4
53-
whitelist_externals = rm
54+
check-manifest
55+
readme-renderer
56+
twine
57+
allowlist_externals = rm
5458
commands =
5559
rm -rf dist/
5660
check-manifest

0 commit comments

Comments
 (0)