From a5aa9970692f6f97a9ef41a1995e253530b7cc5f Mon Sep 17 00:00:00 2001 From: "V. Armando Sole" Date: Fri, 20 Oct 2023 12:08:53 +0200 Subject: [PATCH 1/3] Get rid of warning --- package/pyinstaller/pyinstaller.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pyinstaller/pyinstaller.spec b/package/pyinstaller/pyinstaller.spec index 841137cdd..95f3990ec 100644 --- a/package/pyinstaller/pyinstaller.spec +++ b/package/pyinstaller/pyinstaller.spec @@ -644,7 +644,7 @@ else: frozenDir = target # generation of the NSIS executable - nsis = os.path.join("\Program Files (x86)", "NSIS", "makensis.exe") + nsis = os.path.join(r"\Program Files (x86)", "NSIS", "makensis.exe") if sys.platform.startswith("win") and os.path.exists(nsis): # check if we can perform the packaging outFile = os.path.join(SPECPATH, "nsisscript.nsi") From 6762d42d3e69a5070f409f926db74eb3e0b7b9d7 Mon Sep 17 00:00:00 2001 From: "V. Armando Sole" Date: Fri, 20 Oct 2023 12:10:22 +0200 Subject: [PATCH 2/3] Get rid of syntax warning --- package/cxfreeze/cx_setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/cxfreeze/cx_setup.py b/package/cxfreeze/cx_setup.py index f929f2b85..e72a5f30d 100644 --- a/package/cxfreeze/cx_setup.py +++ b/package/cxfreeze/cx_setup.py @@ -543,7 +543,7 @@ def dummy_hook(*var, **kw): # generation of the NSIS executable -nsis = os.path.join("\Program Files (x86)", "NSIS", "makensis.exe") +nsis = os.path.join(r"\Program Files (x86)", "NSIS", "makensis.exe") if sys.platform.startswith("win") and os.path.exists(nsis): # check if we can perform the packaging outFile = "nsisscript.nsi" From d408f818740544e1002f4c3147962879af559443 Mon Sep 17 00:00:00 2001 From: "V. Armando Sole" Date: Fri, 20 Oct 2023 13:17:44 +0200 Subject: [PATCH 3/3] Update --- LICENSE | 2 +- package/pyinstaller/PyMca.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/LICENSE b/LICENSE index cf7cc5386..3fe5313a1 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ - The PyMca X-Ray Fluorescence Toolkit is Copyright (C) 2004-2022 of the European Synchrotron Radiation Facility (ESRF). + The PyMca X-Ray Fluorescence Toolkit is Copyright (C) 2004-2023 of the European Synchrotron Radiation Facility (ESRF). Unless otherways stated in the relevant accompanying source code, the default license of these modules is MIT. diff --git a/package/pyinstaller/PyMca.txt b/package/pyinstaller/PyMca.txt index 50fd6926f..fe0a0eeae 100644 --- a/package/pyinstaller/PyMca.txt +++ b/package/pyinstaller/PyMca.txt @@ -3,7 +3,7 @@ Copyright (C) 2004-2023 European Synchrotron Radiation Facility - The PyMca X-ray Fluorescence Toolkit is developed at the ESRF by the Software group. + The PyMca X-ray Fluorescence Toolkit is developed at the ESRF. PyMca follows the very permissive MIT license. However, this frozen binary uses GPL-licensed code and therefore this binary follows the GPL license that follows.