From a774fdb8cf140c472129e8d8c6421de368fe3bbe Mon Sep 17 00:00:00 2001 From: John Sirois Date: Mon, 23 Jan 2017 14:29:43 -0700 Subject: [PATCH 1/3] Prepare the 1.2.0 release. --- CHANGES.rst | 14 ++++++++++++++ pex/version.py | 11 +++-------- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 36eb855d5..4a3447db3 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,6 +1,20 @@ Release Notes ============= +1.2.0 +----- + +This release changes pex requirement resolution behavior. Only stable requirements are resolved by +default now. The previous behavior that included pre-releases can be retained by passing `--pre` on +the pex command line or passing `allow_prereleases=True` via the API. + +* Upgrade dependencies to modern version ranges. (#351) + `#351 `_ + +* Add support for controlling prerelease resolution. (#350) + `#350 `_ + `Fixes #28 `_ + 1.1.20 ------ diff --git a/pex/version.py b/pex/version.py index 55d83c044..d7a008f84 100644 --- a/pex/version.py +++ b/pex/version.py @@ -1,13 +1,8 @@ # Copyright 2015 Pants project contributors (see CONTRIBUTORS.md). # Licensed under the Apache License, Version 2.0 (see LICENSE). -__version__ = '1.1.20' - -PACKAGING_REQUIREMENT = 'packaging>=16.8' - -# NB: We exclude 7.0b1 since it will use `packaging` if present and we install a modern version of -# packaging that may not be compatible. Versions before 7.0b1 don't use `packaging` and versions -# after use a vendored `packaging`. -SETUPTOOLS_REQUIREMENT = 'setuptools>=5.7,!=7.0b1<31.0' +__version__ = '1.2.0' +PACKAGING_REQUIREMENT = 'packaging>=16.8,<17.0' +SETUPTOOLS_REQUIREMENT = 'setuptools>=30.0,<35.0' WHEEL_REQUIREMENT = 'wheel>=0.26.0,<0.30.0' From bed8d58b23bad6cf139fa71783a46b1b7ee6eb62 Mon Sep 17 00:00:00 2001 From: John Sirois Date: Mon, 23 Jan 2017 14:31:19 -0700 Subject: [PATCH 2/3] Correct CHANGES.rst I guess the wrong PR #. --- CHANGES.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 4a3447db3..879433182 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -8,8 +8,8 @@ This release changes pex requirement resolution behavior. Only stable requiremen default now. The previous behavior that included pre-releases can be retained by passing `--pre` on the pex command line or passing `allow_prereleases=True` via the API. -* Upgrade dependencies to modern version ranges. (#351) - `#351 `_ +* Upgrade dependencies to modern version ranges. (#352) + `#352 `_ * Add support for controlling prerelease resolution. (#350) `#350 `_ From 5936a4578c2d159cd4a1c3e2ed1b7f221e6e4843 Mon Sep 17 00:00:00 2001 From: John Sirois Date: Mon, 23 Jan 2017 14:54:12 -0700 Subject: [PATCH 3/3] Re-work setuptools requirement. Exclude >=34 for now since it potentially changes install behavior of pex when used as a lib and relax the lower bound to be modern, but not overly so. --- pex/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pex/version.py b/pex/version.py index d7a008f84..fdf9afccc 100644 --- a/pex/version.py +++ b/pex/version.py @@ -4,5 +4,5 @@ __version__ = '1.2.0' PACKAGING_REQUIREMENT = 'packaging>=16.8,<17.0' -SETUPTOOLS_REQUIREMENT = 'setuptools>=30.0,<35.0' +SETUPTOOLS_REQUIREMENT = 'setuptools>=20.0,<34.0' WHEEL_REQUIREMENT = 'wheel>=0.26.0,<0.30.0'