Commit 26f98e0a authored by Jason R. Coombs's avatar Jason R. Coombs

Bump vendored packaging to 16.5. Fixes #502.

parent 721536a8
...@@ -12,7 +12,7 @@ __title__ = "packaging" ...@@ -12,7 +12,7 @@ __title__ = "packaging"
__summary__ = "Core utilities for Python packages" __summary__ = "Core utilities for Python packages"
__uri__ = "https://github.com/pypa/packaging" __uri__ = "https://github.com/pypa/packaging"
__version__ = "16.4" __version__ = "16.5"
__author__ = "Donald Stufft and individual contributors" __author__ = "Donald Stufft and individual contributors"
__email__ = "donald@stufft.io" __email__ = "donald@stufft.io"
......
...@@ -49,7 +49,7 @@ VERSION_LEGACY = Regex(LegacySpecifier._regex_str, re.VERBOSE | re.IGNORECASE) ...@@ -49,7 +49,7 @@ 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), 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 = Optional(((LPAREN + VERSION_MANY + RPAREN) | VERSION_MANY))
_VERSION_SPEC.setParseAction(lambda s, l, t: t._raw_spec or '') _VERSION_SPEC.setParseAction(lambda s, l, t: t._raw_spec or '')
......
...@@ -218,11 +218,11 @@ class LegacySpecifier(_IndividualSpecifier): ...@@ -218,11 +218,11 @@ class LegacySpecifier(_IndividualSpecifier):
(?P<operator>(==|!=|<=|>=|<|>)) (?P<operator>(==|!=|<=|>=|<|>))
\s* \s*
(?P<version> (?P<version>
[^;\s)]* # We just match everything, except for whitespace, [^,;\s)]* # Since this is a "legacy" specifier, and the version
# a semi-colon for marker support, and closing paren # string can be just about anything, we match everything
# since versions can be enclosed in them. Since this is # except for whitespace, a semi-colon for marker support,
# a "legacy" specifier and the version string can be # a closing paren since versions can be enclosed in
# just about anything. # them, and a comma since it's a version separator.
) )
""" """
) )
......
packaging==16.4 packaging==16.5
pyparsing==2.0.6 pyparsing==2.0.6
six==1.10.0 six==1.10.0
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment