From 4fbdf6ee1388a51a5f39f9b40217e95e7e0e0b3c Mon Sep 17 00:00:00 2001
From: Long Yang <dragonyang92@gmail.com>
Date: Mon, 27 Feb 2023 10:57:06 +0800
Subject: [PATCH 1/4] DEP: replace the deprecated Thread.isAlive() with
 .is_alive()

---
 src/diffpy/pdfgui/control/fitting.py       | 2 +-
 src/diffpy/pdfgui/control/pdfguicontrol.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/diffpy/pdfgui/control/fitting.py b/src/diffpy/pdfgui/control/fitting.py
index 7e42b1dc..a85bddce 100644
--- a/src/diffpy/pdfgui/control/fitting.py
+++ b/src/diffpy/pdfgui/control/fitting.py
@@ -553,7 +553,7 @@ def isThreadRunning(self):
 
         return: True if running, False otherwise
         """
-        return self.thread is not None and self.thread.isAlive()
+        return self.thread is not None and self.thread.is_alive()
 
     def join(self):
         """wait for current fitting to finish"""
diff --git a/src/diffpy/pdfgui/control/pdfguicontrol.py b/src/diffpy/pdfgui/control/pdfguicontrol.py
index 5f838a5f..8d74c312 100644
--- a/src/diffpy/pdfgui/control/pdfguicontrol.py
+++ b/src/diffpy/pdfgui/control/pdfguicontrol.py
@@ -159,7 +159,7 @@ def exit(self):
         """exit when program finished
         """
         self.close()
-        if self.queueManager.isAlive():
+        if self.queueManager.is_alive():
             self.queueManager.running = False
 
     def newFitting(self, name, position=None):

From 053777350b37e9af76d03648307cc2a4a837689e Mon Sep 17 00:00:00 2001
From: Long Yang <dragonyang92@gmail.com>
Date: Mon, 27 Feb 2023 11:01:41 +0800
Subject: [PATCH 2/4] REL: bump up version to 1.4.6

---
 CHANGELOG.md | 4 +++-
 setup.py     | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cd6bfdf1..10562f02 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,10 +11,12 @@ Notable differences from version 1.1.2.
 
 ### Changed
 
+- Update wxpython to 4.1.1, and remove incompatible align flags.
 ### Deprecated
 
 ### Removed
 
 ### Fixed
 
--  Incompatible conversion between bytes and str from py2 to py3.
+- Incompatible conversion between bytes and str from py2 to py3.
+- Replace the deprecated `Thread.isAlive()` with `Thread.is_alive()`.
\ No newline at end of file
diff --git a/setup.py b/setup.py
index fc0e0d32..47dfe63b 100755
--- a/setup.py
+++ b/setup.py
@@ -15,7 +15,7 @@
 
 # Use this version when git data are not available, like in git zip archive.
 # Update when tagging a new release.
-FALLBACK_VERSION = '1.4.3'
+FALLBACK_VERSION = '1.4.6'
 
 # determine if we run with Python 3.
 PY3 = (sys.version_info[0] == 3)

From f87ac7c3bc362a3d0b92e2415c91574b273efd1d Mon Sep 17 00:00:00 2001
From: Long Yang <dragonyang92@gmail.com>
Date: Mon, 27 Feb 2023 11:04:03 +0800
Subject: [PATCH 3/4] REL: update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 10562f02..f20cda87 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@ Notable differences from version 1.1.2.
 ### Changed
 
 - Update wxpython to 4.1.1, and remove incompatible align flags.
+
 ### Deprecated
 
 ### Removed

From 40cc24edb7418430f40df2114f643501466e5a3f Mon Sep 17 00:00:00 2001
From: Long Yang <dragonyang92@gmail.com>
Date: Mon, 27 Feb 2023 11:04:30 +0800
Subject: [PATCH 4/4] REL: update changelog

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f20cda87..b5e22abb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,4 +20,4 @@ Notable differences from version 1.1.2.
 ### Fixed
 
 - Incompatible conversion between bytes and str from py2 to py3.
-- Replace the deprecated `Thread.isAlive()` with `Thread.is_alive()`.
\ No newline at end of file
+- Replace the deprecated `Thread.isAlive()` with `Thread.is_alive()`.