Skip to content

Commit f8a2825

Browse files
authored
Temporary workaround for disruptive due deprecations (#4679)
2 parents 66a8aee + e2f4679 commit f8a2825

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

.github/workflows/main.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ jobs:
100100
run: |
101101
rm -rf dist
102102
# workaround for pypa/setuptools#4333
103-
pipx run --pip-args 'pyproject-hooks!=1.1' build
103+
pipx run --pip-args 'pyproject-hooks<1.1' build
104104
echo "PRE_BUILT_SETUPTOOLS_SDIST=$(ls dist/*.tar.gz)" >> $GITHUB_ENV
105105
echo "PRE_BUILT_SETUPTOOLS_WHEEL=$(ls dist/*.whl)" >> $GITHUB_ENV
106106
rm -rf setuptools.egg-info # Avoid interfering with the other tests

pyproject.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ test = [
5656
"pytest-home >= 0.5",
5757
"pytest-subprocess",
5858

59-
# workaround for pypa/setuptools#4333
60-
"pyproject-hooks!=1.1",
59+
# workaround for pypa/pyproject-hooks#206
60+
"pyproject-hooks<1.1", # TODO: fix problem with egg-info, see #4670
6161

6262
"jaraco.test",
6363
]

setuptools/dist.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -504,7 +504,7 @@ def warn_dash_deprecation(self, opt, section):
504504
versions. Please use the underscore name {underscore_opt!r} instead.
505505
""",
506506
see_docs="userguide/declarative_config.html",
507-
due_date=(2024, 9, 26),
507+
due_date=(2025, 3, 3),
508508
# Warning initially introduced in 3 Mar 2021
509509
)
510510
return underscore_opt
@@ -529,7 +529,7 @@ def make_option_lowercase(self, opt, section):
529529
future versions. Please use lowercase {lowercase_opt!r} instead.
530530
""",
531531
see_docs="userguide/declarative_config.html",
532-
due_date=(2024, 9, 26),
532+
due_date=(2025, 3, 3),
533533
# Warning initially introduced in 6 Mar 2021
534534
)
535535
return lowercase_opt

0 commit comments

Comments
 (0)