summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2020-12-20 14:54:14 -0500
committerJason R. Coombs <jaraco@jaraco.com>2020-12-20 14:54:14 -0500
commitcabb200e590955eee70b67787eaa5597d4d0ff19 (patch)
treee8907d18829887ac189bab64ac141fce224c2921
parent957b7a19dee67181406fa28c15964bcf8aa532b4 (diff)
downloadpython-setuptools-git-cabb200e590955eee70b67787eaa5597d4d0ff19.tar.gz
Bump version: 51.0.0 → 51.1.0
-rw-r--r--.bumpversion.cfg2
-rw-r--r--CHANGES.rst18
-rw-r--r--changelog.d/2477.misc.rst1
-rw-r--r--changelog.d/2484.misc.rst1
-rw-r--r--changelog.d/2485.misc.rst2
-rw-r--r--changelog.d/2486.change.rst1
-rw-r--r--changelog.d/2487.misc.rst2
-rw-r--r--setup.cfg2
8 files changed, 20 insertions, 9 deletions
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index c56d45dc..d156dedb 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
[bumpversion]
-current_version = 51.0.0
+current_version = 51.1.0
commit = True
tag = True
diff --git a/CHANGES.rst b/CHANGES.rst
index 55133876..fb5725cc 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,21 @@
+v51.1.0
+-------
+
+
+Changes
+^^^^^^^
+* #2486: Project adopts jaraco/skeleton for shared package maintenance.
+
+Misc
+^^^^
+* #2477: Restore inclusion of rst files in sdist.
+* #2484: Setuptools has replaced the master branch with the main branch.
+* #2485: Fixed failing test when pip 20.3+ is present.
+ -- by :user:`yan12125`
+* #2487: Fix tests with pytest 6.2
+ -- by :user:`yan12125`
+
+
v51.0.0
-------
diff --git a/changelog.d/2477.misc.rst b/changelog.d/2477.misc.rst
deleted file mode 100644
index 48900e9d..00000000
--- a/changelog.d/2477.misc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Restore inclusion of rst files in sdist.
diff --git a/changelog.d/2484.misc.rst b/changelog.d/2484.misc.rst
deleted file mode 100644
index 8f93b3d0..00000000
--- a/changelog.d/2484.misc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Setuptools has replaced the master branch with the main branch.
diff --git a/changelog.d/2485.misc.rst b/changelog.d/2485.misc.rst
deleted file mode 100644
index 0a28fd93..00000000
--- a/changelog.d/2485.misc.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Fixed failing test when pip 20.3+ is present.
--- by :user:`yan12125`
diff --git a/changelog.d/2486.change.rst b/changelog.d/2486.change.rst
deleted file mode 100644
index f4f783e2..00000000
--- a/changelog.d/2486.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Project adopts jaraco/skeleton for shared package maintenance.
diff --git a/changelog.d/2487.misc.rst b/changelog.d/2487.misc.rst
deleted file mode 100644
index 003f6efb..00000000
--- a/changelog.d/2487.misc.rst
+++ /dev/null
@@ -1,2 +0,0 @@
- Fix tests with pytest 6.2
--- by :user:`yan12125`
diff --git a/setup.cfg b/setup.cfg
index f3f53f6c..6ef70e26 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,7 +1,7 @@
[metadata]
license_file = LICENSE
name = setuptools
-version = 51.0.0
+version = 51.1.0
author = Python Packaging Authority
author_email = distutils-sig@python.org
description = Easily download, build, install, upgrade, and uninstall Python packages