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

Compatibility with python 3.12 #1061

Merged
merged 16 commits into from
Dec 10, 2024
Merged

Compatibility with python 3.12 #1061

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
1ad1fa4
cast to integer
hoanphungt Nov 6, 2024
7a5e484
add wheels support for python 3.12
hoanphungt Nov 6, 2024
099fce4
Update Changes
hoanphungt Nov 6, 2024
8660e82
Spelling
hoanphungt Nov 6, 2024
a46c511
bump h5py and scipy
hoanphungt Nov 12, 2024
6e38f1d
Merge branch 'master' of github.com:nens/threedi-results-analysis int…
hoanphungt Nov 12, 2024
960ede3
update Changes
hoanphungt Nov 12, 2024
cb7cc9f
Merge branch 'master' of github.com:nens/threedi-results-analysis int…
hoanphungt Nov 29, 2024
64326ec
Update Changes
hoanphungt Nov 29, 2024
9ff8ae9
Merge branch 'master' of github.com:nens/threedi-results-analysis int…
hoanphungt Dec 6, 2024
f5d8ce4
Preparing release 3.11.1
hoanphungt Dec 6, 2024
2045069
Back to development: 3.12
hoanphungt Dec 6, 2024
4924db1
revert changes made to the Dockerfile
hoanphungt Dec 9, 2024
ab4030e
revert Changes
hoanphungt Dec 9, 2024
c609c51
Support h5py for both python 3.9 and python 3.12
hoanphungt Dec 10, 2024
174854f
Support scipy for both python 3.9 and 3.12
hoanphungt Dec 10, 2024
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
1 change: 1 addition & 0 deletions CHANGES.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
- Make "Use selected features" behaviour explicit (#1057)
- Added animation settings (#1046)
- Compatibility with Python 3.12 (#1061)
- Bumped h5py to 3.10.0 and scipy to 1.13.0 for python 3.12 compatibility (#1061)


3.10.0 (2024-09-12)
Expand Down
4 changes: 2 additions & 2 deletions dependencies.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,12 +87,12 @@
H5PY_DEPENDENCY = Dependency("h5py", "h5py", "==2.10.0", False)
else:
SUPPORTED_HDF5_VERSIONS = ["1.14.0"]
H5PY_DEPENDENCY = Dependency("h5py", "h5py", "==3.8.0", True)
H5PY_DEPENDENCY = Dependency("h5py", "h5py", "==3.10.0", True)

WINDOWS_PLATFORM_DEPENDENCIES = [Dependency("scipy", "scipy", "==1.6.2", False)]
if QGIS_VERSION >= 32811 and platform.system() == "Windows":
hoanphungt marked this conversation as resolved.
Show resolved Hide resolved
WINDOWS_PLATFORM_DEPENDENCIES = [
Dependency("scipy", "scipy", "==1.10.1", True),
Dependency("scipy", "scipy", "==1.13.0", True),
]

# If you add a dependency, also adjust external-dependencies/populate.sh
Expand Down
16 changes: 8 additions & 8 deletions external-dependencies/populate.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,16 +40,16 @@ mkdir build
cd build

# Download the custom compiled qgis version tar of h5py, create a tar from the distro subfolder
wget http://download.osgeo.org/osgeo4w/v2/x86_64/release/python3/python3-h5py/python3-h5py-3.8.0-1.tar.bz2
tar -xvf python3-h5py-3.8.0-1.tar.bz2
tar -cf h5py-3.8.0.tar -C ./apps/Python39/Lib/site-packages/ .
cp h5py-3.8.0.tar ..
wget http://download.osgeo.org/osgeo4w/v2/x86_64/release/python3/python3-h5py/python3-h5py-3.10.0-1.tar.bz2
hoanphungt marked this conversation as resolved.
Show resolved Hide resolved
tar -xvf python3-h5py-3.10.0-1.tar.bz2
tar -cf h5py-3.10.0.tar -C ./apps/Python312/Lib/site-packages/ .
cp h5py-3.10.0.tar ..

# as well as scipy
wget http://download.osgeo.org/osgeo4w/v2/x86_64/release/python3/python3-scipy/python3-scipy-1.10.1-1.tar.bz2
tar -xvf python3-scipy-1.10.1-1.tar.bz2
tar -cf scipy-1.10.1.tar -C ./apps/Python39/Lib/site-packages/ .
cp scipy-1.10.1.tar ..
wget http://download.osgeo.org/osgeo4w/v2/x86_64/release/python3/python3-scipy/python3-scipy-1.13.0-1.tar.bz2
tar -xvf python3-scipy-1.13.0-1.tar.bz2
tar -cf scipy-1.13.0.tar -C ./apps/Python312/Lib/site-packages/ .
cp scipy-1.13.0.tar ..

# Back up a level and clean up the build/ directory.
cd ..
Expand Down