From 14fb26901bfa8eb4913a40fdfc867e68104bfd78 Mon Sep 17 00:00:00 2001 From: "V. Armando Sole" Date: Tue, 25 Jun 2024 10:21:48 +0200 Subject: [PATCH 1/2] Prepare numpy 2.0 compatible release --- PyMca5/__init__.py | 4 ++-- changelog.txt | 7 +++++++ pyproject.toml | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/PyMca5/__init__.py b/PyMca5/__init__.py index eb68f9530..dbe8b8b2b 100644 --- a/PyMca5/__init__.py +++ b/PyMca5/__init__.py @@ -1,5 +1,5 @@ #/*########################################################################## -# Copyright (C) 2004-2023 European Synchrotron Radiation Facility +# Copyright (C) 2004-2024 European Synchrotron Radiation Facility # # This file is part of the PyMca X-ray Fluorescence Toolkit developed at # the ESRF. @@ -27,7 +27,7 @@ __contact__ = "sole@esrf.fr" __license__ = "MIT" __copyright__ = "European Synchrotron Radiation Facility, Grenoble, France" -__version__ = "5.9.2" +__version__ = "5.9.3" import os import sys diff --git a/changelog.txt b/changelog.txt index e05861e68..7d00b1c5a 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,10 @@ +VERSION 5.9.3 +------------- + +- Compatibility with numpy 2.0 + +- GUI. Compatibility with matplotlib 3.9.0 + VERSION 5.9.2 ------------- diff --git a/pyproject.toml b/pyproject.toml index 88b883dbf..733fe3aa0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -3,7 +3,7 @@ requires = [ "setuptools", "wheel", "oldest-supported-numpy; python_version< '3.9'", - "numpy >= 1.23; python_version >= '3.9'", + "numpy >= 2.0.0; python_version >= '3.9'", "Cython" ] build-backend = "setuptools.build_meta" From 61f60b522568d380e32d7a42c6772bfe0ffbd98b Mon Sep 17 00:00:00 2001 From: "V. Armando Sole" Date: Tue, 25 Jun 2024 11:09:56 +0200 Subject: [PATCH 2/2] Closes #1067 issue AppStream Debian --- package/desktop/edfviewer.metainfo2.xml | 23 ++++++++++++++++++++ package/desktop/elementsinfo.metainfo2.xml | 23 ++++++++++++++++++++ package/desktop/peakidentifier.metainfo2.xml | 23 ++++++++++++++++++++ package/desktop/pymca.metainfo2.xml | 23 ++++++++++++++++++++ package/desktop/pymcapostbatch.metainfo2.xml | 23 ++++++++++++++++++++ package/desktop/pymcaroitool.metainfo2.xml | 23 ++++++++++++++++++++ 6 files changed, 138 insertions(+) create mode 100644 package/desktop/edfviewer.metainfo2.xml create mode 100644 package/desktop/elementsinfo.metainfo2.xml create mode 100644 package/desktop/peakidentifier.metainfo2.xml create mode 100644 package/desktop/pymca.metainfo2.xml create mode 100644 package/desktop/pymcapostbatch.metainfo2.xml create mode 100644 package/desktop/pymcaroitool.metainfo2.xml diff --git a/package/desktop/edfviewer.metainfo2.xml b/package/desktop/edfviewer.metainfo2.xml new file mode 100644 index 000000000..82f34d704 --- /dev/null +++ b/package/desktop/edfviewer.metainfo2.xml @@ -0,0 +1,23 @@ + + + edfviewer + MIT + MIT + EDF File viewer + Viewer of old ESRF Data Format Files + +Very primitive file viewer supporting multiple detector image data formats. Kept for historical reasons. Better alternatives available. + + https://github.com/vasole/pymca + https://github.com/vasole/pymca/issues + https://sourceforge.net/p/pymca/mailman/pymca-users/ + http://www.silx.org/doc/pymca/latest/ + + + http://www.silx.org/doc/PyMca/latest/_static/PyMca_256x256.png + EDF Viewer + + + V. Armando Sole + sole@esrf.fr + diff --git a/package/desktop/elementsinfo.metainfo2.xml b/package/desktop/elementsinfo.metainfo2.xml new file mode 100644 index 000000000..1a67bc3cf --- /dev/null +++ b/package/desktop/elementsinfo.metainfo2.xml @@ -0,0 +1,23 @@ + + + elementsinfo + MIT + MIT + Elements Info + Periodic Table with XRF-related information + +Direct access to binding energies, shell transitions and fluorescence yields. + + https://github.com/vasole/pymca + https://github.com/vasole/pymca/issues + https://sourceforge.net/p/pymca/mailman/pymca-users/ + http://www.silx.org/doc/pymca/latest/ + + + http://www.silx.org/doc/PyMca/latest/_images/xraydata_01.png + Elements Infor + + + V. Armando Sole + sole@esrf.fr + diff --git a/package/desktop/peakidentifier.metainfo2.xml b/package/desktop/peakidentifier.metainfo2.xml new file mode 100644 index 000000000..1491566ef --- /dev/null +++ b/package/desktop/peakidentifier.metainfo2.xml @@ -0,0 +1,23 @@ + + + peakidentifier + MIT + MIT + Peak Identifier + Helper to identify x-ray emission lines + +Given an x-ray energy and a threshold, this tool provides the different x-ray emission lines matching the provided energy within the supplied threshold. + + https://github.com/vasole/pymca + https://github.com/vasole/pymca/issues + https://sourceforge.net/p/pymca/mailman/pymca-users/ + http://www.silx.org/doc/pymca/latest/ + + + http://www.silx.org/doc/PyMca/latest/_images/quantification_06.png + Peak Identifier + + + V. Armando Sole + sole@esrf.fr + diff --git a/package/desktop/pymca.metainfo2.xml b/package/desktop/pymca.metainfo2.xml new file mode 100644 index 000000000..4b161717c --- /dev/null +++ b/package/desktop/pymca.metainfo2.xml @@ -0,0 +1,23 @@ + + + pymca + MIT + MIT + PyMca + PyMca main application + +Front-end to the different capabilities provided by the program. From simple viewer of data supporting multiple formats to state-of-the-art XRF analysis. + + https://github.com/vasole/pymca + https://github.com/vasole/pymca/issues + https://sourceforge.net/p/pymca/mailman/pymca-users/ + http://www.silx.org/doc/pymca/latest/ + + + http://www.silx.org/doc/PyMca/latest/_static/PyMca_256x256.png + PyMca + + + V. Armando Sole + sole@esrf.fr + diff --git a/package/desktop/pymcapostbatch.metainfo2.xml b/package/desktop/pymcapostbatch.metainfo2.xml new file mode 100644 index 000000000..a3537f5f9 --- /dev/null +++ b/package/desktop/pymcapostbatch.metainfo2.xml @@ -0,0 +1,23 @@ + + + pymcapostbatch + MIT + MIT + PyMca Post-batch tool aka RGB Correlator + Tool for post-processing treatment of data + +Tool to compare images and find correlations among them. It provides graphical and mathematical tools. + + https://github.com/vasole/pymca + https://github.com/vasole/pymca/issues + https://sourceforge.net/p/pymca/mailman/pymca-users/ + http://www.silx.org/doc/pymca/latest/ + + + http://www.silx.org/doc/PyMca/latest/_static/PyMca_256x256.png + PyMca RGB Correlator + + + V. Armando Sole + sole@esrf.fr + diff --git a/package/desktop/pymcaroitool.metainfo2.xml b/package/desktop/pymcaroitool.metainfo2.xml new file mode 100644 index 000000000..26910b546 --- /dev/null +++ b/package/desktop/pymcaroitool.metainfo2.xml @@ -0,0 +1,23 @@ + + + pymcaroiool + MIT + MIT + PyMca ROI Imaging Tool + Tool to analyze stacked data as those of microscopy applications + +This tool handles stacks of images or of spectra in multiple formats. Providing multiple analysis capabilities clustering capabilities. Particularly well-suited for XRF microscopy but not only: FTIR, XAS, Raman, Powder diffraction... + + https://github.com/vasole/pymca + https://github.com/vasole/pymca/issues + https://sourceforge.net/p/pymca/mailman/pymca-users/ + http://www.silx.org/doc/pymca/latest/ + + + http://www.silx.org/doc/PyMca/latest/_static/PyMca_256x256.png + PyMca ROI Imaging Tool + + + V. Armando Sole + sole@esrf.fr +