Skip to content

Commit 740a218

Browse files
authored
Upgrade vendored packaging dependencies. (#2656)
With RedBaron replaced by libcst we now have the freedom to do this.
1 parent 1124b3c commit 740a218

Some content is hidden

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

49 files changed

+11492
-7707
lines changed

pex/vendor/__init__.py

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -235,13 +235,18 @@ def iter_vendor_specs(filter_requires_python=None):
235235
"packaging", "20.9", import_path="packaging_20_9", constraints=("pyparsing<3",)
236236
)
237237
if not python_major_minor or python_major_minor == (3, 6):
238-
# N.B.: The pyparsing constraint is needed because our import re-writer (RedBaron) chokes on
239-
# newer versions.
238+
# N.B.: Introduced to add support for musllinux wheels via:
239+
# https://github.com/pex-tool/pex/issues/1933
240+
# N.B.: The pyparsing constraint is needed for 3.6 support.
240241
yield VendorSpec.pinned(
241-
"packaging", "21.3", import_path="packaging_21_3", constraints=("pyparsing<3",)
242+
"packaging", "21.3", import_path="packaging_21_3", constraints=("pyparsing<3.0.8",)
242243
)
243244
if not python_major_minor or python_major_minor >= (3, 7):
244-
yield VendorSpec.pinned("packaging", "23.1", import_path="packaging_23_1")
245+
# Modern packaging for everyone else.
246+
# N.B.: We can't upgrade past 24.0 without re-working marker evaluation for
247+
# AbbreviatedPlatform since modern versions of packaging unconditionally assume the
248+
# `python_full_version` marker will always be populated.
249+
yield VendorSpec.pinned("packaging", "24.0", import_path="packaging_24_0")
245250

246251
# We use toml to read pyproject.toml when building sdists from local source projects.
247252
# The toml project provides compatibility back to Python 2.7, but is frozen in time in 2020
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"fingerprint": "cab252202e7be970bad6b45497b8967cfb9a2759e6071eb30119be7b9fff62e1", "record_relpath": "packaging-21.3.dist-info/RECORD", "root_is_purelib": true, "stash_dir": ".prefix"}
1+
{"fingerprint": "84b4c176f8bac2d9fc042dd1618394580af666252a61e1d88544b4f6bbf66523", "record_relpath": "packaging-21.3.dist-info/RECORD", "root_is_purelib": true, "stash_dir": ".prefix"}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
packaging==21.3
2-
pyparsing==2.4.7
2+
pyparsing==3.0.7

pex/vendor/_vendored/packaging_21_3/pyparsing-2.4.7.dist-info/METADATA renamed to pex/vendor/_vendored/packaging_21_3/pyparsing-3.0.7.dist-info/METADATA

Lines changed: 27 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
Metadata-Version: 2.1
22
Name: pyparsing
3-
Version: 2.4.7
3+
Version: 3.0.7
44
Summary: Python parsing module
55
Home-page: https://github.com/pyparsing/pyparsing/
66
Author: Paul McGuire
7-
Author-email: ptmcg@users.sourceforge.net
7+
Author-email: ptmcg[email protected]
88
License: MIT License
99
Download-URL: https://pypi.org/project/pyparsing/
1010
Platform: UNKNOWN
@@ -14,22 +14,25 @@ Classifier: Intended Audience :: Information Technology
1414
Classifier: License :: OSI Approved :: MIT License
1515
Classifier: Operating System :: OS Independent
1616
Classifier: Programming Language :: Python
17-
Classifier: Programming Language :: Python :: 2
18-
Classifier: Programming Language :: Python :: 2.6
19-
Classifier: Programming Language :: Python :: 2.7
2017
Classifier: Programming Language :: Python :: 3
21-
Classifier: Programming Language :: Python :: 3.3
22-
Classifier: Programming Language :: Python :: 3.4
23-
Classifier: Programming Language :: Python :: 3.5
2418
Classifier: Programming Language :: Python :: 3.6
2519
Classifier: Programming Language :: Python :: 3.7
2620
Classifier: Programming Language :: Python :: 3.8
27-
Requires-Python: >=2.6, !=3.0.*, !=3.1.*, !=3.2.*
21+
Classifier: Programming Language :: Python :: 3.9
22+
Classifier: Programming Language :: Python :: 3.10
23+
Classifier: Programming Language :: Python :: 3 :: Only
24+
Classifier: Programming Language :: Python :: Implementation :: CPython
25+
Classifier: Programming Language :: Python :: Implementation :: PyPy
26+
Requires-Python: >=3.6
27+
Description-Content-Type: text/x-rst
28+
Provides-Extra: diagrams
29+
Requires-Dist: jinja2 ; extra == 'diagrams'
30+
Requires-Dist: railroad-diagrams ; extra == 'diagrams'
2831

