diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2016-03-30 09:38:36 -0400 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2016-03-30 09:38:36 -0400 |
| commit | 3f19464881bb6c328db2273aaddc2e17cf4acc73 (patch) | |
| tree | 7266bbb562da114cb369ec79d3c7e39e99ed6008 /pkg_resources | |
| parent | fd4f10290ea64f72a139fe23b811b40bc1f48f17 (diff) | |
| parent | 7fc3b347bce66eaed9bae410338f6a9f3108a970 (diff) | |
| download | python-setuptools-git-3f19464881bb6c328db2273aaddc2e17cf4acc73.tar.gz | |
Merge pull request #522 from s-t-e-v-e-n-k/update-packaging
Update vendored packaging to 16.6
Diffstat (limited to 'pkg_resources')
| -rw-r--r-- | pkg_resources/_vendor/packaging/__about__.py | 2 | ||||
| -rw-r--r-- | pkg_resources/_vendor/packaging/markers.py | 7 | ||||
| -rw-r--r-- | pkg_resources/_vendor/vendored.txt | 2 |
3 files changed, 8 insertions, 3 deletions
diff --git a/pkg_resources/_vendor/packaging/__about__.py b/pkg_resources/_vendor/packaging/__about__.py index 47e5a6f5..baa90755 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.5" +__version__ = "16.6" __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 9e906015..bac852df 100644 --- a/pkg_resources/_vendor/packaging/markers.py +++ b/pkg_resources/_vendor/packaging/markers.py @@ -73,9 +73,14 @@ VARIABLE = ( L("python_version") | L("sys_platform") | L("os_name") | + L("os.name") | # PEP-345 + L("sys.platform") | # PEP-345 + L("platform.version") | # PEP-345 + L("platform.machine") | # PEP-345 + L("platform.python_implementation") | # PEP-345 L("extra") ) -VARIABLE.setParseAction(lambda s, l, t: Variable(t[0])) +VARIABLE.setParseAction(lambda s, l, t: Variable(t[0].replace('.', '_'))) VERSION_CMP = ( L("===") | diff --git a/pkg_resources/_vendor/vendored.txt b/pkg_resources/_vendor/vendored.txt index aac1267c..1d03759f 100644 --- a/pkg_resources/_vendor/vendored.txt +++ b/pkg_resources/_vendor/vendored.txt @@ -1,3 +1,3 @@ -packaging==16.5 +packaging==16.6 pyparsing==2.0.6 six==1.10.0 |