Skip to content
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

Temporary workaround for disruptive due deprecations #4679

Merged
merged 4 commits into from
Oct 15, 2024
Merged

Temporary workaround for disruptive due deprecations #4679

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
258edab
Post-pone deprecation for now
abravalheri Oct 7, 2024
35d1139
For now avoid problems with pyproject-hooks
abravalheri Oct 15, 2024
a0a0e32
Fix version specifier in workaround for pyproject-hooks
abravalheri Oct 15, 2024
e2f4679
Add missing workaround in github actions
abravalheri Oct 15, 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
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ jobs:
run: |
rm -rf dist
# workaround for pypa/setuptools#4333
pipx run --pip-args 'pyproject-hooks!=1.1' build
pipx run --pip-args 'pyproject-hooks<1.1' build
echo "PRE_BUILT_SETUPTOOLS_SDIST=$(ls dist/*.tar.gz)" >> $GITHUB_ENV
echo "PRE_BUILT_SETUPTOOLS_WHEEL=$(ls dist/*.whl)" >> $GITHUB_ENV
rm -rf setuptools.egg-info # Avoid interfering with the other tests
Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ test = [
"pytest-home >= 0.5",
"pytest-subprocess",

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

"jaraco.test",
]
Expand Down
4 changes: 2 additions & 2 deletions setuptools/dist.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,7 +504,7 @@ def warn_dash_deprecation(self, opt, section):
versions. Please use the underscore name {underscore_opt!r} instead.
""",
see_docs="userguide/declarative_config.html",
due_date=(2024, 9, 26),
due_date=(2025, 3, 3),
# Warning initially introduced in 3 Mar 2021
)
return underscore_opt
Expand All @@ -529,7 +529,7 @@ def make_option_lowercase(self, opt, section):
future versions. Please use lowercase {lowercase_opt!r} instead.
""",
see_docs="userguide/declarative_config.html",
due_date=(2024, 9, 26),
due_date=(2025, 3, 3),
# Warning initially introduced in 6 Mar 2021
)
return lowercase_opt
Expand Down
Loading