From 0c925acfa48c5afc10712c27339b594873e2464e Mon Sep 17 00:00:00 2001
From: Mark Dickinson <mdickinson@enthought.com>
Date: Mon, 15 Aug 2022 17:39:35 +0100
Subject: [PATCH] Update changelog in preparation for 5.2.0 release (#317)

This PR updates the changelog in preparation for the 5.2.0 release.
---
 CHANGES.txt                            | 55 ++++++++++++++++++++++++++
 docs/releases/upcoming/285.feature.rst |  1 -
 docs/releases/upcoming/299.bugfix.rst  |  1 -
 docs/releases/upcoming/306.bugfix.rst  |  1 -
 docs/releases/upcoming/315.build.rst   |  1 -
 docs/releases/upcoming/316.build.rst   |  1 -
 6 files changed, 55 insertions(+), 5 deletions(-)
 delete mode 100644 docs/releases/upcoming/285.feature.rst
 delete mode 100644 docs/releases/upcoming/299.bugfix.rst
 delete mode 100644 docs/releases/upcoming/306.bugfix.rst
 delete mode 100644 docs/releases/upcoming/315.build.rst
 delete mode 100644 docs/releases/upcoming/316.build.rst

diff --git a/CHANGES.txt b/CHANGES.txt
index 4207aef3..aaf68c19 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,61 @@
 Apptools CHANGELOG
 ==================
 
+Version 5.2.0
+~~~~~~~~~~~~~
+
+Released: 2022-08-16
+
+This is a minor release, focusing primarily on Python 3.8 support and updating
+of development workflows.
+
+Thanks to the following contributors:
+
+* Aaron Ayres
+* Mark Dickinson
+* Jonas Heinrich
+* Robert T. McGibbon
+* Sai Rahul Poruri
+* Corran Webster
+
+Features
+--------
+* Replace some uses of ``on_trait_change`` and ``depends_on`` with ``observe``.
+  (#285, #289)
+* Use ``importlib.resources`` in preference to ``importlib_resources``
+  on new enough Python versions. (#284)
+
+Fixes
+-----
+* Replace ``eval`` with ``ast.literal_eval`` in ``apptools.preferences``.
+  (#299)
+* Use context managers to handle locks in ``apptools.preferences``. (#306)
+* Fix test failures due to ``collections.abc`` changes in Python 3.10. (#313)
+* Remove a redundant ``elif`` branch in ``preference_binding``. (#298)
+
+Documentation
+-------------
+* Copyrights have been updated for 2022. (#307)
+* A Read the Docs configuration file has been added. (#296)
+* A use of the deprecated ``contributes_to`` decorator in the documentation
+  has been fixed. (#286)
+
+Build
+-----
+* The default branch has been renamed from ``master`` to ``main``. (#297)
+* ``etstool.py`` now supports Python 3.8 as well as Python 3.6, and test
+  workflows will run on both Python 3.6 and Python 3.8. (#316)
+* Continuous integration now uses GitHub Actions instead of Travis CI
+  and Appveyor. (#288, #291, #292)
+* Added a GitHub Actions test workflow that tests against PyPI packages instead
+  of EDM packages. (#314)
+* Added a GitHub Actions workflow to automatically publish releases to PyPI.
+  (#315)
+* Cron job failures are now reported to the main ETS Slack channel, not the
+  bots channel. (#295, #308)
+* The cron job can now also be triggered manually. (#294)
+
+
 Version 5.1.0
 ~~~~~~~~~~~~~
 
diff --git a/docs/releases/upcoming/285.feature.rst b/docs/releases/upcoming/285.feature.rst
deleted file mode 100644
index 43a1cf1f..00000000
--- a/docs/releases/upcoming/285.feature.rst
+++ /dev/null
@@ -1 +0,0 @@
-start replacing on_trait_change with observe (#285)
\ No newline at end of file
diff --git a/docs/releases/upcoming/299.bugfix.rst b/docs/releases/upcoming/299.bugfix.rst
deleted file mode 100644
index d2b7229e..00000000
--- a/docs/releases/upcoming/299.bugfix.rst
+++ /dev/null
@@ -1 +0,0 @@
-Replace eval with ast.literal_eval in apptools.preferences (#299)
\ No newline at end of file
diff --git a/docs/releases/upcoming/306.bugfix.rst b/docs/releases/upcoming/306.bugfix.rst
deleted file mode 100644
index 33db659b..00000000
--- a/docs/releases/upcoming/306.bugfix.rst
+++ /dev/null
@@ -1 +0,0 @@
-Use context managers to handle locks in apptools.preferences (#306)
\ No newline at end of file
diff --git a/docs/releases/upcoming/315.build.rst b/docs/releases/upcoming/315.build.rst
deleted file mode 100644
index ea34dffa..00000000
--- a/docs/releases/upcoming/315.build.rst
+++ /dev/null
@@ -1 +0,0 @@
-Add GitHub Actions workflow for automatically publishing releases to PyPI. (#315)
diff --git a/docs/releases/upcoming/316.build.rst b/docs/releases/upcoming/316.build.rst
deleted file mode 100644
index c484ce77..00000000
--- a/docs/releases/upcoming/316.build.rst
+++ /dev/null
@@ -1 +0,0 @@
-Update etstool.py to support Python 3.8. (#316)