Skip to content

Commit 21c7cb4

Browse files
committed
Move the setuptools settings into pyproject.toml
Except for `zip_safe`. It's not especially relevant nowadays, so just delete it.
1 parent 003c7ac commit 21c7cb4

File tree

2 files changed

+27
-43
lines changed

2 files changed

+27
-43
lines changed

pyproject.toml

+26
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,32 @@ Changelog = "https://pip.pypa.io/en/stable/news/"
4141
requires = ["setuptools>=67.6.1", "wheel"]
4242
build-backend = "setuptools.build_meta"
4343

44+
[tool.setuptools]
45+
package-dir = {"" = "src"}
46+
include-package-data = false
47+
48+
[tool.setuptools.dynamic]
49+
version = {attr = "pip.__version__"}
50+
51+
[tool.setuptools.packages.find]
52+
where = ["src"]
53+
exclude = ["contrib", "docs", "tests*", "tasks"]
54+
55+
[tool.setuptools.package-data]
56+
"pip" = ["py.typed"]
57+
"pip._vendor" = ["vendor.txt"]
58+
"pip._vendor.certifi" = ["*.pem"]
59+
"pip._vendor.requests" = ["*.pem"]
60+
"pip._vendor.distlib._backport" = ["sysconfig.cfg"]
61+
"pip._vendor.distlib" = [
62+
"t32.exe",
63+
"t64.exe",
64+
"t64-arm.exe",
65+
"w32.exe",
66+
"w64.exe",
67+
"w64-arm.exe",
68+
]
69+
4470
[tool.towncrier]
4571
# For finding the __version__
4672
package = "pip"

setup.py

+1-43
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,13 @@
1-
import os
21
import sys
32

4-
from setuptools import find_packages, setup
5-
6-
7-
def read(rel_path: str) -> str:
8-
here = os.path.abspath(os.path.dirname(__file__))
9-
# intentionally *not* adding an encoding option to open, See:
10-
# https://github.com/pypa/virtualenv/issues/201#issuecomment-3145690
11-
with open(os.path.join(here, rel_path)) as fp:
12-
return fp.read()
13-
14-
15-
def get_version(rel_path: str) -> str:
16-
for line in read(rel_path).splitlines():
17-
if line.startswith("__version__"):
18-
# __version__ = "0.9"
19-
delim = '"' if '"' in line else "'"
20-
return line.split(delim)[1]
21-
raise RuntimeError("Unable to find version string.")
22-
3+
from setuptools import setup
234

245
setup(
25-
version=get_version("src/pip/__init__.py"),
26-
package_dir={"": "src"},
27-
packages=find_packages(
28-
where="src",
29-
exclude=["contrib", "docs", "tests*", "tasks"],
30-
),
31-
include_package_data=False,
32-
package_data={
33-
"pip": ["py.typed"],
34-
"pip._vendor": ["vendor.txt"],
35-
"pip._vendor.certifi": ["*.pem"],
36-
"pip._vendor.requests": ["*.pem"],
37-
"pip._vendor.distlib._backport": ["sysconfig.cfg"],
38-
"pip._vendor.distlib": [
39-
"t32.exe",
40-
"t64.exe",
41-
"t64-arm.exe",
42-
"w32.exe",
43-
"w64.exe",
44-
"w64-arm.exe",
45-
],
46-
},
476
entry_points={
487
"console_scripts": [
498
"pip=pip._internal.cli.main:main",
509
"pip{}=pip._internal.cli.main:main".format(sys.version_info[0]),
5110
"pip{}.{}=pip._internal.cli.main:main".format(*sys.version_info[:2]),
5211
],
5312
},
54-
zip_safe=False,
5513
)

0 commit comments

Comments
 (0)