Merge pull request #226 from hasanjawad001/jawad-dev

Fixed python compatibility and support for (3.10-3.13), added utility for BEPS/loop fitting, and fixed missing fitter imports

Author: ramav87

.github/workflows/actions.yml

@@ -1,7 +1,7 @@
 name: build
 
 env:
-  PYTHON_MAIN_VERSION: 3.9
+  PYTHON_MAIN_VERSION: "3.10"
 
 on:
   pull_request:
@@ -19,14 +19,14 @@ jobs:
     strategy:
       max-parallel: 5
       matrix:
-        python-version: [3.9, "3.10", "3.11"]
+        python-version: ["3.10", "3.11", "3.12", "3.13"]
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Set up Python ${{ matrix.python-version }}
 
-      uses: actions/setup-python@v3
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
@@ -57,8 +57,9 @@ jobs:
         pytest --cov=./ --cov-report=xml
         
     - name: Upload coverage to Codecov
-      if: ${{ matrix.python-version == env.PYTHON_MAIN_VERSION }}
-      uses: codecov/codecov-action@v3
+      # if: ${{ matrix.python-version == env.PYTHON_MAIN_VERSION }}
+      if: ${{ github.repository == 'pycroscopy/sidpy' && matrix.python-version == env.PYTHON_MAIN_VERSION }}
+      uses: codecov/codecov-action@v4
       with:
         token: ${{ secrets.CODECOV_TOKEN }}
         files: ./coverage.xml

.gitignore

@@ -110,3 +110,4 @@ test_scripts/
 /docs/source/_autosummary/
 /docs/source/notebooks/
 tests/test.h5
+tests/proc/inputs/

setup.py

@@ -15,7 +15,7 @@
                 'toolz',  # dask installation failing without this
                 'cytoolz',  # dask installation failing without this
                 'dask',
-                'dask-ml',
+                'dask-ml>=2025.1.0',
                 'h5py>=2.6.0',
                 'matplotlib>=2.0.0',
                 'distributed>=2.0.0',
@@ -24,11 +24,12 @@
                 'ipywidgets',
                 'ipykernel',
                 'ipython',  # Beginning with IPython 6.0, Python 3.3 and above is required.
-                'scikit-learn',
+                'scikit-learn>=1.6.1',
                 'scipy',
                 'ase',
                 'ipympl',
-                'dill'
+                'dill',
+                'pyswarms>=1.3.0'
                 ]
 
 setup(