summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.bumpversion.cfg2
-rw-r--r--CHANGES.rst35
-rw-r--r--changelog.d/3347.change.rst3
-rw-r--r--changelog.d/3368.doc.rst1
-rw-r--r--changelog.d/3371.doc.rst3
-rw-r--r--changelog.d/3372.doc.rst3
-rw-r--r--changelog.d/3373.doc.rst2
-rw-r--r--changelog.d/3374.doc.rst5
-rw-r--r--changelog.d/3378.doc.rst1
-rw-r--r--changelog.d/3383.change.rst1
-rw-r--r--changelog.d/3385.misc.rst2
-rw-r--r--setup.cfg2
12 files changed, 37 insertions, 23 deletions
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 43f85948..292f8c83 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
[bumpversion]
-current_version = 62.4.0
+current_version = 62.5.0
commit = True
tag = True
diff --git a/CHANGES.rst b/CHANGES.rst
index 61e79659..c192f169 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,38 @@
+v62.5.0
+-------
+
+
+Changes
+^^^^^^^
+* #3347: Changed warnings and documentation notes about *experimental* aspect of ``pyproject.toml`` configuration:
+ now ``[pyproject]`` is a fully supported configuration interface, but the ``[tool.setuptools]`` table
+ and sub-tables are still considered to be in **beta** stage.
+* #3383: In _distutils_hack, suppress/undo the use of local distutils when select tests are imported in CPython.
+
+Documentation changes
+^^^^^^^^^^^^^^^^^^^^^
+* #3368: Added documentation page about extension modules -- by :user:`mkoeppe`
+* #3371: Moved documentation from ``/userguide/commands`` to ``/depracted/commands``.
+ This change was motived by the fact that running ``python setup.py`` directly is
+ considered a deprecated practice.
+* #3372: Consolidated sections about ``sdist`` contents and ``MANIFEST.in`` into a single page.
+
+ Added a simple ``MANIFEST.in`` example.
+* #3373: Moved remarks about using :pypi:`Cython` to the newly created page for
+ extension modules.
+* #3374: Added clarification that using ``python setup.py egg_info`` commands to
+ manage project versions is only supported in a *transitional* basis, and
+ that eventually ``egg_info`` will be deprecated.
+
+ Reorganized sections with tips for managing versions.
+* #3378: Updated ``Quickstart`` docs to make it easier to follow for beginners.
+
+Misc
+^^^^
+* #3385: Modules used to parse and evaluate configuration from ``pyproject.toml`` files are
+ intended for internal use only and that not part of the public API.
+
+
v62.4.0
-------
diff --git a/changelog.d/3347.change.rst b/changelog.d/3347.change.rst
deleted file mode 100644
index b229981a..00000000
--- a/changelog.d/3347.change.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-Changed warnings and documentation notes about *experimental* aspect of ``pyproject.toml`` configuration:
-now ``[pyproject]`` is a fully supported configuration interface, but the ``[tool.setuptools]`` table
-and sub-tables are still considered to be in **beta** stage.
diff --git a/changelog.d/3368.doc.rst b/changelog.d/3368.doc.rst
deleted file mode 100644
index 229cf552..00000000
--- a/changelog.d/3368.doc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Added documentation page about extension modules -- by :user:`mkoeppe` \ No newline at end of file
diff --git a/changelog.d/3371.doc.rst b/changelog.d/3371.doc.rst
deleted file mode 100644
index 7e49c139..00000000
--- a/changelog.d/3371.doc.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-Moved documentation from ``/userguide/commands`` to ``/depracted/commands``.
-This change was motived by the fact that running ``python setup.py`` directly is
-considered a deprecated practice.
diff --git a/changelog.d/3372.doc.rst b/changelog.d/3372.doc.rst
deleted file mode 100644
index 845c2739..00000000
--- a/changelog.d/3372.doc.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-Consolidated sections about ``sdist`` contents and ``MANIFEST.in`` into a single page.
-
-Added a simple ``MANIFEST.in`` example.
diff --git a/changelog.d/3373.doc.rst b/changelog.d/3373.doc.rst
deleted file mode 100644
index c9cf8082..00000000
--- a/changelog.d/3373.doc.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Moved remarks about using :pypi:`Cython` to the newly created page for
-extension modules.
diff --git a/changelog.d/3374.doc.rst b/changelog.d/3374.doc.rst
deleted file mode 100644
index c00797ba..00000000
--- a/changelog.d/3374.doc.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-Added clarification that using ``python setup.py egg_info`` commands to
-manage project versions is only supported in a *transitional* basis, and
-that eventually ``egg_info`` will be deprecated.
-
-Reorganized sections with tips for managing versions.
diff --git a/changelog.d/3378.doc.rst b/changelog.d/3378.doc.rst
deleted file mode 100644
index f5aa91e0..00000000
--- a/changelog.d/3378.doc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Updated ``Quickstart`` docs to make it easier to follow for beginners.
diff --git a/changelog.d/3383.change.rst b/changelog.d/3383.change.rst
deleted file mode 100644
index 410b8f76..00000000
--- a/changelog.d/3383.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-In _distutils_hack, suppress/undo the use of local distutils when select tests are imported in CPython.
diff --git a/changelog.d/3385.misc.rst b/changelog.d/3385.misc.rst
deleted file mode 100644
index eace74c1..00000000
--- a/changelog.d/3385.misc.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Modules used to parse and evaluate configuration from ``pyproject.toml`` files are
-intended for internal use only and that not part of the public API.
diff --git a/setup.cfg b/setup.cfg
index dd7b5a4e..a9738956 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,6 @@
[metadata]
name = setuptools
-version = 62.4.0
+version = 62.5.0
author = Python Packaging Authority
author_email = distutils-sig@python.org
description = Easily download, build, install, upgrade, and uninstall Python packages