aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGES.rst10
-rw-r--r--changelog.d/1180.change.rst1
-rw-r--r--changelog.d/1499.change.rst1
-rw-r--r--changelog.d/1544.change.rst1
-rw-r--r--changelog.d/1551.breaking.rst1
-rw-r--r--changelog.d/1625.change.rst1
-rw-r--r--setup.cfg3
-rwxr-xr-xsetup.py2
8 files changed, 13 insertions, 7 deletions
diff --git a/CHANGES.rst b/CHANGES.rst
index 48a176a8..ca7122e9 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,13 @@
+v40.7.0
+-------
+
+* #1551: File inputs for the `license` field in `setup.cfg` files now explicitly raise an error.
+* #1180: Add support for non-ASCII in setup.cfg (#1062). Add support for native strings on some parameters (#1136).
+* #1499: ``setuptools.package_index`` no longer relies on the deprecated ``urllib.parse.splituser`` per Python #27485.
+* #1544: Added tests for PackageIndex.download (for git URLs).
+* #1625: In PEP 517 build_meta builder, ensure that sdists are built as gztar per the spec.
+
+
v40.6.3
-------
diff --git a/changelog.d/1180.change.rst b/changelog.d/1180.change.rst
deleted file mode 100644
index 2e0f78bf..00000000
--- a/changelog.d/1180.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Add support for non-ASCII in setup.cfg (#1062). Add support for native strings on some parameters (#1136).
diff --git a/changelog.d/1499.change.rst b/changelog.d/1499.change.rst
deleted file mode 100644
index 10e4db68..00000000
--- a/changelog.d/1499.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-``setuptools.package_index`` no longer relies on the deprecated ``urllib.parse.splituser`` per Python #27485.
diff --git a/changelog.d/1544.change.rst b/changelog.d/1544.change.rst
deleted file mode 100644
index 748b64e1..00000000
--- a/changelog.d/1544.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Added tests for PackageIndex.download (for git URLs).
diff --git a/changelog.d/1551.breaking.rst b/changelog.d/1551.breaking.rst
deleted file mode 100644
index c0e477ce..00000000
--- a/changelog.d/1551.breaking.rst
+++ /dev/null
@@ -1 +0,0 @@
-File inputs for the `license` field in `setup.cfg` files now explicitly raise an error.
diff --git a/changelog.d/1625.change.rst b/changelog.d/1625.change.rst
deleted file mode 100644
index 9125ac0c..00000000
--- a/changelog.d/1625.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-In PEP 517 build_meta builder, ensure that sdists are built as gztar per the spec.
diff --git a/setup.cfg b/setup.cfg
index dd404469..78eb7596 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
[bumpversion]
-current_version = 40.6.3
+current_version = 40.7.0
commit = True
tag = True
@@ -26,3 +26,4 @@ universal = 1
license_file = LICENSE
[bumpversion:file:setup.py]
+
diff --git a/setup.py b/setup.py
index 67d5691d..00db0f0a 100755
--- a/setup.py
+++ b/setup.py
@@ -89,7 +89,7 @@ def pypi_link(pkg_filename):
setup_params = dict(
name="setuptools",
- version="40.6.3",
+ version="40.7.0",
description=(
"Easily download, build, install, upgrade, and uninstall "
"Python packages"