Skip to content

Commit 60f9a78

Browse files
vot4antovot4anto
authored
Merge pull request #183 from gem/rm_vmtk
remove vmtk from installer for now
2 parents 3a8cdb5 + 4f5a03f commit 60f9a78

File tree

5 files changed

+50
-48
lines changed

5 files changed

+50
-48
lines changed

‎.github/workflows/windows_package.yml

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -134,23 +134,24 @@ jobs:
134134
python.exe -m pip install pytest
135135
pytest -vsx .\oq-mbtk\openquake\cat
136136
if: github.event.inputs.oq-science == '1'
137-
- name: Compare files of VMTK
138-
run: |
139-
$env:PATH="$env:LOCALAPPDATA\Programs\OpenQuake Engine\python3"
140-
$env:PATH="$env:PATH;$env:LOCALAPPDATA\Programs\OpenQuake Engine\python3\Scripts"
141-
python.exe -V
142-
cd "$env:LOCALAPPDATA\Programs\OpenQuake Engine"
143-
cd "oq-vmtk\demonstration_files"
144-
dir
145-
python.exe computation_scripts_example_lite.py
146-
cd "outputs\out_dynamic_an_edps_imls\CR_LFINF-CDN_H1"
147-
dir
148-
$dirB = "$env:GITHUB_WORKSPACE\ci\to_compare"
149-
$dirA = "$env:LOCALAPPDATA\Programs\OpenQuake Engine\oq-vmtk\demonstration_files\outputs\out_dynamic_an_edps_imls\CR_LFINF-CDN_H1"
150-
if ( Compare-Object (Get-Content $dirA\max_accels.csv) -DifferenceObject (Get-Content $dirB\max_accels.csv) -SyncWindow 0 ) { exit 1} else {"Files are the same"}
151-
if ( Compare-Object (Get-Content $dirA\imls.csv) -DifferenceObject (Get-Content $dirB\imls.csv) -SyncWindow 0 ) {exit 1} else {"Files are the same"}
152-
if ( Compare-Object (Get-Content $dirA\max_disps.csv) -DifferenceObject (Get-Content $dirB\max_disps.csv) -SyncWindow 0 ) {exit 1} else {"Files are the same"}
153-
if: github.event.inputs.oq-science == '1'
137+
# Removed VMTK
138+
#- name: Compare files of VMTK
139+
# run: |
140+
# $env:PATH="$env:LOCALAPPDATA\Programs\OpenQuake Engine\python3"
141+
# $env:PATH="$env:PATH;$env:LOCALAPPDATA\Programs\OpenQuake Engine\python3\Scripts"
142+
# python.exe -V
143+
# cd "$env:LOCALAPPDATA\Programs\OpenQuake Engine"
144+
# cd "oq-vmtk\demonstration_files"
145+
# dir
146+
# python.exe computation_scripts_example_lite.py
147+
# cd "outputs\out_dynamic_an_edps_imls\CR_LFINF-CDN_H1"
148+
# dir
149+
# $dirB = "$env:GITHUB_WORKSPACE\ci\to_compare"
150+
# $dirA = "$env:LOCALAPPDATA\Programs\OpenQuake Engine\oq-vmtk\demonstration_files\outputs\out_dynamic_an_edps_imls\CR_LFINF-CDN_H1"
151+
# if ( Compare-Object (Get-Content $dirA\max_accels.csv) -DifferenceObject (Get-Content $dirB\max_accels.csv) -SyncWindow 0 ) { exit 1} else {"Files are the same"}
152+
# if ( Compare-Object (Get-Content $dirA\imls.csv) -DifferenceObject (Get-Content $dirB\imls.csv) -SyncWindow 0 ) {exit 1} else {"Files are the same"}
153+
# if ( Compare-Object (Get-Content $dirA\max_disps.csv) -DifferenceObject (Get-Content $dirB\max_disps.csv) -SyncWindow 0 ) {exit 1} else {"Files are the same"}
154+
# if: github.event.inputs.oq-science == '1'
154155
- run: |
155156
Get-ChildItem -Path ${{ github.workspace }}
156157
- name: Sign files with Trusted Signing

