summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@Karui-Tatchi.lan>2020-03-21 14:45:16 -0400
committerJason R. Coombs <jaraco@jaraco.com>2020-03-21 14:56:15 -0400
commitee4d0dd1c0bd4c3efb6d2b933c2027e88917bfd1 (patch)
tree22098ed3bef965fcf13c87f28770c966b6441b32
parentbfe4e747bbe1a58459ab481b217bfad79839c01e (diff)
downloadpython-setuptools-git-ee4d0dd1c0bd4c3efb6d2b933c2027e88917bfd1.tar.gz
Bump version: 46.0.0 → 46.1.0v46.1.0
-rw-r--r--.bumpversion.cfg2
-rw-r--r--CHANGES.rst15
-rw-r--r--changelog.d/1424.change.rst1
-rw-r--r--changelog.d/1431.change.rst1
-rw-r--r--changelog.d/1563.change.rst1
-rw-r--r--changelog.d/308.change.rst1
-rw-r--r--setup.cfg2
7 files changed, 17 insertions, 6 deletions
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 8f2ef1d8..28a327b2 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
[bumpversion]
-current_version = 46.0.0
+current_version = 46.1.0
commit = True
tag = True
diff --git a/CHANGES.rst b/CHANGES.rst
index 1e8da46e..12680a4d 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,18 @@
+v46.1.0
+-------
+
+* #308: Allow version number normalization to be bypassed by wrapping in a 'setuptools.sic()' call.
+* #1424: Prevent keeping files mode for package_data build. It may break a build if user's package data has read only flag.
+* #1431: In ``easy_install.check_site_dir``, ensure the installation directory exists.
+* #1563: In ``pkg_resources`` prefer ``find_spec`` (PEP 451) to ``find_module``.
+
+Incorporate changes from v44.1.0:
+
+* #1704: Set sys.argv[0] in setup script run by build_meta.__legacy__
+* #1959: Fix for Python 4: replace unsafe six.PY3 with six.PY2
+* #1994: Fixed a bug in the "setuptools.finalize_distribution_options" hook that lead to ignoring the order attribute of entry points managed by this hook.
+
+
v44.1.0
-------
diff --git a/changelog.d/1424.change.rst b/changelog.d/1424.change.rst
deleted file mode 100644
index 361997dd..00000000
--- a/changelog.d/1424.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Prevent keeping files mode for package_data build. It may break a build if user's package data has read only flag. \ No newline at end of file
diff --git a/changelog.d/1431.change.rst b/changelog.d/1431.change.rst
deleted file mode 100644
index a3848afa..00000000
--- a/changelog.d/1431.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-In ``easy_install.check_site_dir``, ensure the installation directory exists.
diff --git a/changelog.d/1563.change.rst b/changelog.d/1563.change.rst
deleted file mode 100644
index 4ae16384..00000000
--- a/changelog.d/1563.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-In ``pkg_resources`` prefer ``find_spec`` (PEP 451) to ``find_module``.
diff --git a/changelog.d/308.change.rst b/changelog.d/308.change.rst
deleted file mode 100644
index 5806d80e..00000000
--- a/changelog.d/308.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Allow version number normalization to be bypassed by wrapping in a 'setuptools.sic()' call.
diff --git a/setup.cfg b/setup.cfg
index d231a3e1..0e9a05ed 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -16,7 +16,7 @@ formats = zip
[metadata]
name = setuptools
-version = 46.0.0
+version = 46.1.0
description = Easily download, build, install, upgrade, and uninstall Python packages
author = Python Packaging Authority
author_email = distutils-sig@python.org