Merge pull request #1081 from vasole/pre

Prepare numpy 2.0 compatible release

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

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
 -------------
 

package/desktop/edfviewer.metainfo2.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop">
+    <id>edfviewer</id>
+  <metadata_license>MIT</metadata_license>
+  <project_license>MIT</project_license>
+  <name>EDF File viewer</name>
+  <summary>Viewer of old ESRF Data Format Files</summary>
+  <description>
+Very primitive file viewer supporting multiple detector image data formats. Kept for historical reasons. Better alternatives available.
+  </description>
+  <url type="homepage">https://github.com/vasole/pymca</url>
+  <url type="bugtracker">https://github.com/vasole/pymca/issues</url>
+  <url type="faq">https://sourceforge.net/p/pymca/mailman/pymca-users/</url>
+  <url type="help">http://www.silx.org/doc/pymca/latest/</url>
+  <screenshots>
+    <screenshot type="default">
+      <image>http://www.silx.org/doc/PyMca/latest/_static/PyMca_256x256.png</image>
+      <caption>EDF Viewer</caption>
+    </screenshot>
+  </screenshots>
+  <developer_name>V. Armando Sole</developer_name>
+  <update_contact>sole@esrf.fr</update_contact>
+</component>

package/desktop/elementsinfo.metainfo2.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop">
+    <id>elementsinfo</id>
+  <metadata_license>MIT</metadata_license>
+  <project_license>MIT</project_license>
+  <name>Elements Info</name>
+  <summary>Periodic Table with XRF-related information</summary>
+  <description>
+Direct access to binding energies, shell transitions and fluorescence yields.
+  </description>
+  <url type="homepage">https://github.com/vasole/pymca</url>
+  <url type="bugtracker">https://github.com/vasole/pymca/issues</url>
+  <url type="faq">https://sourceforge.net/p/pymca/mailman/pymca-users/</url>
+  <url type="help">http://www.silx.org/doc/pymca/latest/</url>
+  <screenshots>
+    <screenshot type="default">
+      <image>http://www.silx.org/doc/PyMca/latest/_images/xraydata_01.png</image>
+      <caption>Elements Infor</caption>
+    </screenshot>
+  </screenshots>
+  <developer_name>V. Armando Sole</developer_name>
+  <update_contact>sole@esrf.fr</update_contact>
+</component>

package/desktop/peakidentifier.metainfo2.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop">
+    <id>peakidentifier</id>
+  <metadata_license>MIT</metadata_license>
+  <project_license>MIT</project_license>
+  <name>Peak Identifier</name>
+  <summary>Helper to identify x-ray emission lines</summary>
+  <description>
+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.
+  </description>
+  <url type="homepage">https://github.com/vasole/pymca</url>
+  <url type="bugtracker">https://github.com/vasole/pymca/issues</url>
+  <url type="faq">https://sourceforge.net/p/pymca/mailman/pymca-users/</url>
+  <url type="help">http://www.silx.org/doc/pymca/latest/</url>
+  <screenshots>
+    <screenshot type="default">
+      <image>http://www.silx.org/doc/PyMca/latest/_images/quantification_06.png</image>
+      <caption>Peak Identifier</caption>
+    </screenshot>
+  </screenshots>
+  <developer_name>V. Armando Sole</developer_name>
+  <update_contact>sole@esrf.fr</update_contact>
+</component>

package/desktop/pymca.metainfo2.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop">
+    <id>pymca</id>
+  <metadata_license>MIT</metadata_license>
+  <project_license>MIT</project_license>
+  <name>PyMca</name>
+  <summary>PyMca main application</summary>
+  <description>
+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.
+  </description>
+  <url type="homepage">https://github.com/vasole/pymca</url>
+  <url type="bugtracker">https://github.com/vasole/pymca/issues</url>
+  <url type="faq">https://sourceforge.net/p/pymca/mailman/pymca-users/</url>
+  <url type="help">http://www.silx.org/doc/pymca/latest/</url>
+  <screenshots>
+    <screenshot type="default">
+      <image>http://www.silx.org/doc/PyMca/latest/_static/PyMca_256x256.png</image>
+      <caption>PyMca</caption>
+    </screenshot>
+  </screenshots>
+  <developer_name>V. Armando Sole</developer_name>
+  <update_contact>sole@esrf.fr</update_contact>
+</component>

package/desktop/pymcapostbatch.metainfo2.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop">
+    <id>pymcapostbatch</id>
+  <metadata_license>MIT</metadata_license>
+  <project_license>MIT</project_license>
+  <name>PyMca Post-batch tool aka RGB Correlator</name>
+  <summary>Tool for post-processing treatment of data</summary>
+  <description>
+Tool to compare images and find correlations among them. It provides graphical and mathematical tools.
+  </description>
+  <url type="homepage">https://github.com/vasole/pymca</url>
+  <url type="bugtracker">https://github.com/vasole/pymca/issues</url>
+  <url type="faq">https://sourceforge.net/p/pymca/mailman/pymca-users/</url>
+  <url type="help">http://www.silx.org/doc/pymca/latest/</url>
+  <screenshots>
+    <screenshot type="default">
+      <image>http://www.silx.org/doc/PyMca/latest/_static/PyMca_256x256.png</image>
+      <caption>PyMca RGB Correlator</caption>
+    </screenshot>
+  </screenshots>
+  <developer_name>V. Armando Sole</developer_name>
+  <update_contact>sole@esrf.fr</update_contact>
+</component>

package/desktop/pymcaroitool.metainfo2.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop">
+    <id>pymcaroiool</id>
+  <metadata_license>MIT</metadata_license>
+  <project_license>MIT</project_license>
+  <name>PyMca ROI Imaging Tool</name>
+  <summary>Tool to analyze stacked data as those of microscopy applications</summary>
+  <description>
+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...
+  </description>
+  <url type="homepage">https://github.com/vasole/pymca</url>
+  <url type="bugtracker">https://github.com/vasole/pymca/issues</url>
+  <url type="faq">https://sourceforge.net/p/pymca/mailman/pymca-users/</url>
+  <url type="help">http://www.silx.org/doc/pymca/latest/</url>
+  <screenshots>
+    <screenshot type="default">
+      <image>http://www.silx.org/doc/PyMca/latest/_static/PyMca_256x256.png</image>
+      <caption>PyMca ROI Imaging Tool</caption>
+    </screenshot>
+  </screenshots>
+  <developer_name>V. Armando Sole</developer_name>
+  <update_contact>sole@esrf.fr</update_contact>
+</component>

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"