Prepare the 1.5.0 release. (pex-tool#590)

Work towards pex-tool#585
jsirois · Oct 9, 2018 · a4eac2f · a4eac2f
1 parent 584b6e3
commit a4eac2f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,6 +1,16 @@
 Release Notes
 =============
 
+1.5.0
+-----
+
+This release fixes pexes such that they fully support environment markers, the canonical use case
+being a python 2/3 pex that needs to conditionally load one or more python 2 backport libs when
+running under a python 2 interpreter only.
+
+* Revert "Revert "Support environment markers during pex activation. (#582)""
+  `PR #582 <https://github.com/pantsbuild/pex/pull/582>`_
+
 1.4.9
 -----
 

diff --git a/pex/resolver.py b/pex/resolver.py
@@ -467,7 +467,7 @@ def resolve(requirements,
     classes.
 
   .. versionchanged:: 1.5.0
-    The ``pkg_blacklist``  has been removed and the return type change to a list of
+    The ``pkg_blacklist``  has been removed and the return type changed to a list of
     :class:`ResolvedDistribution`.
   """
 

diff --git a/pex/version.py b/pex/version.py
@@ -1,7 +1,7 @@
 # Copyright 2015 Pants project contributors (see CONTRIBUTORS.md).
 # Licensed under the Apache License, Version 2.0 (see LICENSE).
 
-__version__ = '1.4.9'
+__version__ = '1.5.0'
 
 # Versions 34.0.0 through 35.0.2 (last pre-36.0.0) de-vendored dependencies which causes problems
 # for pex code so we exclude that range.