Merge upstream changes

ISISNeutronMuon · Jan 26, 2024 · 9ead5a1 · 9ead5a1
2 parents 4832743 + be69128
commit 9ead5a1
Show file tree

Hide file tree

Showing 978 changed files with 10,822 additions and 1,715,245 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -0,0 +1,36 @@
+name: Test MDANSE
+
+on: [push, pull_request]
+
+jobs:
+  test:
+    name: Build MDANSE and run tests on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-20.04, windows-2019, macOS-11]
+        python-version: ["3.9", "3.10", "3.11"]
+        # os: [ubuntu-20.04, windows-2019, macOS-11, ubuntu-latest, windows-latest, macOS-latest]
+    if: |
+      !contains( github.ref, 'legacy' )
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: actions/setup-python@v3
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Install build packages
+        run: python -m pip install build wheel setuptools pytest
+
+      - name: Install dependencies
+        run: (cd MDANSE && python -m pip install -r requirements.txt)
+
+      - name: install MDANSE
+        run: (cd MDANSE && python -m pip install .)
+
+      - name: run unit tests
+        run: |
+          cd MDANSE/Tests/UnitTests
+          python -m pytest
diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
@@ -10,7 +10,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-20.04, windows-2019, macOS-11]
-        python-version: ["3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.9", "3.10", "3.11"]
         # os: [ubuntu-20.04, windows-2019, macOS-11, ubuntu-latest, windows-latest, macOS-latest]
     if: |
       !contains( github.ref, 'legacy' )
@@ -28,7 +28,7 @@ jobs:
         run: (cd MDANSE && python -m pip install -r requirements.txt)
 
       - name: Build wheels
-        run: (cd MDANSE && python setup.py bdist_wheel)
+        run: (cd MDANSE && python -m build)
         # to supply options, put them in 'env', like:
         # env:
         #   CIBW_SOME_OPTION: value
@@ -77,7 +77,7 @@ jobs:
         run: (cd MDANSE_GUI && python -m pip install -r requirements.txt)
 
       - name: Build wheels
-        run: (cd MDANSE_GUI && python setup.py bdist_wheel)
+        run: (cd MDANSE_GUI && python -m build)
         # to supply options, put them in 'env', like:
         # env:
         #   CIBW_SOME_OPTION: value

diff --git a/.gitignore b/.gitignore
@@ -7,8 +7,31 @@
 .pydevproject
 .settings
 .vscode
-MANIFEST
 *.pyc
+sandbox/
+
+# Distribution / packaging
+.Python
 build/
+develop-eggs/
 dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# extensions
+*.pyd
 