‎.github/workflows/windows_with_mtk.yaml

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -123,20 +123,20 @@ jobs:
123123
python.exe -m pip install pytest
124124
pytest -vsx .\oq-mbtk\openquake\cat
125125
if: github.event.inputs.oq-science == '1'
126-
- name: Compare files of VMTK
127-
run: |
128-
$env:PATH="$env:LOCALAPPDATA\Programs\OpenQuake Engine\python3"
129-
$env:PATH="$env:PATH;$env:LOCALAPPDATA\Programs\OpenQuake Engine\python3\Scripts"
130-
python.exe -V
131-
cd "$env:LOCALAPPDATA\Programs\OpenQuake Engine"
132-
cd "oq-vmtk\demonstration_files"
133-
dir
134-
python.exe computation_scripts_example_lite.py
135-
cd "outputs\out_dynamic_an_edps_imls\CR_LFINF-CDN_H1"
136-
dir
137-
$dirB = "$env:GITHUB_WORKSPACE\ci\to_compare"
138-
$dirA = "$env:LOCALAPPDATA\Programs\OpenQuake Engine\oq-vmtk\demonstration_files\outputs\out_dynamic_an_edps_imls\CR_LFINF-CDN_H1"
139-
if ( Compare-Object (Get-Content $dirA\max_accels.csv) -DifferenceObject (Get-Content $dirB\max_accels.csv) -SyncWindow 0 ) { exit 1} else {"Files are the same"}
140-
if ( Compare-Object (Get-Content $dirA\imls.csv) -DifferenceObject (Get-Content $dirB\imls.csv) -SyncWindow 0 ) {exit 1} else {"Files are the same"}
141-
if ( Compare-Object (Get-Content $dirA\max_disps.csv) -DifferenceObject (Get-Content $dirB\max_disps.csv) -SyncWindow 0 ) {exit 1} else {"Files are the same"}
142-
if: github.event.inputs.oq-science == '1'
126+
#- name: Compare files of VMTK
127+
# run: |
128+
# $env:PATH="$env:LOCALAPPDATA\Programs\OpenQuake Engine\python3"
129+
# $env:PATH="$env:PATH;$env:LOCALAPPDATA\Programs\OpenQuake Engine\python3\Scripts"
130+
# python.exe -V
131+
# cd "$env:LOCALAPPDATA\Programs\OpenQuake Engine"
132+
# cd "oq-vmtk\demonstration_files"
133+
# dir
134+
# python.exe computation_scripts_example_lite.py
135+
# cd "outputs\out_dynamic_an_edps_imls\CR_LFINF-CDN_H1"
136+
# dir
137+
# $dirB = "$env:GITHUB_WORKSPACE\ci\to_compare"
138+
# $dirA = "$env:LOCALAPPDATA\Programs\OpenQuake Engine\oq-vmtk\demonstration_files\outputs\out_dynamic_an_edps_imls\CR_LFINF-CDN_H1"
139+
# if ( Compare-Object (Get-Content $dirA\max_accels.csv) -DifferenceObject (Get-Content $dirB\max_accels.csv) -SyncWindow 0 ) { exit 1} else {"Files are the same"}
140+
# if ( Compare-Object (Get-Content $dirA\imls.csv) -DifferenceObject (Get-Content $dirB\imls.csv) -SyncWindow 0 ) {exit 1} else {"Files are the same"}
141+
# if ( Compare-Object (Get-Content $dirA\max_disps.csv) -DifferenceObject (Get-Content $dirB\max_disps.csv) -SyncWindow 0 ) {exit 1} else {"Files are the same"}
142+
# if: github.event.inputs.oq-science == '1'

