aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGES.txt11
-rw-r--r--ez_setup.py10
2 files changed, 14 insertions, 7 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index f77ab24b..4e058be8 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -3,6 +3,16 @@ CHANGES
=======
----
+12.2
+----
+
+* Issue #345: Unload all modules under pkg_resources during
+ ``ez_setup.use_setuptools()``.
+* Issue #336: Removed deprecation from ``ez_setup.use_setuptools``,
+ as it is clearly still used by buildout's bootstrap. ``ez_setup``
+ remains deprecated for use by individual packages.
+
+----
12.1
----
@@ -14,6 +24,7 @@ CHANGES
------
* Issue #339: Correct Attribute reference in ``cant_write_to_target``.
+* Issue #336: Deprecated ``ez_setup.use_setuptools``.
------
12.0.4
diff --git a/ez_setup.py b/ez_setup.py
index 26e42998..4bd83580 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -134,15 +134,11 @@ def use_setuptools(
version=DEFAULT_VERSION, download_base=DEFAULT_URL,
to_dir=os.curdir, download_delay=15):
"""
- *deprecated* Download, install, and import Setuptools.
+ Ensure that a setuptools version is installed.
- Return None.
+ Return None. Raise SystemExit if the requested version
+ or later cannot be installed.
"""
- warnings.warn(
- "`use_setuptools` is deprecated. To enforce a specific "
- "version of setuptools, use `pkg_resources.require`.",
- DeprecationWarning,
- )
to_dir = os.path.abspath(to_dir)
# prior to importing, capture the module state for