+# pycharm
+.idea
diff --git a/MDANSE/Data/HDF/dcsf.h5 b/MDANSE/Data/HDF/dcsf.h5
diff --git a/MDANSE/Data/HDF/disf.h5 b/MDANSE/Data/HDF/disf.h5
diff --git a/MDANSE/Data/Jobs_reference_data/ac_reference.nc b/MDANSE/Data/Jobs_reference_data/ac_reference.nc
diff --git a/MDANSE/Data/Jobs_reference_data/apm_reference.nc b/MDANSE/Data/Jobs_reference_data/apm_reference.nc
diff --git a/MDANSE/Data/Jobs_reference_data/btt_reference.nc b/MDANSE/Data/Jobs_reference_data/btt_reference.nc
diff --git a/MDANSE/Data/Jobs_reference_data/castep_reference.nc b/MDANSE/Data/Jobs_reference_data/castep_reference.nc
diff --git a/MDANSE/Data/Jobs_reference_data/ccf_reference.nc b/MDANSE/Data/Jobs_reference_data/ccf_reference.nc
diff --git a/MDANSE/Data/Jobs_reference_data/charmm_reference.nc b/MDANSE/Data/Jobs_reference_data/charmm_reference.nc
diff --git a/MDANSE/Data/Jobs_reference_data/cn_reference.nc b/MDANSE/Data/Jobs_reference_data/cn_reference.nc
diff --git a/MDANSE/Data/Jobs_reference_data/comt_reference.nc b/MDANSE/Data/Jobs_reference_data/comt_reference.nc
diff --git a/MDANSE/Data/Jobs_reference_data/cp2k_reference.nc b/MDANSE/Data/Jobs_reference_data/cp2k_reference.nc
diff --git a/MDANSE/Data/Jobs_reference_data/ct_reference.nc b/MDANSE/Data/Jobs_reference_data/ct_reference.nc
diff --git a/MDANSE/Data/Jobs_reference_data/dacf_reference.nc b/MDANSE/Data/Jobs_reference_data/dacf_reference.nc
diff --git a/MDANSE/Data/Jobs_reference_data/dcsf_reference.nc b/MDANSE/Data/Jobs_reference_data/dcsf_reference.nc
diff --git a/MDANSE/Data/Jobs_reference_data/den_reference.nc b/MDANSE/Data/Jobs_reference_data/den_reference.nc
diff --git a/MDANSE/Data/Jobs_reference_data/dftb_reference.nc b/MDANSE/Data/Jobs_reference_data/dftb_reference.nc
diff --git a/MDANSE/Data/Jobs_reference_data/discover_reference.nc b/MDANSE/Data/Jobs_reference_data/discover_reference.nc
diff --git a/MDANSE/Data/Jobs_reference_data/disf_reference.nc b/MDANSE/Data/Jobs_reference_data/disf_reference.nc
diff --git a/MDANSE/Data/Jobs_reference_data/dl_poly_reference.nc b/MDANSE/Data/Jobs_reference_data/dl_poly_reference.nc
diff --git a/MDANSE/Data/Jobs_reference_data/dmol_reference.nc b/MDANSE/Data/Jobs_reference_data/dmol_reference.nc
diff --git a/MDANSE/Data/Jobs_reference_data/dos_reference.nc b/MDANSE/Data/Jobs_reference_data/dos_reference.nc
diff --git a/MDANSE/Data/Jobs_reference_data/dp_reference.nc b/MDANSE/Data/Jobs_reference_data/dp_reference.nc
diff --git a/MDANSE/Data/Jobs_reference_data/ecc_reference.nc b/MDANSE/Data/Jobs_reference_data/ecc_reference.nc
diff --git a/MDANSE/Data/Jobs_reference_data/eisf_reference.nc b/MDANSE/Data/Jobs_reference_data/eisf_reference.nc
diff --git a/MDANSE/Data/Jobs_reference_data/forcite_reference.nc b/MDANSE/Data/Jobs_reference_data/forcite_reference.nc
diff --git a/MDANSE/Data/Jobs_reference_data/gacf_reference.nc b/MDANSE/Data/Jobs_reference_data/gacf_reference.nc
diff --git a/MDANSE/Data/Jobs_reference_data/gdisf_reference.nc b/MDANSE/Data/Jobs_reference_data/gdisf_reference.nc
diff --git a/MDANSE/Data/Jobs_reference_data/generic_reference.nc b/MDANSE/Data/Jobs_reference_data/generic_reference.nc
diff --git a/MDANSE/Data/Jobs_reference_data/gmft_reference.nc b/MDANSE/Data/Jobs_reference_data/gmft_reference.nc
diff --git a/MDANSE/Data/Jobs_reference_data/gromacs_reference.nc b/MDANSE/Data/Jobs_reference_data/gromacs_reference.nc
diff --git a/MDANSE/Data/Jobs_reference_data/lammps_reference.nc b/MDANSE/Data/Jobs_reference_data/lammps_reference.nc
diff --git a/MDANSE/Data/Jobs_reference_data/msd_reference.nc b/MDANSE/Data/Jobs_reference_data/msd_reference.nc
diff --git a/MDANSE/Data/Jobs_reference_data/mt_reference.nc b/MDANSE/Data/Jobs_reference_data/mt_reference.nc
diff --git a/MDANSE/Data/Jobs_reference_data/namd_reference.nc b/MDANSE/Data/Jobs_reference_data/namd_reference.nc
diff --git a/MDANSE/Data/Jobs_reference_data/ndtsf_reference.nc b/MDANSE/Data/Jobs_reference_data/ndtsf_reference.nc
diff --git a/MDANSE/Data/Jobs_reference_data/op_reference.nc b/MDANSE/Data/Jobs_reference_data/op_reference.nc
diff --git a/MDANSE/Data/Jobs_reference_data/pacf_reference.nc b/MDANSE/Data/Jobs_reference_data/pacf_reference.nc
diff --git a/MDANSE/Data/Jobs_reference_data/pdb_reference.nc b/MDANSE/Data/Jobs_reference_data/pdb_reference.nc
diff --git a/MDANSE/Data/Jobs_reference_data/pdf_reference.nc b/MDANSE/Data/Jobs_reference_data/pdf_reference.nc
diff --git a/MDANSE/Data/Jobs_reference_data/rbt_reference.nc b/MDANSE/Data/Jobs_reference_data/rbt_reference.nc
diff --git a/MDANSE/Data/Jobs_reference_data/rmsd_reference.nc b/MDANSE/Data/Jobs_reference_data/rmsd_reference.nc
diff --git a/MDANSE/Data/Jobs_reference_data/rmsf_reference.nc b/MDANSE/Data/Jobs_reference_data/rmsf_reference.nc
diff --git a/MDANSE/Data/Jobs_reference_data/rmt_reference.nc b/MDANSE/Data/Jobs_reference_data/rmt_reference.nc
diff --git a/MDANSE/Data/Jobs_reference_data/rog_reference.nc b/MDANSE/Data/Jobs_reference_data/rog_reference.nc
diff --git a/MDANSE/Data/Jobs_reference_data/sas_reference.nc b/MDANSE/Data/Jobs_reference_data/sas_reference.nc
diff --git a/MDANSE/Data/Jobs_reference_data/sd_reference.nc b/MDANSE/Data/Jobs_reference_data/sd_reference.nc
diff --git a/MDANSE/Data/Jobs_reference_data/sffsf_reference.nc b/MDANSE/Data/Jobs_reference_data/sffsf_reference.nc
diff --git a/MDANSE/Data/Jobs_reference_data/ssf_reference.nc b/MDANSE/Data/Jobs_reference_data/ssf_reference.nc
diff --git a/MDANSE/Data/Jobs_reference_data/temp_reference.nc b/MDANSE/Data/Jobs_reference_data/temp_reference.nc
diff --git a/MDANSE/Data/Jobs_reference_data/ut_reference.nc b/MDANSE/Data/Jobs_reference_data/ut_reference.nc
diff --git a/MDANSE/Data/Jobs_reference_data/vacf_reference.nc b/MDANSE/Data/Jobs_reference_data/vacf_reference.nc
diff --git a/MDANSE/Data/Jobs_reference_data/vasp_reference.nc b/MDANSE/Data/Jobs_reference_data/vasp_reference.nc
diff --git a/MDANSE/Data/Jobs_reference_data/vo_reference.nc b/MDANSE/Data/Jobs_reference_data/vo_reference.nc
diff --git a/MDANSE/Data/Jobs_reference_data/xplor_reference.nc b/MDANSE/Data/Jobs_reference_data/xplor_reference.nc
diff --git a/MDANSE/Data/Jobs_reference_data/xssf_reference.nc b/MDANSE/Data/Jobs_reference_data/xssf_reference.nc