Skip to content

Commit

Permalink
Merge pull request #1044 from vasole/warnings
Browse files Browse the repository at this point in the history
Suppress syntax warnings
  • Loading branch information
vasole authored Oct 20, 2023
2 parents a0cfc27 + d408f81 commit 9ae6f54
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -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.

Expand Down
2 changes: 1 addition & 1 deletion package/cxfreeze/cx_setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion package/pyinstaller/PyMca.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion package/pyinstaller/pyinstaller.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down

0 comments on commit 9ae6f54

Please sign in to comment.