diff options
| author | Steve Kowalik <steven@wedontsleep.org> | 2016-02-23 14:25:06 +1100 |
|---|---|---|
| committer | Steve Kowalik <steven@wedontsleep.org> | 2016-02-23 14:25:06 +1100 |
| commit | b7292405eeb61fac73fb5507c30e169a47166723 (patch) | |
| tree | 6df712ef4a64f235f8a80e472856d2ac74c65076 | |
| parent | 2ac4408ba8b0d6203b9556fe819f393040230aaf (diff) | |
| download | python-setuptools-git-b7292405eeb61fac73fb5507c30e169a47166723.tar.gz | |
Update to packaging 16.4. Fixes #499.
| -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 | 8 | ||||
| -rw-r--r-- | pkg_resources/_vendor/vendored.txt | 2 |
4 files changed, 8 insertions, 6 deletions
diff --git a/pkg_resources/_vendor/packaging/__about__.py b/pkg_resources/_vendor/packaging/__about__.py index 313613b9..e4c32ea1 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.1" +__version__ = "16.4" __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 16032ac6..361f157b 100644 --- a/pkg_resources/_vendor/packaging/requirements.py +++ b/pkg_resources/_vendor/packaging/requirements.py @@ -47,7 +47,7 @@ EXTRAS = (LBRACKET + Optional(EXTRAS_LIST) + RBRACKET)("extras") VERSION_PEP440 = Regex(Specifier._regex_str, re.VERBOSE | re.IGNORECASE) VERSION_LEGACY = Regex(LegacySpecifier._regex_str, re.VERBOSE | re.IGNORECASE) -VERSION_ONE = VERSION_PEP440 | VERSION_LEGACY +VERSION_ONE = VERSION_PEP440 ^ VERSION_LEGACY VERSION_MANY = Combine(VERSION_ONE + ZeroOrMore(COMMA + VERSION_ONE), joinString=",")("_raw_spec") _VERSION_SPEC = Optional(((LPAREN + VERSION_MANY + RPAREN) | VERSION_MANY)) diff --git a/pkg_resources/_vendor/packaging/specifiers.py b/pkg_resources/_vendor/packaging/specifiers.py index 31845c61..5ee8f023 100644 --- a/pkg_resources/_vendor/packaging/specifiers.py +++ b/pkg_resources/_vendor/packaging/specifiers.py @@ -218,9 +218,11 @@ class LegacySpecifier(_IndividualSpecifier): (?P<operator>(==|!=|<=|>=|<|>)) \s* (?P<version> - [^\s]* # We just match everything, except for whitespace since this - # is a "legacy" specifier and the version string can be just - # about anything. + [^;\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. ) """ ) diff --git a/pkg_resources/_vendor/vendored.txt b/pkg_resources/_vendor/vendored.txt index fbaaa5f1..002ef955 100644 --- a/pkg_resources/_vendor/vendored.txt +++ b/pkg_resources/_vendor/vendored.txt @@ -1,3 +1,3 @@ -packaging==16.1 +packaging==16.4 pyparsing==2.0.6 six==1.10.0 |