2932
PyParsing -- A Python Parsing Module
3033
====================================
3134

32-
|Build Status|
35+
|Build Status| |Coverage|
3336

3437
Introduction
3538
============
@@ -42,8 +45,9 @@ Python code.
4245

4346
*[Since first writing this description of pyparsing in late 2003, this
4447
technique for developing parsers has become more widespread, under the
45-
name Parsing Expression Grammars - PEGs. See more information on PEGs at*
46-
https://en.wikipedia.org/wiki/Parsing_expression_grammar *.]*
48+
name Parsing Expression Grammars - PEGs. See more information on PEGs*
49+
`here <https://en.wikipedia.org/wiki/Parsing_expression_grammar>`__
50+
*.]*
4751

4852
Here is a program to parse ``"Hello, World!"`` (or any greeting of the form
4953
``"salutation, addressee!"``):
@@ -63,7 +67,8 @@ The Python representation of the grammar is quite readable, owing to the
6367
self-explanatory class names, and the use of '+', '|' and '^' operator
6468
definitions.
6569

66-
The parsed results returned from ``parseString()`` can be accessed as a
70+
The parsed results returned from ``parseString()`` is a collection of type
71+
``ParseResults``, which can be accessed as a
6772
nested list, a dictionary, or an object with named attributes.
6873

6974
The pyparsing module handles some of the problems that are typically
@@ -81,24 +86,24 @@ Documentation
8186
=============
8287

8388
There are many examples in the online docstrings of the classes
84-
and methods in pyparsing. You can find them compiled into online docs
85-
at https://pyparsing-docs.readthedocs.io/en/latest/. Additional
89+
and methods in pyparsing. You can find them compiled into `online docs <https://pyparsing-docs.readthedocs.io/en/latest/>`__. Additional
8690
documentation resources and project info are listed in the online
87-
GitHub wiki, at https://github.com/pyparsing/pyparsing/wiki. An
88-
entire directory of examples is at
89-
https://github.com/pyparsing/pyparsing/tree/master/examples.
91+
`GitHub wiki <https://github.com/pyparsing/pyparsing/wiki>`__. An
92+
entire directory of examples can be found `here <https://github.com/pyparsing/pyparsing/tree/master/examples>`__.
9093

9194
License
9295
=======
9396

94-
MIT License. See header of pyparsing.py
97+
MIT License. See header of the `pyparsing.py <https://github.com/pyparsing/pyparsing/blob/master/pyparsing/__init__.py#L1-L23>`__ file.
9598

9699
History
97100
=======
98101

99-
See CHANGES file.
102+
See `CHANGES <https://github.com/pyparsing/pyparsing/blob/master/CHANGES>`__ file.
100103

101-
.. |Build Status| image:: https://travis-ci.org/pyparsing/pyparsing.svg?branch=master
102-
:target: https://travis-ci.org/pyparsing/pyparsing
104+
.. |Build Status| image:: https://github.com/pyparsing/pyparsing/actions/workflows/ci.yml/badge.svg
105+
:target: https://github.com/pyparsing/pyparsing/actions/workflows/ci.yml
106+
.. |Coverage| image:: https://codecov.io/gh/pyparsing/pyparsing/branch/master/graph/badge.svg
107+
:target: https://codecov.io/gh/pyparsing/pyparsing
103108

104109

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
Wheel-Version: 1.0
2-
Generator: bdist_wheel (0.34.2)
2+
Generator: bdist_wheel (0.36.2)
33
Root-Is-Purelib: true
4-
Tag: py2-none-any
54
Tag: py3-none-any
65

0 commit comments

Comments
 (0)