Merge pull request #2696 from kif/validate_3.14

Validate on python 3.14

Author: kif

.github/workflows/python-package.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.10', '3.11', '3.12', '3.13']
+        python-version: ['3.10', '3.11', '3.12', '3.13', '3.14']
 
     steps:
     - uses: actions/checkout@v4

ci/requirements_gh.txt

@@ -21,5 +21,8 @@ pyopencl
 numexpr != 2.8.6
 silx >= 2
 psutil
+# Needed for ImageD11:
+numba; python_version < '3.14'
+numba>=0.63.0b1; python_version >= '3.14'
 ImageD11
 importlib_resources; python_version < '3.9'

requirements.txt

@@ -10,7 +10,8 @@ numexpr != 2.8.6
 h5py
 silx >= 2
 PyOpenGL
-PySide6
+PySide6; python_version < '3.14'
+pyqt6; python_version >= '3.14'
 hdf5plugin
 nbsphinx
 pydata-sphinx-theme

src/pyFAI/geometry/fit2d.py

@@ -38,6 +38,7 @@
 __docformat__ = 'restructuredtext'
 
 import os
+import typing
 import logging
 from ..utils.dataclasses import case_insensitive_dataclass
 from math import pi, cos, sin, sqrt, acos, asin
@@ -85,7 +86,7 @@ def _fromdict(cls, dico):
 
     def _asdict(self):
         "Mirror of _asdict method from NamedTuple"
-        return {k: self.__getattr__(k) for k in self.__annotations__}
+        return {k: self.__getattr__(k) for k in typing.get_type_hints(self.__class__)}
 
     def __repr__(self):
         return f"DirectBeamDist= {self.directDist:.3f} mm\tCenter: x={self.centerX:.3f}, y={self.centerY:.3f} pix\t"\