From e9109e21982cfa53de978b5f58a8de2961d3b9e2 Mon Sep 17 00:00:00 2001
From: John Sirois <john.sirois@gmail.com>
Date: Wed, 25 Mar 2020 13:45:46 -0700
Subject: [PATCH] Prepare the 2.1.7 release. (#934)

Fixes #909
---
 CHANGES.rst    | 40 +++++++++++++++++++++++++++++++++++++++-
 pex/version.py |  2 +-
 2 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index a9984d053..199e0d5db 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,7 +1,45 @@
 Release Notes
 =============
 
-2.1.5
+2.1.7
+-----
+
+This release brings more robust control of the Pex cache (PEX_ROOT).
+
+The `--cache-dir` setting is deprecated in favor of build time control of the cache location with
+`--pex-root` and new support for control of the cache's runtime location with `--runtime-pex-root`
+is added. As in the past, the `PEX_ROOT` environment variable can still be used to control the
+cache's runtime location.
+
+Unlike in the past, the [Pex PEX](https://github.com/pantsbuild/pex/releases/download/v2.1.7/pex)
+we release can now also be controlled via the `PEX_ROOT` environment variable. Consult the CLI help
+for `--no-strip-pex-env` to find out more.
+
+* Sanitize PEX_ROOT handling. (#929)
+  `PR #929 <https://github.com/pantsbuild/pex/pull/929>`_
+
+* Fix `PEX_*` env stripping and allow turning off. (#932)
+  `PR #932 <https://github.com/pantsbuild/pex/pull/932>`_
+
+* Remove second urllib import from compatibility (#931)
+  `PR #931 <https://github.com/pantsbuild/pex/pull/931>`_
+
+* Adding `--runtime-pex-root` option. (#780)
+  `PR #780 <https://github.com/pantsbuild/pex/pull/780>`_
+
+* Improve interpreter not found error messages. (#928)
+  `PR #928 <https://github.com/pantsbuild/pex/pull/928>`_
+
+* Add detail in interpreter selection error message. (#927)
+  `PR #927 <https://github.com/pantsbuild/pex/pull/927>`_
+
+* Respect `Requires-Python` in `PEXEnvironment`. (#923)
+  `PR #923 <https://github.com/pantsbuild/pex/pull/923>`_
+
+* Pin our tox version in CI for stability. (#924)
+  `PR #924 <https://github.com/pantsbuild/pex/pull/924>`_
+
+2.1.6
 -----
 
 * Don't delete the root __init__.py when devendoring. (#915)
diff --git a/pex/version.py b/pex/version.py
index 87300b586..930579c1a 100644
--- a/pex/version.py
+++ b/pex/version.py
@@ -1,4 +1,4 @@
 # Copyright 2015 Pants project contributors (see CONTRIBUTORS.md).
 # Licensed under the Apache License, Version 2.0 (see LICENSE).
 
-__version__ = '2.1.6'
+__version__ = '2.1.7'