Skip to content

Commit dff0a23

Browse files
jsiroisjsirois
authored
Upgrade to latest packaging for Python 3.8+. (#2748)
This completes Pex support for targeting Android. The Pip 25.1 upgrade in Pex 2.34.0 brought support for resolving Android platform-specific wheels and this upgrade of Pex's vendored packaging to 25.0 brings support for Pex properly dealing with those Android platform-specific wheels when packaging PEXes and when booting up from a PEX.
1 parent 274b0d3 commit dff0a23

33 files changed

+6079
-10
lines changed

‎CHANGES.md

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
# Release Notes
22

3+
## 2.36.0
4+
5+
This release brings support for creating PEXes that target Android. The Pip 25.1 upgrade in Pex
6+
2.34.0 brought support for resolving Android platform-specific wheels and this releases upgrade
7+
of Pex's vendored packaging to 25.0 brings support for Pex properly dealing with those Android
8+
platform-specific wheels when packaging PEXes and when booting up from a PEX.
9+
10+
* Upgrade to latest packaging for Python 3.8+. (#2748)
11+
312
## 2.35.0
413

514
This release adds support for the `--resume-retries` option available in Pip 25.1. If you configure
@@ -9,7 +18,7 @@ Pex to use Pip 25.1 or newer, it will now try to resume incomplete downloads 3 t
918

1019
## 2.34.0
1120

12-
This release add support for `--pip-version 25.1` as well as `--pip-version latest-compatible`. The
21+
This release adds support for `--pip-version 25.1` as well as `--pip-version latest-compatible`. The
1322
`latest-compatible` version will be the latest `--pip-version` supported by Pex compatible with the
1423
current interpreter running Pex.
1524

‎pex/pip/foreign_platform/markers.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,3 +52,10 @@ def _eval_op(
5252
return original_eval_op(lhs, op, rhs)
5353

5454
markers._eval_op = _eval_op
55+
56+
# Packaging 24.1+ unconditionally patches the env dict `python_full_version` value to work
57+
# around Python dev release versions with a `+` trailer not being valid PEP-440 versions. That
58+
# check will needlessly blow up for some of our AbbreviatedPlatform target environments; so we
59+
# short-circuit here.
60+
if "python_full_version" not in evaluation_environment:
61+
markers._repair_python_full_version = lambda env: env

‎pex/vendor/__init__.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -243,12 +243,12 @@ def iter_vendor_specs(filter_requires_python=None):
243243
yield VendorSpec.pinned(
244244
"packaging", "21.3", import_path="packaging_21_3", constraints=("pyparsing<3.0.8",)
245245
)
246-
if not python_major_minor or python_major_minor >= (3, 7):
247-
# Modern packaging for everyone else.
248-
# N.B.: We can't upgrade past 24.0 without re-working marker evaluation for
249-
# AbbreviatedPlatform since modern versions of packaging unconditionally assume the
250-
# `python_full_version` marker will always be populated.
246+
if not python_major_minor or python_major_minor == (3, 7):
247+
# The last version to support 3.7.
251248
yield VendorSpec.pinned("packaging", "24.0", import_path="packaging_24_0")
249+
if not python_major_minor or python_major_minor >= (3, 8):
250+
# Modern packaging for everyone else.
251+
yield VendorSpec.pinned("packaging", "25.0", import_path="packaging_25_0")
252252

253253
# We use toml to read pyproject.toml when building sdists from local source projects.
254254
# The toml project provides compatibility back to Python 2.7, but is frozen in time in 2020

‎pex/vendor/_vendored/packaging_25_0/.layout.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"fingerprint": "4390b6077435abbfa59ee50812f10d070650a9169b2bac4c0885764cbc6d2453", "record_relpath": "packaging-25.0.dist-info/RECORD", "root_is_purelib": true, "stash_dir": ".prefix"}

‎pex/vendor/_vendored/packaging_25_0/__init__.py

Whitespace-only changes.

‎pex/vendor/_vendored/packaging_25_0/constraints.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
packaging==25.0

‎pex/vendor/_vendored/packaging_25_0/packaging-25.0.dist-info/INSTALLER

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
pex

‎pex/vendor/_vendored/packaging_25_0/packaging-25.0.dist-info/METADATA

Lines changed: 105 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,105 @@
1+
Metadata-Version: 2.4
2+
Name: packaging
3+
Version: 25.0
4+
Summary: Core utilities for Python packages
5+
Author-email: Donald Stufft <[email protected]>
6+
Requires-Python: >=3.8
7+
Description-Content-Type: text/x-rst
8+
Classifier: Development Status :: 5 - Production/Stable
9+
Classifier: Intended Audience :: Developers
10+
Classifier: License :: OSI Approved :: Apache Software License
11+
Classifier: License :: OSI Approved :: BSD License
12+
Classifier: Programming Language :: Python
13+
Classifier: Programming Language :: Python :: 3
14+
Classifier: Programming Language :: Python :: 3 :: Only
15+
Classifier: Programming Language :: Python :: 3.8
16+
Classifier: Programming Language :: Python :: 3.9
17+
Classifier: Programming Language :: Python :: 3.10
18+
Classifier: Programming Language :: Python :: 3.11
19+
Classifier: Programming Language :: Python :: 3.12
20+
Classifier: Programming Language :: Python :: 3.13
21+
Classifier: Programming Language :: Python :: Implementation :: CPython
22+
Classifier: Programming Language :: Python :: Implementation :: PyPy
23+
Classifier: Typing :: Typed
24+
License-File: LICENSE
25+
License-File: LICENSE.APACHE
26+
License-File: LICENSE.BSD
27+
Project-URL: Documentation, https://packaging.pypa.io/
28+
Project-URL: Source, https://github.com/pypa/packaging
29+
30+
packaging
31+
=========
32+
33+
.. start-intro
34+
35+
Reusable core utilities for various Python Packaging
36+
`interoperability specifications <https://packaging.python.org/specifications/>`_.
37+
38+
This library provides utilities that implement the interoperability
39+
specifications which have clearly one correct behaviour (eg: :pep:`440`)
40+
or benefit greatly from having a single shared implementation (eg: :pep:`425`).
41+
42+
.. end-intro
43+
44+
The ``packaging`` project includes the following: version handling, specifiers,
45+
markers, requirements, tags, utilities.
46+
47+
Documentation
48+
-------------
49+
50+
The `documentation`_ provides information and the API for the following:
51+
52+
- Version Handling
53+
- Specifiers
54+
- Markers
55+
- Requirements
56+
- Tags
57+
- Utilities
58+
59+
Installation
60+
------------
61+
62+
Use ``pip`` to install these utilities::
63+
64+
pip install packaging
65+
66+
The ``packaging`` library uses calendar-based versioning (``YY.N``).
67+
68+
Discussion
69+
----------
70+
71+
If you run into bugs, you can file them in our `issue tracker`_.
72+
73+
You can also join ``#pypa`` on Freenode to ask questions or get involved.
74+
75+
76+
.. _`documentation`: https://packaging.pypa.io/
77+
.. _`issue tracker`: https://github.com/pypa/packaging/issues
78+
79+
80+
Code of Conduct
81+
---------------
82+
83+
Everyone interacting in the packaging project's codebases, issue trackers, chat
84+
rooms, and mailing lists is expected to follow the `PSF Code of Conduct`_.
85+
86+
.. _PSF Code of Conduct: https://github.com/pypa/.github/blob/main/CODE_OF_CONDUCT.md
87+
88+
Contributing
89+
------------
90+
91+
The ``CONTRIBUTING.rst`` file outlines how to contribute to this project as
92+
well as how to report a potential security issue. The documentation for this
93+
project also covers information about `project development`_ and `security`_.
94+
95+
.. _`project development`: https://packaging.pypa.io/en/latest/development/
96+
.. _`security`: https://packaging.pypa.io/en/latest/security/
97+
98+
Project History
99+
---------------
100+
101+
Please review the ``CHANGELOG.rst`` file or the `Changelog documentation`_ for
102+
recent changes and project history.
103+
104+
.. _`Changelog documentation`: https://packaging.pypa.io/en/latest/changelog/
105+

‎pex/vendor/_vendored/packaging_25_0/packaging-25.0.dist-info/WHEEL

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
Wheel-Version: 1.0
2+
Generator: flit 3.12.0
3+
Root-Is-Purelib: true
4+
Tag: py3-none-any

‎pex/vendor/_vendored/packaging_25_0/packaging-25.0.dist-info/licenses/LICENSE

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
This software is made available under the terms of *either* of the licenses
2+
found in LICENSE.APACHE or LICENSE.BSD. Contributions to this software is made
3+
under the terms of *both* these licenses.

‎pex/vendor/_vendored/packaging_25_0/packaging-25.0.dist-info/licenses/LICENSE.APACHE

Lines changed: 177 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,177 @@
1+
2+
Apache License
3+
Version 2.0, January 2004
4+
http://www.apache.org/licenses/
5+
6+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
7+
8+
1. Definitions.
9+
10+
"License" shall mean the terms and conditions for use, reproduction,
11+
and distribution as defined by Sections 1 through 9 of this document.
12+
13+
"Licensor" shall mean the copyright owner or entity authorized by
14+
the copyright owner that is granting the License.
15+
16+
"Legal Entity" shall mean the union of the acting entity and all
17+
other entities that control, are controlled by, or are under common
18+
control with that entity. For the purposes of this definition,
19+
"control" means (i) the power, direct or indirect, to cause the
20+
direction or management of such entity, whether by contract or
21+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
22+
outstanding shares, or (iii) beneficial ownership of such entity.
23+
24+
"You" (or "Your") shall mean an individual or Legal Entity
25+
exercising permissions granted by this License.
26+
27+
"Source" form shall mean the preferred form for making modifications,
28+
including but not limited to software source code, documentation
29+
source, and configuration files.
30+
31+
"Object" form shall mean any form resulting from mechanical
32+
transformation or translation of a Source form, including but
33+
not limited to compiled object code, generated documentation,
34+
and conversions to other media types.
35+
36+
"Work" shall mean the work of authorship, whether in Source or
37+
Object form, made available under the License, as indicated by a
38+
copyright notice that is included in or attached to the work
39+
(an example is provided in the Appendix below).
40+
41+
"Derivative Works" shall mean any work, whether in Source or Object
42+
form, that is based on (or derived from) the Work and for which the
43+
editorial revisions, annotations, elaborations, or other modifications
44+
represent, as a whole, an original work of authorship. For the purposes
45+
of this License, Derivative Works shall not include works that remain
46+
separable from, or merely link (or bind by name) to the interfaces of,
47+
the Work and Derivative Works thereof.
48+
49+
"Contribution" shall mean any work of authorship, including
50+
the original version of the Work and any modifications or additions
51+
to that Work or Derivative Works thereof, that is intentionally
52+
submitted to Licensor for inclusion in the Work by the copyright owner
53+
or by an individual or Legal Entity authorized to submit on behalf of
54+
the copyright owner. For the purposes of this definition, "submitted"
55+
means any form of electronic, verbal, or written communication sent
56+
to the Licensor or its representatives, including but not limited to
57+
communication on electronic mailing lists, source code control systems,
58+
and issue tracking systems that are managed by, or on behalf of, the
59+
Licensor for the purpose of discussing and improving the Work, but
60+
excluding communication that is conspicuously marked or otherwise
61+
designated in writing by the copyright owner as "Not a Contribution."
62+
63+
"Contributor" shall mean Licensor and any individual or Legal Entity
64+
on behalf of whom a Contribution has been received by Licensor and
65+
subsequently incorporated within the Work.
66+
67+
2. Grant of Copyright License. Subject to the terms and conditions of
68+
this License, each Contributor hereby grants to You a perpetual,
69+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
70+
copyright license to reproduce, prepare Derivative Works of,
71+
publicly display, publicly perform, sublicense, and distribute the
72+
Work and such Derivative Works in Source or Object form.
73+
74+
3. Grant of Patent License. Subject to the terms and conditions of
75+
this License, each Contributor hereby grants to You a perpetual,
76+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
77+
(except as stated in this section) patent license to make, have made,
78+
use, offer to sell, sell, import, and otherwise transfer the Work,
79+
where such license applies only to those patent claims licensable
80+
by such Contributor that are necessarily infringed by their
81+
Contribution(s) alone or by combination of their Contribution(s)
82+
with the Work to which such Contribution(s) was submitted. If You
83+
institute patent litigation against any entity (including a
84+
cross-claim or counterclaim in a lawsuit) alleging that the Work
85+
or a Contribution incorporated within the Work constitutes direct
86+
or contributory patent infringement, then any patent licenses
87+
granted to You under this License for that Work shall terminate
88+
as of the date such litigation is filed.
89+
90+
4. Redistribution. You may reproduce and distribute copies of the
91+
Work or Derivative Works thereof in any medium, with or without
92+
modifications, and in Source or Object form, provided that You
93+
meet the following conditions:
94+
95+
(a) You must give any other recipients of the Work or
96+
Derivative Works a copy of this License; and
97+
98+
(b) You must cause any modified files to carry prominent notices
99+
stating that You changed the files; and
100+
101+
(c) You must retain, in the Source form of any Derivative Works
102+
that You distribute, all copyright, patent, trademark, and
103+
attribution notices from the Source form of the Work,
104+
excluding those notices that do not pertain to any part of
105+
the Derivative Works; and
106+
107+
(d) If the Work includes a "NOTICE" text file as part of its
108+
distribution, then any Derivative Works that You distribute must
109+
include a readable copy of the attribution notices contained
110+
within such NOTICE file, excluding those notices that do not
111+
pertain to any part of the Derivative Works, in at least one
112+
of the following places: within a NOTICE text file distributed
113+
as part of the Derivative Works; within the Source form or
114+
documentation, if provided along with the Derivative Works; or,
115+
within a display generated by the Derivative Works, if and
116+
wherever such third-party notices normally appear. The contents
117+
of the NOTICE file are for informational purposes only and
118+
do not modify the License. You may add Your own attribution
119+
notices within Derivative Works that You distribute, alongside
120+
or as an addendum to the NOTICE text from the Work, provided
121+
that such additional attribution notices cannot be construed
122+
as modifying the License.
123+
124+
You may add Your own copyright statement to Your modifications and
125+
may provide additional or different license terms and conditions
126+
for use, reproduction, or distribution of Your modifications, or
127+
for any such Derivative Works as a whole, provided Your use,
128+
reproduction, and distribution of the Work otherwise complies with
129+
the conditions stated in this License.
130+
131+
5. Submission of Contributions. Unless You explicitly state otherwise,
132+
any Contribution intentionally submitted for inclusion in the Work
133+
by You to the Licensor shall be under the terms and conditions of
134+
this License, without any additional terms or conditions.
135+
Notwithstanding the above, nothing herein shall supersede or modify
136+
the terms of any separate license agreement you may have executed
137+
with Licensor regarding such Contributions.
138+
139+
6. Trademarks. This License does not grant permission to use the trade
140+
names, trademarks, service marks, or product names of the Licensor,
141+
except as required for reasonable and customary use in describing the
142+
origin of the Work and reproducing the content of the NOTICE file.
143+
144+
7. Disclaimer of Warranty. Unless required by applicable law or
145+
agreed to in writing, Licensor provides the Work (and each
146+
Contributor provides its Contributions) on an "AS IS" BASIS,
147+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
148+
implied, including, without limitation, any warranties or conditions
149+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
150+
PARTICULAR PURPOSE. You are solely responsible for determining the
151+
appropriateness of using or redistributing the Work and assume any
152+
risks associated with Your exercise of permissions under this License.
153+
154+
8. Limitation of Liability. In no event and under no legal theory,
155+
whether in tort (including negligence), contract, or otherwise,
156+
unless required by applicable law (such as deliberate and grossly
157+
negligent acts) or agreed to in writing, shall any Contributor be
158+
liable to You for damages, including any direct, indirect, special,
159+
incidental, or consequential damages of any character arising as a
160+
result of this License or out of the use or inability to use the
161+
Work (including but not limited to damages for loss of goodwill,
162+
work stoppage, computer failure or malfunction, or any and all
163+
other commercial damages or losses), even if such Contributor
164+
has been advised of the possibility of such damages.
165+
166+
9. Accepting Warranty or Additional Liability. While redistributing
167+
the Work or Derivative Works thereof, You may choose to offer,
168+
and charge a fee for, acceptance of support, warranty, indemnity,
169+
or other liability obligations and/or rights consistent with this
170+
License. However, in accepting such obligations, You may act only
171+
on Your own behalf and on Your sole responsibility, not on behalf
172+
of any other Contributor, and only if You agree to indemnify,
173+
defend, and hold each Contributor harmless for any liability
174+
incurred by, or claims asserted against, such Contributor by reason
175+
of your accepting any such warranty or additional liability.
176+
177+
END OF TERMS AND CONDITIONS

‎pex/vendor/_vendored/packaging_25_0/packaging-25.0.dist-info/licenses/LICENSE.BSD

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
Copyright (c) Donald Stufft and individual contributors.
2+
All rights reserved.
3+
4+
Redistribution and use in source and binary forms, with or without
5+
modification, are permitted provided that the following conditions are met:
6+
7+
1. Redistributions of source code must retain the above copyright notice,
8+
this list of conditions and the following disclaimer.
9+
10+
2. Redistributions in binary form must reproduce the above copyright
11+
notice, this list of conditions and the following disclaimer in the
12+
documentation and/or other materials provided with the distribution.
13+
14+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
15+
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
16+
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
17+
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
18+
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
19+
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
20+
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
21+
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
22+
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
23+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

‎pex/vendor/_vendored/packaging_25_0/packaging/__init__.py

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# This file is dual licensed under the terms of the Apache License, Version
2+
# 2.0, and the BSD License. See the LICENSE file in the root of this repository
3+
# for complete details.
4+
5+
__title__ = "packaging"
6+
__summary__ = "Core utilities for Python packages"
7+
__uri__ = "https://github.com/pypa/packaging"
8+
9+
__version__ = "25.0"
10+
11+
__author__ = "Donald Stufft and individual contributors"
12+
__email__ = "[email protected]"
13+
14+
__license__ = "BSD-2-Clause or Apache-2.0"
15+
__copyright__ = f"2014 {__author__}"

0 commit comments

Comments
 (0)