Merge pull request #170 from jsirois/jsirois/issues/165

Release 1.1.0
pex-tool · Oct 9, 2015 · 000a8e5 · 000a8e5
2 parents e397dd6 + 5c5e3e2
commit 000a8e5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -2,9 +2,16 @@
 CHANGES
 =======
 
-----------
-1.1.0.dev0
-----------
+-----
+1.1.0
+-----
+
+* Add support for ``.pexrc`` files for influencing the pex environment. See the notes `here
+  <https://github.com/pantsbuild/pex/blob/master/docs/buildingpex.rst#tailoring-pex-execution-at-build-time>`_.
+  `#128 <https://github.com/pantsbuild/pex/pull/128>`_.
+
+* Bug fix: PEX_PROFILE_FILENAME and PEX_PROFILE_SORT were not respected.
+  `#154 <https://github.com/pantsbuild/pex/issues/154>`_.
 
 * Adds the ``bdist_pex`` command to setuptools.
   `#99 <https://github.com/pantsbuild/pex/issues/99>`_.

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.1.0.dev0'
+__version__ = '1.1.0'
 
 SETUPTOOLS_REQUIREMENT = 'setuptools>=2.2,<16'
 WHEEL_REQUIREMENT = 'wheel>=0.24.0,<0.25.0'