From 905a37fdff51453fee000c8e8e188aea4420e613 Mon Sep 17 00:00:00 2001 From: Tieqiong <123656525+Tieqiong@users.noreply.github.com> Date: Thu, 22 Aug 2024 05:30:16 -0400 Subject: [PATCH 1/3] fix not a package type error for importlib (#193) * fix not a package type error for importlib * [pre-commit.ci] auto fixes from pre-commit hooks --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- src/diffpy/pdfgui/gui/pdfguiglobals.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/diffpy/pdfgui/gui/pdfguiglobals.py b/src/diffpy/pdfgui/gui/pdfguiglobals.py index 7de59ed0..cbfdc911 100644 --- a/src/diffpy/pdfgui/gui/pdfguiglobals.py +++ b/src/diffpy/pdfgui/gui/pdfguiglobals.py @@ -30,7 +30,11 @@ isAltered = False # Resolve APPDATADIR base path to application data files. -_mydir = os.path.abspath(str(files(__name__))) +try: + _mydir = os.path.abspath(str(files(__name__))) +except TypeError: # For Python < 3.12 + _mydir = os.path.abspath(os.path.dirname(__file__)) + _upbasedir = os.path.normpath(_mydir + "/../../..") _development_mode = os.path.basename(_upbasedir) == "src" and os.path.isfile( os.path.join(_upbasedir, "../pyproject.toml") From 998cab932a41fcd642e5fe5341c490a735609074 Mon Sep 17 00:00:00 2001 From: Tieqiong <123656525+Tieqiong@users.noreply.github.com> Date: Thu, 22 Aug 2024 05:39:16 -0400 Subject: [PATCH 2/3] correct year (#192) * correct year * f-string in aboutdialog.py --------- Co-authored-by: Simon Billinge --- src/diffpy/pdfgui/gui/aboutdialog.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/diffpy/pdfgui/gui/aboutdialog.py b/src/diffpy/pdfgui/gui/aboutdialog.py index 51012e01..f0700cbb 100644 --- a/src/diffpy/pdfgui/gui/aboutdialog.py +++ b/src/diffpy/pdfgui/gui/aboutdialog.py @@ -42,7 +42,7 @@ computer programs for studying nanostructure in crystals, J. Phys.: Condens. Matter 19, 335219 (2007).""" -_copyright = "(c) 2005-{year},".format(year=__date__[:4]) +_copyright = f"(c) 2005-{__date__[-4:]}," _homepage = "https://www.diffpy.org" From 9732cfe199dff83a658f9b15cef7dae3b512df8b Mon Sep 17 00:00:00 2001 From: Simon Billinge Date: Thu, 22 Aug 2024 11:02:10 -0400 Subject: [PATCH 3/3] news (#196) --- news/news.rst | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 news/news.rst diff --git a/news/news.rst b/news/news.rst new file mode 100644 index 00000000..784e7387 --- /dev/null +++ b/news/news.rst @@ -0,0 +1,24 @@ +**Added:** + +* + +**Changed:** + +* + +**Deprecated:** + +* + +**Removed:** + +* + +**Fixed:** + +* inability to find gui resources bug in py < 3.12 +* fixed date rendering in 'about' dialog box + +**Security:** + +*