Skip to content

Commit

Permalink
Merging rupture creation updates w/ unrelated updates
Browse files Browse the repository at this point in the history
  • Loading branch information
cossatot committed Jan 18, 2024
2 parents 9996009 + 063d53b commit bbbe583
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 12 deletions.
16 changes: 12 additions & 4 deletions .github/workflows/test_win64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,21 @@ on:
jobs:
test:
name: Windows Installation
runs-on: windows-latest
runs-on: windows-2019
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Installation of GMT from standalone
run: |
Invoke-WebRequest -Uri "https://github.com/GenericMappingTools/gmt/releases/download/6.4.0/gmt-6.4.0-win64.exe" -OutFile $HOME\gmt.exe
cd $HOME
$Install = Get-ChildItem -Filter gmt*.exe
Start-Process -FilePath $Install.Fullname -ArgumentList "/S" -Wait
$Env:PATH += ";C:\programs\gmt6\bin"
Write-Host ${env:PATH}
- name: Run scripts to install on windows
run: |
Write-Host "Set LIBRARY PATH for GMT"
$Env:GMT_LIBRARY_PATH="C:\programs\gmt6\bin"
Write-Host "Git branch for Run action "${Env:GIT_BRANCH}
#
$curDir = Get-Location
Expand All @@ -36,13 +46,11 @@ jobs:
Write-Host "Print all environments variables to check"
dir env:
Write-Host "Print all pypip packages"
pip freeze
pip list
$MBTK = $HOME + "\mbtk"
Write-Host "MBTK Directory: $MBTK"
Set-Location -Path $MBTK
$curDir = Get-Location
Write-Host "Current Working Directory: $curDir"
Get-ChildItem -Path .\windows –recurse
cd oq-mbtk\openquake
pytest -vs --color=yes --durations=10 cat ghm man mbt sub wkf smt
8 changes: 4 additions & 4 deletions requirements_win64.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# OQ mbtk requirements
# From OQ wheels
#
https://wheelhouse.openquake.org/v3/windows/py310/numpy-1.23.3-cp310-cp310-win_amd64.whl
https://wheelhouse.openquake.org/v3/windows/py310/pyproj-3.6.1-cp310-cp310-win_amd64.whl
https://wheelhouse.openquake.org/v3/windows/py310/GDAL-3.7.3-cp310-cp310-win_amd64.whl
https://wheelhouse.openquake.org/v3/windows/py310/fiona-1.9.5-cp310-cp310-win_amd64.whl
https://wheelhouse.openquake.org/v3/windows/py311/numpy-1.26.2-cp311-cp311-win_amd64.whl
https://wheelhouse.openquake.org/v3/windows/py311/pyproj-3.6.1-cp311-cp311-win_amd64.whl
https://wheelhouse.openquake.org/v3/windows/py311/GDAL-3.7.3-cp311-cp311-win_amd64.whl
https://wheelhouse.openquake.org/v3/windows/py311/fiona-1.9.5-cp311-cp311-win_amd64.whl
#
# Version specific
geopandas >= 0.10.2
Expand Down
2 changes: 1 addition & 1 deletion setup.py
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='[email protected]',
maintainer='GEM Foundation',
Expand Down
6 changes: 3 additions & 3 deletions windows/install_oqmbtk.ps1
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

0 comments on commit bbbe583

Please sign in to comment.