release 20.0.520.0.5

Signed-off-by: Bernat Gabor <bgabor8@bloomberg.net>

9 files changed, 20 insertions, 10 deletions

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 0dd2b22..9957225 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,6 +5,25 @@ Release History
 
 .. towncrier release notes start
 
+v20.0.5 (2020-02-21)
+--------------------
+
+Features - 20.0.5
+~~~~~~~~~~~~~~~~~
+- Also create ``pythonX.X`` executables when creating pypy virtualenvs - by :user:`asottile` (`#1612 <https://github.com/pypa/virtualenv/issues/1612>`_)
+- Fail with better error message if trying to install source with unsupported ``setuptools``, allow ``setuptools-scm >= 2``
+  and move to legacy ``setuptools-scm`` format to support better older platforms (``CentOS 7`` and such) - by :user:`gaborbernat`. (`#1621 <https://github.com/pypa/virtualenv/issues/1621>`_)
+- Report of the created virtual environment is now split across four short lines rather than one long - by :user:`gaborbernat` (`#1641 <https://github.com/pypa/virtualenv/issues/1641>`_)
+
+Bugfixes - 20.0.5
+~~~~~~~~~~~~~~~~~
+- Add macOs Python 2 Framework support (now we test it with the CI via brew) - by :user:`gaborbernat` (`#1561 <https://github.com/pypa/virtualenv/issues/1561>`_)
+- Fix losing of libpypy-c.so when the pypy executable is a symlink - by :user:`asottile` (`#1614 <https://github.com/pypa/virtualenv/issues/1614>`_)
+- Discover python interpreter in a case insensitive manner - by :user:`PrajwalM2212` (`#1624 <https://github.com/pypa/virtualenv/issues/1624>`_)
+- Fix cross interpreter support when the host python sets ``sys.base_executable`` based on ``__PYVENV_LAUNCHER__`` -
+  by :user:`cjolowicz` (`#1643 <https://github.com/pypa/virtualenv/issues/1643>`_)
+
+
 v20.0.4 (2020-02-14)
 --------------------
 
diff --git a/docs/changelog/1561.bugfix.rst b/docs/changelog/1561.bugfix.rst
deleted file mode 100644
index c3c6185..0000000
--- a/docs/changelog/1561.bugfix.rst
+++ /dev/null
@@ -1 +0,0 @@
-Add macOs Python 2 Framework support (now we test it with the CI via brew) - by :user:`gaborbernat`
diff --git a/docs/changelog/1612.feature.rst b/docs/changelog/1612.feature.rst
deleted file mode 100644
index 26e9e2b..0000000
--- a/docs/changelog/1612.feature.rst
+++ /dev/null
@@ -1 +0,0 @@
-Also create ``pythonX.X`` executables when creating pypy virtualenvs - by :user:`asottile`
diff --git a/docs/changelog/1614.bugfix.rst b/docs/changelog/1614.bugfix.rst
deleted file mode 100644
index 40d18de..0000000
--- a/docs/changelog/1614.bugfix.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fix losing of libpypy-c.so when the pypy executable is a symlink - by :user:`asottile`
diff --git a/docs/changelog/1621.feature.rst b/docs/changelog/1621.feature.rst
deleted file mode 100644
index 7ba6411..0000000
--- a/docs/changelog/1621.feature.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Fail with better error message if trying to install source with unsupported ``setuptools``, allow ``setuptools-scm >= 2``
-and move to legacy ``setuptools-scm`` format to support better older platforms (``CentOS 7`` and such) - by :user:`gaborbernat`.
diff --git a/docs/changelog/1624.bugfix.rst b/docs/changelog/1624.bugfix.rst
deleted file mode 100644
index d1f4876..0000000
--- a/docs/changelog/1624.bugfix.rst
+++ /dev/null
@@ -1 +0,0 @@
-Discover python interpreter in a case insensitive manner - by :user:`PrajwalM2212`
diff --git a/docs/changelog/1641.feature.rst b/docs/changelog/1641.feature.rst
deleted file mode 100644
index f29c510..0000000
--- a/docs/changelog/1641.feature.rst
+++ /dev/null
@@ -1 +0,0 @@
-Report of the created virtual environment is now split across four short lines rather than one long - by :user:`gaborbernat`
diff --git a/docs/changelog/1643.bugfix.rst b/docs/changelog/1643.bugfix.rst
deleted file mode 100644
index 8fd8654..0000000
--- a/docs/changelog/1643.bugfix.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Fix cross interpreter support when the host python sets ``sys.base_executable`` based on ``__PYVENV_LAUNCHER__`` -
-by :user:`cjolowicz`
diff --git a/src/virtualenv/create/via_global_ref/builtin/cpython/cpython2.py b/src/virtualenv/create/via_global_ref/builtin/cpython/cpython2.py
index 887263e..a8c07d3 100644
--- a/src/virtualenv/create/via_global_ref/builtin/cpython/cpython2.py
+++ b/src/virtualenv/create/via_global_ref/builtin/cpython/cpython2.py
@@ -51,7 +51,7 @@ class CPython2(CPython, Python2):
 
 
 def is_mac_os_framework(interpreter):
-    framework = bool(interpreter.sysconfig_vars["PYTHONFRAMEWORK"])
+    framework = bool(interpreter.sysconfig_vars.get("PYTHONFRAMEWORK"))
     return framework and interpreter.platform == "darwin"