Merge branch 'main' into 2249-use-generic-stylesheet

SasView · Sep 17, 2023 · 0ed78c3 · 0ed78c3
2 parents 9bedc88 + 90e45b7
commit 0ed78c3
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -32,7 +32,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: 3.8
+          python-version: 3.9
 
       - uses: actions/checkout@v3
       - id: set-matrix
@@ -195,7 +195,7 @@ jobs:
       - name: Install utilities to build installer
         if: ${{ matrix.installer }}
         run: |
-          python -m pip install pyinstaller==5.7.0
+          python -m pip install pyinstaller
 
       - name: Build sasview with pyinstaller
         if: ${{ matrix.installer }}
@@ -283,7 +283,7 @@ jobs:
     strategy:
       matrix:
         os: [ windows-latest, ubuntu-20.04 ]
-        python-version: [ 3.8 ]
+        python-version: [ 3.11 ]
       fail-fast: false
 
     name: Test installer

diff --git a/.github/workflows/matrix.py b/.github/workflows/matrix.py
@@ -38,11 +38,12 @@
 
 # List of python versions to use for release builds
 python_release_list = [
-    '3.8',
+    '3.11',
 ]
 
 # List of python versions to use for tests
 python_test_list = python_release_list + [
+    '3.8',
     '3.9',
     '3.10'
 ]

diff --git a/build_tools/requirements.txt b/build_tools/requirements.txt
@@ -1,5 +1,5 @@
-numpy<1.24
-scipy==1.10.0 
+numpy 
+scipy
 docutils 
 pytest
 pytest_qt
@@ -10,7 +10,6 @@ h5py
 sphinx
 pyparsing 
 html5lib 
-reportlab==3.6.6 
 pybind11 
 appdirs
 six 
@@ -22,7 +21,7 @@ xhtml2pdf
 pylint
 periodictable 
 uncertainties 
-matplotlib~=3.5.2
+matplotlib
 lxml
 pytools 
 cffi
@@ -33,7 +32,7 @@ bumps
 html2text
 jsonschema
 pywin32; platform_system == "Windows"
-PySide6==6.2.4
+PySide6==6.4.3
 twisted
 zope
 superqt

diff --git a/src/sas/qtgui/Utilities/GuiUtils.py b/src/sas/qtgui/Utilities/GuiUtils.py
@@ -1147,7 +1147,7 @@ def jdefault(o):
         objects that can't otherwise be serialized need to be converted
         """
         # tuples and sets (TODO: default JSONEncoder converts tuples to lists, create custom Encoder that preserves tuples)
-        if isinstance(o, (tuple, set, np.float)):
+        if isinstance(o, (tuple, set, float)):
             content = { 'data': list(o) }
             return add_type(content, type(o))
 

diff --git a/src/sas/sascalc/pr/p_invertor.py b/src/sas/sascalc/pr/p_invertor.py
@@ -14,11 +14,11 @@
 
 class Pinvertor(object):
     #q data
-    x = np.empty(0, dtype=np.float)
+    x = np.empty(0, dtype=np.float64)
     #I(q) data
-    y = np.empty(0, dtype=np.float)
+    y = np.empty(0, dtype=np.float64)
     #dI(q) data
-    err = np.empty(0, dtype=np.float)
+    err = np.empty(0, dtype=np.float64)
     #Number of q points
     npoints = 0
     #Number of I(q) points