Skip to content

Unvendor safe dependencies #4758

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.

Sign up for GitHub

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

Draft
wants to merge 9 commits into
base: main
Choose a base branch
from
Draft

Unvendor safe dependencies #4758

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a9c292f
Move dependencies with no build- or run-time dependency on Setuptools…
jaraco Nov 23, 2024
f1b5ac9
Rename 'vendor' to 'target'
jaraco Nov 23, 2024
e3fd241
Inline the update function.
jaraco Nov 23, 2024
71e20da
Only vendor the dependencies defined in core.
jaraco Nov 23, 2024
d7fe622
Re-vendor dependencies.
jaraco Nov 23, 2024
0b06b5b
Also declare the dependencies as build requirements.
jaraco Nov 23, 2024
17db12c
Remove test_no_missing_dependencies, as that guarantee no longer holds.
jaraco Nov 23, 2024
f7aea6a
Update reference to wheel, no longer vendored.
jaraco Nov 23, 2024
6f5ca05
Add news fragment.
jaraco Nov 23, 2024
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
1 change: 1 addition & 0 deletions newsfragments/4758.removal.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Setuptools no longer vendors those dependencies that are built using other backends and instead declares those dependencies naturally.
38 changes: 28 additions & 10 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
[build-system]
requires = []
requires = [
# setuptools builds itself; keep in sync with dependencies below

"packaging>=24.2",
"more-itertools>=8.8",
"wheel>=0.43.0",
"tomli>=2.0.1; python_version < '3.11'",

# pkg_resources
"platformdirs >= 4.2.2", # Made ctypes optional (see #4461)

# for distutils
"packaging",
"more-itertools",
]
build-backend = "setuptools.build_meta"
backend-path = ["."]

Expand All @@ -24,6 +38,17 @@ classifiers = [
]
requires-python = ">=3.9"
dependencies = [
"packaging>=24.2",
"more-itertools>=8.8",
"wheel>=0.43.0",
"tomli>=2.0.1; python_version < '3.11'",

# pkg_resources
"platformdirs >= 4.2.2", # Made ctypes optional (see #4461)

# for distutils
"packaging",
"more-itertools",
]
keywords = ["CPAN PyPI distutils eggs package management"]

