diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2016-02-27 09:20:52 -0500 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2016-02-27 09:20:52 -0500 |
| commit | 26f98e0a8cd1671520e3e8c64a4aa6400873ce9b (patch) | |
| tree | 7f43dd3d3f956bd057a3cdf15ed51349ceb2390f /pkg_resources/_vendor | |
| parent | 721536a8c21a0f6a0dcd0ca92b5e5a613fb42c5e (diff) | |
| download | python-setuptools-git-26f98e0a8cd1671520e3e8c64a4aa6400873ce9b.tar.gz | |
Bump vendored packaging to 16.5. Fixes #502.
Diffstat (limited to 'pkg_resources/_vendor')
| -rw-r--r-- | pkg_resources/_vendor/packaging/__about__.py | 2 | ||||
| -rw-r--r-- | pkg_resources/_vendor/packaging/requirements.py | 2 | ||||
| -rw-r--r-- | pkg_resources/_vendor/packaging/specifiers.py | 10 | ||||
| -rw-r--r-- | pkg_resources/_vendor/vendored.txt | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/pkg_resources/_vendor/packaging/__about__.py b/pkg_resources/_vendor/packaging/__about__.py index e4c32ea1..47e5a6f5 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.4" +__version__ = "16.5" __author__ = "Donald Stufft and individual contributors" __email__ = "donald@stufft.io" diff --git a/pkg_resources/_vendor/packaging/requirements.py b/pkg_resources/_vendor/packaging/requirements.py index 361f157b..0c8c4a38 100644 --- a/pkg_resources/_vendor/packaging/requirements.py +++ b/pkg_resources/_vendor/packaging/requirements.py @@ -49,7 +49,7 @@ VERSION_LEGACY = Regex(LegacySpecifier._regex_str, re.VERBOSE | re.IGNORECASE) VERSION_ONE = VERSION_PEP440 ^ VERSION_LEGACY VERSION_MANY = Combine(VERSION_ONE + ZeroOrMore(COMMA + VERSION_ONE), - joinString=",")("_raw_spec") + joinString=",", adjacent=False)("_raw_spec") _VERSION_SPEC = Optional(((LPAREN + VERSION_MANY + RPAREN) | VERSION_MANY)) _VERSION_SPEC.setParseAction(lambda s, l, t: t._raw_spec or '') diff --git a/pkg_resources/_vendor/packaging/specifiers.py b/pkg_resources/_vendor/packaging/specifiers.py index 5ee8f023..7f5a76cf 100644 --- a/pkg_resources/_vendor/packaging/specifiers.py +++ b/pkg_resources/_vendor/packaging/specifiers.py @@ -218,11 +218,11 @@ class LegacySpecifier(_IndividualSpecifier): (?P<operator>(==|!=|<=|>=|<|>)) \s* (?P<version> - [^;\s)]* # We just match everything, except for whitespace, - # a semi-colon for marker support, and closing paren - # since versions can be enclosed in them. Since this is - # a "legacy" specifier and the version string can be - # just about anything. + [^,;\s)]* # Since this is a "legacy" specifier, and the version + # string can be just about anything, we match everything + # except for whitespace, a semi-colon for marker support, + # a closing paren since versions can be enclosed in + # them, and a comma since it's a version separator. ) """ ) diff --git a/pkg_resources/_vendor/vendored.txt b/pkg_resources/_vendor/vendored.txt index 002ef955..aac1267c 100644 --- a/pkg_resources/_vendor/vendored.txt +++ b/pkg_resources/_vendor/vendored.txt @@ -1,3 +1,3 @@ -packaging==16.4 +packaging==16.5 pyparsing==2.0.6 six==1.10.0 |