‎installers/windows/nsis/docker/build.sh

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,10 @@ if [ $GEM_SET_BUILD_SCIENCE == 1 ]; then
116116
cd oq-mbtk
117117
wine ../../python-dist/python3/python.exe -m build -x -w . -o ../../oq-dist/oq-mbtk
118118
cd ..
119-
echo "Extracting python wheels for VMTK-Vulnerability-Modellers-ToolKit"
120-
git clone -b master --depth=1 https://github.com/GEMScienceTools/VMTK-Vulnerability-Modellers-ToolKit.git $(pwd)/oq-vmtk
121-
wine ../python-dist/python3/python.exe -m pip install --disable-pip-version-check --no-warn-script-location -r oq-vmtk/requirements_win64.txt
119+
# FOR NOW remove VMTK that is the old repos
120+
#echo "Extracting python wheels for VMTK-Vulnerability-Modellers-ToolKit"
121+
#git clone -b master --depth=1 https://github.com/GEMScienceTools/VMTK-Vulnerability-Modellers-ToolKit.git $(pwd)/oq-vmtk
122+
#wine ../python-dist/python3/python.exe -m pip install --disable-pip-version-check --no-warn-script-location -r oq-vmtk/requirements_win64.txt
122123
fi
123124

124125
cd $DIR/oq-dist
@@ -145,10 +146,11 @@ if [ $GEM_SET_BUILD_SCIENCE == 1 ]; then
145146
echo "Working in: $(pwd)"
146147
sed -i '/^#GEM_SET_BUILD_SCIENCE/r science.sec' installer.nsi
147148
sed -i 's/\-no\-toolkit/\-with\-toolkit/g' installer.nsi
149+
# FOR NOW remove VMTK that is the old repos
148150
# Get a copy of VMTK master repo
149-
echo "Clone VMTK repos"
150-
mkdir $(pwd)/oq-vmtk
151-
git clone -b master --depth=1 https://github.com/GEMScienceTools/VMTK-Vulnerability-Modellers-ToolKit.git $(pwd)/oq-vmtk
151+
#echo "Clone VMTK repos"
152+
#mkdir $(pwd)/oq-vmtk
153+
#git clone -b master --depth=1 https://github.com/GEMScienceTools/VMTK-Vulnerability-Modellers-ToolKit.git $(pwd)/oq-vmtk
152154
echo "Clone MBTK repos"
153155
git clone -b master --depth=1 https://github.com/GEMScienceTools/oq-mbtk.git
154156
echo "Add GMT "

‎installers/windows/nsis/installer.nsi.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ Section "Uninstall"
246246
Delete "$INSTDIR\${PRODUCT_ICON}"
247247
RMDir /r "$INSTDIR\GMT"
248248
RMDir /r "$INSTDIR\oq-mbtk"
249-
RMDir /r "$INSTDIR\oq-vmtk"
249+
; RMDir /r "$INSTDIR\oq-vmtk"
250250
RMDir /r "$INSTDIR\python3"
251251
; Uninstall files
252252
Delete "$INSTDIR\README.html"

‎installers/windows/nsis/science.sec

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,9 @@ Section "!OpenQuake Model Building Toolkit" SecMbtk
1010
DetailPrint "Download the OpenQuake Model Building Toolkit and dependencies"
1111
SectionEnd
1212

13-
Section "!OpenQuake VMTK" SecVmtk
14-
SectionIn RO
15-
SetOutPath "$INSTDIR\oq-vmtk"
16-
File /r /x ".gitignore" "oq-vmtk\*.*"
17-
DetailPrint "Download the OpenQuake Vulnerability-Modellers-ToolKit..."
18-
SectionEnd
19-
13+
;Section "!OpenQuake VMTK" SecVmtk
14+
; SectionIn RO
15+
; SetOutPath "$INSTDIR\oq-vmtk"
16+
; File /r /x ".gitignore" "oq-vmtk\*.*"
17+
; DetailPrint "Download the OpenQuake Vulnerability-Modellers-ToolKit..."
18+
;SectionEnd

0 commit comments

Comments
 (0)