Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added 3.11, removed 3.8 #2582

Merged
merged 10 commits into from
Sep 17, 2023
+13 −12
Merged

Added 3.11, removed 3.8 #2582

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d18d02b
removed 3.8 from releases, added 3.10 and 3.11.
rozyczko Jul 14, 2023
af72c99
unlock scipy version to allow python 3.11
rozyczko Aug 3, 2023
f18ca5a
unlock pyside6 as well
rozyczko Aug 3, 2023
e6f0b1a
removed pinning on reportlab and MPL
rozyczko Aug 3, 2023
15928a5
removed np.float to appease numpy
rozyczko Aug 3, 2023
1e2eb33
use explicit numpy types
rozyczko Aug 8, 2023
0442c77
have the release 3.11 only. (but run tests on >=3.9)
rozyczko Aug 29, 2023
674327d
do installer testing only on python version which is actually being
rozyczko Sep 16, 2023
78b5d84
Merge branch 'main' into ci_updated_python
rozyczko Sep 16, 2023
fe86fb5
Merge branch 'main' into ci_updated_python
Sep 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 }}
Expand Down Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/matrix.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
]
Expand Down
8 changes: 4 additions & 4 deletions build_tools/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
numpy<1.24
scipy==1.10.0
numpy
scipy
docutils
pytest
pytest_qt
Expand All @@ -21,7 +21,7 @@ xhtml2pdf
pylint
periodictable
uncertainties
matplotlib~=3.5.2
matplotlib
lxml
pytools
cffi
Expand All @@ -32,7 +32,7 @@ bumps
html2text
jsonschema
pywin32; platform_system == "Windows"
PySide6==6.2.4
PySide6==6.4.3
twisted
zope
superqt
Expand Down
2 changes: 1 addition & 1 deletion src/sas/qtgui/Utilities/GuiUtils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1136,7 +1136,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))

Expand Down
6 changes: 3 additions & 3 deletions src/sas/sascalc/pr/p_invertor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down