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

Jump to bottom

Use python3.11 for Powershell script installation of oq and mbtk #384

Merged
merged 3 commits into from
Jan 17, 2024
Merged

Use python3.11 for Powershell script installation of oq and mbtk #384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
799c131
use python3.11 instead that pytho3.10
antonioettorre Jan 17, 2024
83e6585
change setup.py to allow pytho3.12
antonioettorre Jan 17, 2024
1990503
Merge branch 'master' of github.com:GEMScienceTools/oq-mbtk into ae-p…
antonioettorre Jan 17, 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
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ def get_version():
'igraph',
# 'GDAL',
],
python_requires='>=3.10,<3.11',
python_requires='>=3.10,<3.12',
author='GEM Foundation',
author_email='hazard@globalquakemodel.org',
maintainer='GEM Foundation',
Expand Down
6 changes: 3 additions & 3 deletions windows/install_oqmbtk.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ if (Test-Path -Path $workDir) {
}
Write-Host "Current Working Directory: $workDir"
Write-Host "Download and Installation of python embeddable package"
Invoke-WebRequest -Uri https://www.python.org/ftp/python/3.10.8/python-3.10.8-embed-amd64.zip -OutFile .\python.zip
Invoke-WebRequest -Uri https://www.python.org/ftp/python/3.11.7/python-3.11.7-embed-amd64.zip -OutFile .\python.zip
Expand-Archive -Path .\python.zip -DestinationPath .\mbtk -Verbose
Remove-Item .\python.zip
cd $workDir
Expand All @@ -48,13 +48,13 @@ Set-Alias -Name python -Value $Env:PY_HOME\python.exe
Set-Alias -Name pip -Value $Env:PY_PIP\pip.exe
#
python .\get-pip.py
Move-Item .\python310._pth .\python310._pth.old
Move-Item .\python311._pth .\python311._pth.old
#
pip install pytest
Write-Host "clone of the branch $branch for oq-engine and install in developer mode"
git clone --depth=1 https://github.com/gem/oq-engine.git
cd .\oq-engine\
pip install -r .\requirements-py310-win64.txt
pip install -r .\requirements-py311-win64.txt
pip install -e .
cd ..
Write-Host "clone of the branch $branch for oq-mbtk and install in developer mode"
Expand Down
Loading