Merge pull request #895 from vasole/version

Prepare 5.7.4 release
vasole · Aug 2, 2022 · 6263534 · 6263534
2 parents aa4050f + 1b1cf7f
commit 6263534
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 8 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,14 +1,14 @@
- The PyMca X-Ray Fluorescence Toolkit is Copyright (C) 2004-2019 of the European Synchrotron Radiation Facility (ESRF).
+ The PyMca X-Ray Fluorescence Toolkit is Copyright (C) 2004-2022 of the European Synchrotron Radiation Facility (ESRF).
 
 Unless otherways stated in the relevant accompanying source code, the default license of these modules is MIT.
 
-If you develop and distribute software using modules accessing Qt by means of Riverbank Computing PyQt4 or PyQt5, you will be conditioned by the license of your PyQt4/5 software (GPL or commercial). If you wish to be free of any distribution condition, you should be able to use PySide because it uses the LGPL license.
+If you develop and distribute software using modules accessing Qt by means of Riverbank Computing PyQt4, PyQt5 or PyQt6, you will be conditioned by the license of your PyQt4/5/6 software (GPL or commercial). If you wish to be free of any distribution condition, you should be able to use PySide2 or PySide6 because it uses the LGPL license.
 
 If, despite its permisivity, the license accompanying any of the PyMca modules is not convenient for you, please contact industry@esrf.fr
 
 The MIT license follows:
 
-Copyright (c) 2004-2019 European Synchrotron Radiation Facility (ESRF)
+Copyright (c) 2004-2022 European Synchrotron Radiation Facility (ESRF)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

diff --git a/LICENSE.GPL b/LICENSE.GPL
@@ -1,5 +1,5 @@
 
- The PyMca X-Ray Fluorescence Toolkit is Copyright (C) 2004-2014 of the
+ The PyMca X-Ray Fluorescence Toolkit is Copyright (C) 2004-2022 of the
  European Synchrotron Radiation Facility (ESRF).
 
  You may use, distribute and copy the PyMca XRF Toolkit under the terms of

diff --git a/LICENSE.MIT b/LICENSE.MIT
@@ -1,10 +1,10 @@
 
- The PyMca X-Ray Fluorescence Toolkit is Copyright (C) 2004-2014 of the
+ The PyMca X-Ray Fluorescence Toolkit is Copyright (C) 2004-2022 of the
  European Synchrotron Radiation Facility (ESRF).
 
 The MIT License (MIT)
 
-Copyright (c) 2004-2014 European Synchrotron Radiation Facility (ESRF)
+Copyright (c) 2004-2022 European Synchrotron Radiation Facility (ESRF)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

diff --git a/PyMca5/__init__.py b/PyMca5/__init__.py
@@ -27,7 +27,7 @@
 __contact__ = "sole@esrf.fr"
 __license__ = "MIT"
 __copyright__ = "European Synchrotron Radiation Facility, Grenoble, France"
-__version__ = "5.7.3"
+__version__ = "5.7.4"
 
 import os
 import sys
@@ -48,7 +48,7 @@
  from ctypes.wintypes import MAX_PATH
 
 if os.path.exists(os.path.join(\
- os.path.dirname(os.path.dirname(__file__)), 'py2app_setup.py')):
+ os.path.dirname(os.path.dirname(__file__)), 'bootstrap.py')):
  raise ImportError('PyMca cannot be imported from source directory')
 
 def version():

diff --git a/changelog.txt b/changelog.txt
@@ -1,3 +1,14 @@
+VERSION 5.7.4
+-------------
+
+- HDF5. Improved support of external links PR #891.
+
+- HDF5. Single MCA selections accompanied by associated motor positions (if any).
+
+- XRF. Make more explicit the Fast XRF fit is a linear fit.
+
+- ROI Imaging. Clearer tool tips.
+
 VERSION 5.7.3
 -------------