diff options
| author | Geoffrey Sneddon <me@gsnedders.com> | 2016-04-23 23:44:24 +0100 |
|---|---|---|
| committer | Geoffrey Sneddon <me@gsnedders.com> | 2016-04-23 23:44:24 +0100 |
| commit | fc2afb512cd077a64b008470e213e624495d6efe (patch) | |
| tree | f4f736208fbd3a411fd396a8dee9e81fd2193130 /pkg_resources | |
| parent | 5cc432e39c4e8689d117ccc9001d03e47ac5a902 (diff) | |
| download | python-setuptools-git-fc2afb512cd077a64b008470e213e624495d6efe.tar.gz | |
Update packaging to 16.7
This adds support for the deprecated python_implementation marker
which was an undocumented setuptools marker prior to 20.2 in
addition to the newer markers.
Diffstat (limited to 'pkg_resources')
| -rw-r--r-- | pkg_resources/_vendor/packaging/__about__.py | 2 | ||||
| -rw-r--r-- | pkg_resources/_vendor/packaging/markers.py | 11 | ||||
| -rw-r--r-- | pkg_resources/_vendor/vendored.txt | 2 |
3 files changed, 12 insertions, 3 deletions
diff --git a/pkg_resources/_vendor/packaging/__about__.py b/pkg_resources/_vendor/packaging/__about__.py index baa90755..c21a758b 100644 --- a/pkg_resources/_vendor/packaging/__about__.py +++ b/pkg_resources/_vendor/packaging/__about__.py @@ -12,7 +12,7 @@ __title__ = "packaging" __summary__ = "Core utilities for Python packages" __uri__ = "https://github.com/pypa/packaging" -__version__ = "16.6" +__version__ = "16.7" __author__ = "Donald Stufft and individual contributors" __email__ = "donald@stufft.io" diff --git a/pkg_resources/_vendor/packaging/markers.py b/pkg_resources/_vendor/packaging/markers.py index bac852df..c5d29cd9 100644 --- a/pkg_resources/_vendor/packaging/markers.py +++ b/pkg_resources/_vendor/packaging/markers.py @@ -78,9 +78,18 @@ VARIABLE = ( L("platform.version") | # PEP-345 L("platform.machine") | # PEP-345 L("platform.python_implementation") | # PEP-345 + L("python_implementation") | # undocumented setuptools legacy L("extra") ) -VARIABLE.setParseAction(lambda s, l, t: Variable(t[0].replace('.', '_'))) +ALIASES = { + 'os.name': 'os_name', + 'sys.platform': 'sys_platform', + 'platform.version': 'platform_version', + 'platform.machine': 'platform_machine', + 'platform.python_implementation': 'platform_python_implementation', + 'python_implementation': 'platform_python_implementation' +} +VARIABLE.setParseAction(lambda s, l, t: Variable(ALIASES.get(t[0], t[0]))) VERSION_CMP = ( L("===") | diff --git a/pkg_resources/_vendor/vendored.txt b/pkg_resources/_vendor/vendored.txt index 1d03759f..46532c0a 100644 --- a/pkg_resources/_vendor/vendored.txt +++ b/pkg_resources/_vendor/vendored.txt @@ -1,3 +1,3 @@ -packaging==16.6 +packaging==16.7 pyparsing==2.0.6 six==1.10.0 |