diff options
| author | Donald Stufft <donald@stufft.io> | 2014-12-15 15:33:01 -0500 |
|---|---|---|
| committer | Donald Stufft <donald@stufft.io> | 2014-12-15 15:33:01 -0500 |
| commit | f8b6c86a3121b2c2b68b2edc97b545d4567601d6 (patch) | |
| tree | 7fd4b0b5af15d0276e729bb6c5ffbb5471fd4962 | |
| parent | 3c81a300356155761880d81a8445bd39581d6c85 (diff) | |
| download | python-setuptools-git-f8b6c86a3121b2c2b68b2edc97b545d4567601d6.tar.gz | |
Upgrade packaging to 14.4
This fixes an error where there is a different result for if 2.0.5
is contained within >2.0dev and >2.0.dev even though normalization
rules should have made them equal.
| -rw-r--r-- | setuptools/_vendor/packaging/__about__.py | 2 | ||||
| -rw-r--r-- | setuptools/_vendor/packaging/specifiers.py | 10 | ||||
| -rw-r--r-- | setuptools/_vendor/vendored.txt | 2 |
3 files changed, 8 insertions, 6 deletions
diff --git a/setuptools/_vendor/packaging/__about__.py b/setuptools/_vendor/packaging/__about__.py index 481589e7..d3e3dacf 100644 --- a/setuptools/_vendor/packaging/__about__.py +++ b/setuptools/_vendor/packaging/__about__.py @@ -22,7 +22,7 @@ __title__ = "packaging" __summary__ = "Core utilities for Python packages" __uri__ = "https://github.com/pypa/packaging" -__version__ = "14.3" +__version__ = "14.4" __author__ = "Donald Stufft" __email__ = "donald@stufft.io" diff --git a/setuptools/_vendor/packaging/specifiers.py b/setuptools/_vendor/packaging/specifiers.py index bea4a398..80225786 100644 --- a/setuptools/_vendor/packaging/specifiers.py +++ b/setuptools/_vendor/packaging/specifiers.py @@ -461,16 +461,18 @@ class Specifier(_IndividualSpecifier): # Less than are defined as exclusive operators, this implies that # pre-releases do not match for the same series as the spec. This is # implemented by making <V imply !=V.*. - return (prospective < Version(spec) - and self._get_operator("!=")(prospective, spec + ".*")) + spec = Version(spec) + return (prospective < spec + and self._get_operator("!=")(prospective, str(spec) + ".*")) @_require_version_compare def _compare_greater_than(self, prospective, spec): # Greater than are defined as exclusive operators, this implies that # pre-releases do not match for the same series as the spec. This is # implemented by making >V imply !=V.*. - return (prospective > Version(spec) - and self._get_operator("!=")(prospective, spec + ".*")) + spec = Version(spec) + return (prospective > spec + and self._get_operator("!=")(prospective, str(spec) + ".*")) def _compare_arbitrary(self, prospective, spec): return str(prospective).lower() == str(spec).lower() diff --git a/setuptools/_vendor/vendored.txt b/setuptools/_vendor/vendored.txt index b86bba00..576aa8db 100644 --- a/setuptools/_vendor/vendored.txt +++ b/setuptools/_vendor/vendored.txt @@ -1 +1 @@ -packaging==14.3 +packaging==14.4 |