summaryrefslogtreecommitdiff
path: root/changelog.d
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2021-04-25 18:05:55 -0400
committerJason R. Coombs <jaraco@jaraco.com>2021-04-25 18:05:55 -0400
commitb720937d0af9e8382c8b9e00b2c0d5715b7cfbe5 (patch)
treec29ce9e7423c4f89e79634991941e5bdf9d07a15 /changelog.d
parent8b494633df0f6770946092498aed76fd30be99b1 (diff)
parentb5fa6ad11e1344648b470ff0d847a7d940b4c99d (diff)
downloadpython-setuptools-git-feature/distutils-docs.tar.gz
Merge branch 'main' into feature/distutils-docsfeature/distutils-docs
Diffstat (limited to 'changelog.d')
-rw-r--r--changelog.d/2430.doc.1.rst2
-rw-r--r--changelog.d/2430.doc.2.rst2
-rw-r--r--changelog.d/2644.misc.rst1
-rw-r--r--changelog.d/2654.misc.rst2
4 files changed, 3 insertions, 4 deletions
diff --git a/changelog.d/2430.doc.1.rst b/changelog.d/2430.doc.1.rst
deleted file mode 100644
index d09e0b9e..00000000
--- a/changelog.d/2430.doc.1.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Fixed a typo in Sphinx docs that made docs dev section disappear
-as a result of PR #2426 -- by :user:`webknjaz`
diff --git a/changelog.d/2430.doc.2.rst b/changelog.d/2430.doc.2.rst
deleted file mode 100644
index 0ac87823..00000000
--- a/changelog.d/2430.doc.2.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Fixed inconsistent RST title nesting levels caused by #2399
--- by :user:`webknjaz`
diff --git a/changelog.d/2644.misc.rst b/changelog.d/2644.misc.rst
new file mode 100644
index 00000000..1aa9fbbe
--- /dev/null
+++ b/changelog.d/2644.misc.rst
@@ -0,0 +1 @@
+Fixed ``DeprecationWarning`` due to ``threading.Thread.setDaemon`` in tests -- by :user:`tirkarthi`
diff --git a/changelog.d/2654.misc.rst b/changelog.d/2654.misc.rst
new file mode 100644
index 00000000..268c4a2e
--- /dev/null
+++ b/changelog.d/2654.misc.rst
@@ -0,0 +1,2 @@
+Made the changelog generator compatible
+with Towncrier >= 19.9 -- :user:`webknjaz`