Skip to content

Commit 59e4e42

Browse files
authored
Update explanation for setuptools dep (#12254)
1 parent 286c891 commit 59e4e42

File tree

3 files changed

+34
-37
lines changed

3 files changed

+34
-37
lines changed

.github/requirements/build-requirements.txt

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
1-
#
2-
# This file is autogenerated by pip-compile with Python 3.10
3-
# by the following command:
4-
#
5-
# pip-compile --allow-unsafe --generate-hashes build-requirements.in
6-
#
7-
cffi==1.17.1 ; platform_python_implementation != "PyPy" \
1+
# This file was autogenerated by uv via the following command:
2+
# uv pip compile --universal -p 3.9 --allow-unsafe --generate-hashes build-requirements.in -o build-requirements.txt
3+
cffi==1.17.1 ; platform_python_implementation != 'PyPy' \
84
--hash=sha256:045d61c734659cc045141be4bae381a41d89b741f795af1dd018bfb532fd0df8 \
95
--hash=sha256:0984a4925a435b1da406122d4d7968dd861c1385afe3b45ba82b750f229811e2 \
106
--hash=sha256:0e2b1fac190ae3ebfe37b979cc1ce69c81f4e4fe5746bb401dca63a9062cdaf1 \
@@ -92,11 +88,15 @@ maturin==1.8.1 \
9288
--hash=sha256:ec49cd70cad3c389946c6e2bc0bd50772a7fcb463040dd800720345897eec9bf \
9389
--hash=sha256:f9f5c47521924b6e515cbc652a042fe5f17f8747445be9d931048e5d8ddb50a4
9490
# via -r build-requirements.in
95-
pycparser==2.22 \
91+
pycparser==2.22 ; platform_python_implementation != 'PyPy' \
9692
--hash=sha256:491c8be9c040f5390f5bf44a5b07752bd07f56edf992381b05c701439eec10f6 \
9793
--hash=sha256:c3702b6d3dd8c7abc1afa565d7e63d53a1d0bd86cdc24edd75470f4de499cfcc
9894
# via cffi
99-
tomli==2.2.1 \
95+
setuptools==73.0.1 \
96+
--hash=sha256:b208925fcb9f7af924ed2dc04708ea89791e24bde0d3020b27df0e116088b34e \
97+
--hash=sha256:d59a3e788ab7e012ab2c4baed1b376da6366883ee20d7a5fc426816e3d7b1193
98+
# via -r build-requirements.in
99+
tomli==2.2.1 ; python_full_version < '3.11' \
100100
--hash=sha256:023aa114dd824ade0100497eb2318602af309e5a55595f76b626d6d9f3b7b0a6 \
101101
--hash=sha256:02abe224de6ae62c19f090f68da4e27b10af2b93213d36cf44e6e1c5abd19fdd \
102102
--hash=sha256:286f0ca2ffeeb5b9bd4fcc8d6c330534323ec51b2f52da063b11c502da16f30c \
@@ -130,9 +130,3 @@ tomli==2.2.1 \
130130
--hash=sha256:ece47d672db52ac607a3d9599a9d48dcb2f2f735c6c2d1f34130085bb12b112a \
131131
--hash=sha256:f4039b9cbc3048b2416cc57ab3bda989a6fcf9b36cf8937f01a6e731b64f80d7
132132
# via maturin
133-
134-
# The following packages are considered to be unsafe in a requirements file:
135-
setuptools==73.0.1 \
136-
--hash=sha256:b208925fcb9f7af924ed2dc04708ea89791e24bde0d3020b27df0e116088b34e \
137-
--hash=sha256:d59a3e788ab7e012ab2c4baed1b376da6366883ee20d7a5fc426816e3d7b1193
138-
# via -r build-requirements.in

ci-constraints-requirements.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -318,9 +318,7 @@ zipp==3.20.2 ; python_full_version == '3.8.*'
318318
# importlib-metadata
319319
# importlib-resources
320320
zipp==3.21.0 ; python_full_version >= '3.9' and python_full_version < '3.10.2'
321-
# via
322-
# importlib-metadata
323-
# importlib-resources
321+
# via importlib-metadata
324322

325323
# The following packages were excluded from the output:
326324
# cffi

pyproject.toml

Lines changed: 24 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@ requires = [
66

77
# Must be kept in sync with `project.dependencies`
88
"cffi>=1.12; platform_python_implementation != 'PyPy'",
9-
# Needed because cffi imports distutils, and in Python 3.12, distutils has
10-
# been removed from the stdlib, but installing setuptools puts it back.
9+
# Used by cffi (which import distutils, and in Python 3.12, distutils has
10+
# been removed from the stdlib, but installing setuptools puts it back) as
11+
# well as our build.rs for the rust/cffi bridge.
1112
"setuptools!=74.0.0,!=74.1.0,!=74.1.1,!=74.1.2",
1213
]
1314
build-backend = "maturin"
@@ -16,11 +17,11 @@ build-backend = "maturin"
1617
name = "cryptography"
1718
version = "45.0.0.dev1"
1819
authors = [
19-
{name = "The Python Cryptographic Authority and individual contributors", email = "[email protected]"}
20+
{ name = "The Python Cryptographic Authority and individual contributors", email = "[email protected]" },
2021
]
2122
description = "cryptography is a package which provides cryptographic recipes and primitives to Python developers."
2223
readme = "README.rst"
23-
license = {text = "Apache-2.0 OR BSD-3-Clause"}
24+
license = { text = "Apache-2.0 OR BSD-3-Clause" }
2425
classifiers = [
2526
"Development Status :: 5 - Production/Stable",
2627
"Intended Audience :: Developers",
@@ -74,11 +75,24 @@ test = [
7475
"certifi >=2024",
7576
]
7677
test-randomorder = ["pytest-randomly"]
77-
docs = ["sphinx >=5.3.0", "sphinx-rtd-theme >=3.0.0; python_version >= '3.8'", "sphinx-inline-tabs; python_version >= '3.8'"]
78-
docstest = ["pyenchant >=3", "readme-renderer >=30.0", "sphinxcontrib-spelling >=7.3.1"]
78+
docs = [
79+
"sphinx >=5.3.0",
80+
"sphinx-rtd-theme >=3.0.0; python_version >= '3.8'",
81+
"sphinx-inline-tabs; python_version >= '3.8'",
82+
]
83+
docstest = [
84+
"pyenchant >=3",
85+
"readme-renderer >=30.0",
86+
"sphinxcontrib-spelling >=7.3.1",
87+
]
7988
sdist = ["build >=1.0.0"]
8089
# `click` included because its needed to type check `release.py`
81-
pep8test = ["ruff >=0.3.6", "mypy >=1.4", "check-sdist; python_version >= '3.8'", "click >=8.0.1"]
90+
pep8test = [
91+
"ruff >=0.3.6",
92+
"mypy >=1.4",
93+
"check-sdist; python_version >= '3.8'",
94+
"click >=8.0.1",
95+
]
8296

8397
[tool.maturin]
8498
python-source = "src"
@@ -137,18 +151,13 @@ warn_unused_configs = true
137151
strict_equality = true
138152

139153
[[tool.mypy.overrides]]
140-
module = [
141-
"pretend"
142-
]
154+
module = ["pretend"]
143155
ignore_missing_imports = true
144156

145157
[tool.coverage.run]
146158
branch = true
147159
relative_files = true
148-
source = [
149-
"cryptography",
150-
"tests/",
151-
]
160+
source = ["cryptography", "tests/"]
152161

153162
[tool.coverage.paths]
154163
source = [
@@ -157,10 +166,7 @@ source = [
157166
"*.nox\\*\\Lib\\site-packages\\cryptography",
158167
"*.nox/pypy/site-packages/cryptography",
159168
]
160-
tests = [
161-
"tests/",
162-
"*tests\\",
163-
]
169+
tests = ["tests/", "*tests\\"]
164170

165171
[tool.coverage.report]
166172
exclude_lines = [
@@ -186,4 +192,3 @@ git-only = [
186192
".gitattributes",
187193
".gitignore",
188194
]
189-

0 commit comments

Comments
 (0)