Skip to content

Commit f523831

Browse files
committed
Merge branch 'main' into feature/remove-more-pkg_resources
2 parents 25fd499 + 9cc2f5c commit f523831

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+306
-206
lines changed

.bumpversion.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[bumpversion]
2-
current_version = 80.8.0
2+
current_version = 80.9.0
33
commit = True
44
tag = True
55

.github/workflows/main.yml

Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
matrix:
4343
python:
4444
- "3.9"
45-
- "3.13"
45+
- ">=3.13.5" # temporary bound until it becomes the default, python/cpython#135151
4646
platform:
4747
- ubuntu-latest
4848
- macos-latest
@@ -157,6 +157,7 @@ jobs:
157157
if: always()
158158

159159
needs:
160+
- check-changed-folders
160161
- integration-test
161162
- test
162163
- collateral
@@ -228,6 +229,38 @@ jobs:
228229
VM-${{ matrix.platform }},
229230
Py-${{ steps.python-install.outputs.python-version }}
230231
token: ${{ secrets.CODECOV_TOKEN }}
232+
233+
check-changed-folders:
234+
name: Fail the job if files changed under _disutils/_vendor folders
235+
if: github.event_name == 'pull_request'
236+
runs-on: ubuntu-latest
237+
steps:
238+
- name: Checkout code
239+
uses: actions/checkout@v3
240+
with:
241+
fetch-depth: 0
242+
- name: Check if files changed in the _distutils folder
243+
id: changed-files-specific-distutils
244+
uses: tj-actions/changed-files@v34
245+
with:
246+
files: |
247+
setuptools/_distutils/**
248+
- name: Check if files changed in the _vendor folder
249+
id: changed-files-specific-vendor
250+
uses: tj-actions/changed-files@v34
251+
with:
252+
files: |
253+
setuptools/_vendor/**
254+
- name: Fail the job if any file(s) in the _distutils folder change
255+
if: steps.changed-files-specific-distutils.outputs.any_changed == 'true'
256+
run: |
257+
echo "One or more files in the setuptools/_distutils folder has changed." | tee "${GITHUB_STEP_SUMMARY}"
258+
exit 1
259+
- name: Fail the job if any file(s) in the _vendor folder change
260+
if: steps.changed-files-specific-vendor.outputs.any_changed == 'true'
261+
run: |
262+
echo "One or more files in the setuptools/_vendor folder has changed." | tee "${GITHUB_STEP_SUMMARY}"
263+
exit 1
231264
232265
integration-test:
233266
needs: test

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
repos:
22
- repo: https://github.com/astral-sh/ruff-pre-commit
3-
rev: v0.9.9
3+
rev: v0.12.0
44
hooks:
55
- id: ruff
66
args: [--fix, --unsafe-fixes]

NEWS.rst

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
v80.9.0
2+
=======
3+
4+
Features
5+
--------
6+
7+
- Set a deadline for the removal of pkg_resources later this year (December). (#3085)
8+
- Removed reliance on pkg_resources in test_wheel. (#3085)
9+
10+
111
v80.8.0
212
=======
313

@@ -671,7 +681,7 @@ v72.2.0
671681
Features
672682
--------
673683

674-
- Merged with pypa/distutils@b7ee725f3 including: Support for Pathlike objects in data files and extensions (pypa/distutils#272, pypa/distutils#237), native support for C++ compilers (pypa/distuils#228) and removed unused get_msvcr() (pypa/distutils#274). (#4538)
684+
- Merged with pypa/distutils@b7ee725f3 including: Support for Pathlike objects in data files and extensions (pypa/distutils#272, pypa/distutils#237), native support for C++ compilers (pypa/distutils#228) and removed unused get_msvcr() (pypa/distutils#274). (#4538)
675685

676686

677687
v72.1.0

docs/userguide/interfaces.rst

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,16 @@ reserve the right of speeding up the deprecation cycle and shortening deprecatio
5050
Note that these are exceptional circumstances and that the project will
5151
carefully attempt to find alternatives before resorting to unscheduled removals.
5252

53+
.. important::
54+
In the context of ``setuptools``, the introduction of :py:mod:`warnings`
55+
(including deprecation warnings) is not considered a breaking change *per se*.
56+
Instead it is considered a backwards compatible *communication action* that
57+
precedes an upcoming breaking change. This is becauset code
58+
containing warnings typically does not fail and can successfully terminate
59+
execution, unless users explicitly opt into transforming those warnings
60+
into errors (e.g., via Python's :external+python:ref:`-W option or
61+
PYTHONWARNINGS environment variable <using-on-warnings>`).
62+
5363

5464
What to do when deprecation periods are undefined?
5565
--------------------------------------------------
@@ -147,7 +157,7 @@ you can still resort to restricting the version of Setuptools to be installed.
147157
This usually includes modifying ``[build-system] requires`` in ``pyproject.toml``
148158
and/or specifying ``pip`` :external+pip:ref:`Constraints Files` via
149159
the ``PIP_CONSTRAINT`` environment variable (or passing |build-constraint-uv|_).
150-
Please avoid however to pre-emptively add version constraints if not necessary,
160+
Please avoid however to preemptively add version constraints if not necessary,
151161
(you can read more about this in https://iscinumpy.dev/post/bound-version-constraints/).
152162

153163
.. |build-constraint-uv| replace:: ``--build-constraint`` to ``uv``

newsfragments/3085.feature.rst

Lines changed: 0 additions & 1 deletion
This file was deleted.

newsfragments/4530.feature.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Remove post-release tags on setuptools' own build.

newsfragments/5033.misc.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Avoid repeated calls to ``str.startswith`` and ``str.endswith``.

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ backend-path = ["."]
1010

1111
[project]
1212
name = "setuptools"
13-
version = "80.8.0"
13+
version = "80.9.0"
1414
authors = [
1515
{ name = "Python Packaging Authority", email = "[email protected]" },
1616
]

pytest.ini

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,3 +85,7 @@ filterwarnings=
8585

8686
# Ignore warnings about consider_namespace_packages (jaraco/skeleton@6ff02e0eefcd)
8787
ignore:Unknown config option. consider_namespace_packages:pytest.PytestConfigWarning
88+
89+
# Ignore warnings we cannot do anything about:
90+
# https://github.com/pypa/setuptools/pull/5042#issuecomment-2981138461
91+
ignore:Couldn't import C tracer:coverage.exceptions.CoverageWarning

0 commit comments

Comments
 (0)