Skip to content

Absorb macos_libfile from pypa/wheel #4965

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.

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

Closed
wants to merge 32 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
221c514
Better discovery of macos system version to determine proper platform…
Czaki Oct 23, 2019
c777287
Fixed typo 'dynlib' -> 'dylib' (pypa/wheel#320)
Czaki Nov 19, 2019
d678b32
macosx platform tag does not support patch releases (pypa/wheel#317)
Czaki Jan 3, 2020
ebf3190
Replaced pep425tags with packaging (pypa/wheel#346)
mattip Apr 7, 2020
a7e15f6
Fixed error on Big Sur when deployment target = 11 (pypa/wheel#386)
Czaki Dec 4, 2020
0169f6d
Don't use default macos/arm64 deployment target in calculating the pl…
ronaldoussoren Dec 13, 2020
87056b1
Fix typo of comments (pypa/wheel#404)
yhay81 May 22, 2021
6608ef0
Upgraded to py3.7+ syntax
agronholm Dec 22, 2021
94609e4
Adopted black and reformatted the codebase to match
agronholm Dec 23, 2021
38a2d9a
Adopted isort and applied it to the codebase
agronholm Dec 23, 2021
e2fff16
Fixed pre-commit parameters for Black
henryiii Dec 29, 2021
37f383b
Added pyupgrade and flake8-bugbear to pre-commit config (pypa/wheel#432)
henryiii Dec 30, 2021
3aaac0d
Replaced all uses of distutils with setuptools (pypa/wheel#428)
agronholm Dec 30, 2021
a732826
[pre-commit.ci] pre-commit autoupdate (pypa/wheel#499)
pre-commit-ci[bot] Mar 10, 2023
11eaad4
Fixed 32-bit platform tag detection (pypa/wheel#560)
mayeut Aug 21, 2023
2bc8bc7
Fix typo found by codespell (pypa/wheel#591)
DimitriPapadopoulos Dec 18, 2023
9b2abe3
Removed duplicate seek test (pypa/wheel#593)
DimitriPapadopoulos Mar 10, 2024
393a752
General typing improvement (pypa/wheel#610)
Sachaa-Thanasius Apr 29, 2024
9194bfb
Extended the ruff rule list and applied fixes
agronholm May 8, 2024
1fc295f
Deprecated bdist_wheel and updated the README (pypa/wheel#631)
agronholm Aug 4, 2024
f5fc0f0
[pre-commit.ci] pre-commit autoupdate (pypa/wheel#635)
pre-commit-ci[bot] Oct 11, 2024
1081402
Absorb pypa/wheel's macos_libfile/main (preserving history)
abravalheri Apr 30, 2025
68e669b
Do not import macosx_libfile from pypa/wheel
abravalheri Apr 28, 2025
49fe9cd
Fix/ignore some type check "errors"
abravalheri Apr 29, 2025
eda96ef
Add the original copyright notice to _macos_libfile.py
abravalheri Apr 29, 2025
8db010d
Add news fragment
abravalheri Apr 29, 2025
4f87a1a
Improve discourse link in news fragment
abravalheri Apr 29, 2025
8a853d9
Add original author information
abravalheri Apr 29, 2025
35a75e8
Ensure test files for macos_libfile are added to sdist
abravalheri Apr 30, 2025
ed00c65
Fix imports in test file
abravalheri Apr 30, 2025
c4caf27
Fix file format
abravalheri Apr 30, 2025
cd31eb7
Fix news fragment
abravalheri Apr 30, 2025
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 MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ recursive-include pkg_resources *.py *.txt
recursive-include pkg_resources/tests/data *
recursive-include tools *
recursive-include newsfragments *
graft setuptools/tests/macosx_libfile/
include *.py
include *.rst
include MANIFEST.in
Expand Down
4 changes: 4 additions & 0 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,10 @@
pattern=r'pypa/(?P<commit_repo>[\-\.\w]+)@(?P<commit_number>[\da-f]+)',
url='{GH}/pypa/{commit_repo}/commit/{commit_number}',
),
dict(
pattern=r'Discourse thread (?P<thread_number>\d+)',
url='https://discuss.python.org/t/{thread_number}',
),
],
),
}
Expand Down
8 changes: 8 additions & 0 deletions newsfragments/4965.feature.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
Incorporated ``wheel.macosx_libfile`` as a private module in the ``setuptools`` project.
The discussion leading to this approach can be found in #4935 and in the Discourse thread 87509.
The original code was provided to pypa/wheel#314 by Grzegorz Bokota (:user:`Czaki`),
and further improved by community members in the context of the :pypi:`wheel` project
(see commit history in https://github.com/pypa/wheel/commits/0.46.1/src/wheel/macosx_libfile.py).
Third party software interested in using this module are encouraged to interact
in the Discourse thread and propose alternatives (e.g. extracting this module
in its own separated project).
6 changes: 4 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -208,8 +208,10 @@ exclude = [
namespaces = true

[tool.setuptools.exclude-package-data]
# Remove ruff.toml when installing vendored packages (#4652)
"*" = ["ruff.toml"]
"*" = [
"ruff.toml", # Remove ruff.toml when installing vendored packages (#4652)
"*.dylib", # Avoid distributing obscure binary test files for macos_libfile in wheel (#4965)
]

[tool.distutils.sdist]
formats = "zip"
Expand Down
Loading
Loading