Expand Down Expand Up @@ -90,21 +115,14 @@ doc = [
ssl = []
certs = []
core = [
"packaging>=24.2",
"more_itertools>=8.8",
# #2825: dependencies with a setuptools build dependency go here.

"jaraco.text>=3.7",
"importlib_metadata>=6; python_version < '3.10'",
"tomli>=2.0.1; python_version < '3.11'",
"wheel>=0.43.0",

# pkg_resources
"platformdirs >= 4.2.2", # Made ctypes optional (see #4461)

# for distutils
"jaraco.collections",
"jaraco.functools>=4",
"packaging",
"more_itertools",
]

check = [
Expand Down
0 ...ortlib_metadata-8.0.0.dist-info/REQUESTED → setuptools/_vendor/.lock
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion setuptools/_vendor/autocommand-2.2.2.dist-info/INSTALLER
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
pip
uv
31 changes: 13 additions & 18 deletions setuptools/_vendor/autocommand-2.2.2.dist-info/RECORD
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,13 @@
autocommand-2.2.2.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
autocommand-2.2.2.dist-info/LICENSE,sha256=reeNBJgtaZctREqOFKlPh6IzTdOFXMgDSOqOJAqg3y0,7634
autocommand-2.2.2.dist-info/METADATA,sha256=OADZuR3O6iBlpu1ieTgzYul6w4uOVrk0P0BO5TGGAJk,15006
autocommand-2.2.2.dist-info/RECORD,,
autocommand-2.2.2.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
autocommand-2.2.2.dist-info/top_level.txt,sha256=AzfhgKKS8EdAwWUTSF8mgeVQbXOY9kokHB6kSqwwqu0,12
autocommand/__init__.py,sha256=zko5Rnvolvb-UXjCx_2ArPTGBWwUK5QY4LIQIKYR7As,1037
autocommand/__pycache__/__init__.cpython-312.pyc,,
autocommand/__pycache__/autoasync.cpython-312.pyc,,
autocommand/__pycache__/autocommand.cpython-312.pyc,,
autocommand/__pycache__/automain.cpython-312.pyc,,
autocommand/__pycache__/autoparse.cpython-312.pyc,,
autocommand/__pycache__/errors.cpython-312.pyc,,
autocommand/autoasync.py,sha256=AMdyrxNS4pqWJfP_xuoOcImOHWD-qT7x06wmKN1Vp-U,5680
autocommand/autocommand.py,sha256=hmkEmQ72HtL55gnURVjDOnsfYlGd5lLXbvT4KG496Qw,2505
autocommand/automain.py,sha256=A2b8i754Mxc_DjU9WFr6vqYDWlhz0cn8miu8d8EsxV8,2076
autocommand/autoparse.py,sha256=WVWmZJPcbzUKXP40raQw_0HD8qPJ2V9VG1eFFmmnFxw,11642
autocommand/errors.py,sha256=7aa3roh9Herd6nIKpQHNWEslWE8oq7GiHYVUuRqORnA,886
autocommand-2.2.2.dist-info/INSTALLER,sha256=5hhM4Q4mYTT9z6QB6PGpUAW81PGNFrYrdXMj4oM_6ak,2
autocommand-2.2.2.dist-info/LICENSE,sha256=reeNBJgtaZctREqOFKlPh6IzTdOFXMgDSOqOJAqg3y0,7634
autocommand-2.2.2.dist-info/METADATA,sha256=OADZuR3O6iBlpu1ieTgzYul6w4uOVrk0P0BO5TGGAJk,15006
autocommand-2.2.2.dist-info/RECORD,,
autocommand-2.2.2.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
autocommand-2.2.2.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
autocommand-2.2.2.dist-info/top_level.txt,sha256=AzfhgKKS8EdAwWUTSF8mgeVQbXOY9kokHB6kSqwwqu0,12
autocommand/__init__.py,sha256=zko5Rnvolvb-UXjCx_2ArPTGBWwUK5QY4LIQIKYR7As,1037
autocommand/autoasync.py,sha256=AMdyrxNS4pqWJfP_xuoOcImOHWD-qT7x06wmKN1Vp-U,5680
autocommand/autocommand.py,sha256=hmkEmQ72HtL55gnURVjDOnsfYlGd5lLXbvT4KG496Qw,2505
autocommand/automain.py,sha256=A2b8i754Mxc_DjU9WFr6vqYDWlhz0cn8miu8d8EsxV8,2076
autocommand/autoparse.py,sha256=WVWmZJPcbzUKXP40raQw_0HD8qPJ2V9VG1eFFmmnFxw,11642
autocommand/errors.py,sha256=7aa3roh9Herd6nIKpQHNWEslWE8oq7GiHYVUuRqORnA,886
0 ...or/jaraco.text-3.12.1.dist-info/REQUESTED → ...dor/autocommand-2.2.2.dist-info/REQUESTED
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion setuptools/_vendor/backports.tarfile-1.2.0.dist-info/INSTALLER
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
pip
uv
29 changes: 12 additions & 17 deletions setuptools/_vendor/backports.tarfile-1.2.0.dist-info/RECORD
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,12 @@
backports.tarfile-1.2.0.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
backports.tarfile-1.2.0.dist-info/LICENSE,sha256=htoPAa6uRjSKPD1GUZXcHOzN55956HdppkuNoEsqR0E,1023
backports.tarfile-1.2.0.dist-info/METADATA,sha256=ghXFTq132dxaEIolxr3HK1mZqm9iyUmaRANZQSr6WlE,2020
backports.tarfile-1.2.0.dist-info/RECORD,,
backports.tarfile-1.2.0.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
backports.tarfile-1.2.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
backports.tarfile-1.2.0.dist-info/top_level.txt,sha256=cGjaLMOoBR1FK0ApojtzWVmViTtJ7JGIK_HwXiEsvtU,10
backports/__init__.py,sha256=iOEMwnlORWezdO8-2vxBIPSR37D7JGjluZ8f55vzxls,81
backports/__pycache__/__init__.cpython-312.pyc,,
backports/tarfile/__init__.py,sha256=Pwf2qUIfB0SolJPCKcx3vz3UEu_aids4g4sAfxy94qg,108491
backports/tarfile/__main__.py,sha256=Yw2oGT1afrz2eBskzdPYL8ReB_3liApmhFkN2EbDmc4,59
backports/tarfile/__pycache__/__init__.cpython-312.pyc,,
backports/tarfile/__pycache__/__main__.cpython-312.pyc,,
backports/tarfile/compat/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
backports/tarfile/compat/__pycache__/__init__.cpython-312.pyc,,
backports/tarfile/compat/__pycache__/py38.cpython-312.pyc,,
backports/tarfile/compat/py38.py,sha256=iYkyt_gvWjLzGUTJD9TuTfMMjOk-ersXZmRlvQYN2qE,568
backports.tarfile-1.2.0.dist-info/INSTALLER,sha256=5hhM4Q4mYTT9z6QB6PGpUAW81PGNFrYrdXMj4oM_6ak,2
backports.tarfile-1.2.0.dist-info/LICENSE,sha256=htoPAa6uRjSKPD1GUZXcHOzN55956HdppkuNoEsqR0E,1023
backports.tarfile-1.2.0.dist-info/METADATA,sha256=ghXFTq132dxaEIolxr3HK1mZqm9iyUmaRANZQSr6WlE,2020
backports.tarfile-1.2.0.dist-info/RECORD,,
backports.tarfile-1.2.0.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
backports.tarfile-1.2.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
backports.tarfile-1.2.0.dist-info/top_level.txt,sha256=cGjaLMOoBR1FK0ApojtzWVmViTtJ7JGIK_HwXiEsvtU,10
backports/__init__.py,sha256=iOEMwnlORWezdO8-2vxBIPSR37D7JGjluZ8f55vzxls,81
backports/tarfile/__init__.py,sha256=Pwf2qUIfB0SolJPCKcx3vz3UEu_aids4g4sAfxy94qg,108491
backports/tarfile/__main__.py,sha256=Yw2oGT1afrz2eBskzdPYL8ReB_3liApmhFkN2EbDmc4,59
backports/tarfile/compat/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
backports/tarfile/compat/py38.py,sha256=iYkyt_gvWjLzGUTJD9TuTfMMjOk-ersXZmRlvQYN2qE,568
1 change: 0 additions & 1 deletion setuptools/_vendor/importlib_metadata-8.0.0.dist-info/INSTALLER
View file
Open in desktop

This file was deleted.

32 changes: 0 additions & 32 deletions setuptools/_vendor/importlib_metadata-8.0.0.dist-info/RECORD
View file
Open in desktop

This file was deleted.

0 ...vendor/packaging-24.2.dist-info/INSTALLER → ...ortlib_metadata-8.5.0.dist-info/INSTALLER
View file
Open in desktop
File renamed without changes.
0 ...mportlib_metadata-8.0.0.dist-info/LICENSE → ...mportlib_metadata-8.5.0.dist-info/LICENSE
View file
Open in desktop
File renamed without changes.
18 changes: 11 additions & 7 deletions ...portlib_metadata-8.0.0.dist-info/METADATA → ...portlib_metadata-8.5.0.dist-info/METADATA
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: importlib_metadata
Version: 8.0.0
Version: 8.5.0
Summary: Read metadata from Python packages
Author-email: "Jason R. Coombs" <[email protected]>
Project-URL: Source, https://github.com/python/importlib_metadata
Expand All @@ -12,30 +12,34 @@ Classifier: Programming Language :: Python :: 3 :: Only
Requires-Python: >=3.8
Description-Content-Type: text/x-rst
License-File: LICENSE
Requires-Dist: zipp >=0.5
Requires-Dist: zipp >=3.20
Requires-Dist: typing-extensions >=3.6.4 ; python_version < "3.8"
Provides-Extra: check
Requires-Dist: pytest-checkdocs >=2.4 ; extra == 'check'
Requires-Dist: pytest-ruff >=0.2.1 ; (sys_platform != "cygwin") and extra == 'check'
Provides-Extra: cover
Requires-Dist: pytest-cov ; extra == 'cover'
Provides-Extra: doc
Requires-Dist: sphinx >=3.5 ; extra == 'doc'
Requires-Dist: jaraco.packaging >=9.3 ; extra == 'doc'
Requires-Dist: rst.linker >=1.9 ; extra == 'doc'
Requires-Dist: furo ; extra == 'doc'
Requires-Dist: sphinx-lint ; extra == 'doc'
Requires-Dist: jaraco.tidelift >=1.4 ; extra == 'doc'
Provides-Extra: enabler
Requires-Dist: pytest-enabler >=2.2 ; extra == 'enabler'
Provides-Extra: perf
Requires-Dist: ipython ; extra == 'perf'
Provides-Extra: test
Requires-Dist: pytest !=8.1.*,>=6 ; extra == 'test'
Requires-Dist: pytest-checkdocs >=2.4 ; extra == 'test'
Requires-Dist: pytest-cov ; extra == 'test'
Requires-Dist: pytest-mypy ; extra == 'test'
Requires-Dist: pytest-enabler >=2.2 ; extra == 'test'
Requires-Dist: pytest-ruff >=0.2.1 ; extra == 'test'
Requires-Dist: packaging ; extra == 'test'
Requires-Dist: pyfakefs ; extra == 'test'
Requires-Dist: flufl.flake8 ; extra == 'test'
Requires-Dist: pytest-perf >=0.9.2 ; extra == 'test'
Requires-Dist: jaraco.test >=5.4 ; extra == 'test'
Requires-Dist: importlib-resources >=1.3 ; (python_version < "3.9") and extra == 'test'
Provides-Extra: type
Requires-Dist: pytest-mypy ; extra == 'type'

.. image:: https://img.shields.io/pypi/v/importlib_metadata.svg
:target: https://pypi.org/project/importlib_metadata
Expand Down
20 changes: 20 additions & 0 deletions setuptools/_vendor/importlib_metadata-8.5.0.dist-info/RECORD
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
importlib_metadata-8.5.0.dist-info/INSTALLER,sha256=5hhM4Q4mYTT9z6QB6PGpUAW81PGNFrYrdXMj4oM_6ak,2
importlib_metadata-8.5.0.dist-info/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
importlib_metadata-8.5.0.dist-info/METADATA,sha256=HXikDpZut4rY2D4ZuhAxXnLUDb-f_XP_Cyp9iYmF4G0,4775
importlib_metadata-8.5.0.dist-info/RECORD,,
importlib_metadata-8.5.0.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
importlib_metadata-8.5.0.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
importlib_metadata-8.5.0.dist-info/top_level.txt,sha256=CO3fD9yylANiXkrMo4qHLV_mqXL2sC5JFKgt1yWAT-A,19
importlib_metadata/__init__.py,sha256=-Sk7aVqfmzLecdjSOpLKo1P_PegQanR__HsMMyEq0PI,35853
importlib_metadata/_adapters.py,sha256=wdyNWoVblu1r4z8v4t6iQEyjnqAujEyqWAp9wTCVluI,2317
importlib_metadata/_collections.py,sha256=CJ0OTCHIjWA0ZIVS4voORAsn2R4R2cQBEtPsZEJpASY,743
importlib_metadata/_compat.py,sha256=VC5ZDLlT-BcshauCShdFJvMNLntJJfZzNK1meGa-enw,1313
importlib_metadata/_functools.py,sha256=bSbAqC9-2niWM9364FYBx9GWtetnJEfo4mdLv8uMl7c,2895
importlib_metadata/_itertools.py,sha256=nMvp9SfHAQ_JYwK4L2i64lr3GRXGlYlikGTVzWbys_E,5351
importlib_metadata/_meta.py,sha256=JzuqMG4za5MoaBPCPv61c26fUBdQPZ4by3pbaQA_E_o,1823
importlib_metadata/_text.py,sha256=HCsFksZpJLeTP3NEk_ngrAeXVRRtTrtyh9eOABoRP4A,2166
importlib_metadata/compat/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
importlib_metadata/compat/py311.py,sha256=uqm-K-uohyj1042TH4a9Er_I5o7667DvulcD-gC_fSA,608
importlib_metadata/compat/py39.py,sha256=cPkMv6-0ilK-0Jw_Tkn0xYbOKJZc4WJKQHow0c2T44w,1102
importlib_metadata/diagnose.py,sha256=nkSRMiowlmkhLYhKhvCg9glmt_11Cox-EmLzEbqYTa8,379
importlib_metadata/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
0 ...more_itertools-10.3.0.dist-info/REQUESTED → ...ortlib_metadata-8.5.0.dist-info/REQUESTED
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ols/_vendor/inflect-7.3.1.dist-info/WHEEL → .../importlib_metadata-8.5.0.dist-info/WHEEL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Wheel-Version: 1.0
Generator: setuptools (70.2.0)
Generator: setuptools (74.1.2)
Root-Is-Purelib: true
Tag: py3-none-any

0 ...ib_metadata-8.0.0.dist-info/top_level.txt → ...ib_metadata-8.5.0.dist-info/top_level.txt
View file
Open in desktop
File renamed without changes.
Loading
Loading