Skip to content

Commit

Permalink
Merge pull request #63 from Geode-solutions/fix/rename_app
Browse files Browse the repository at this point in the history
fix(app): change commands in all scripts
  • Loading branch information
JulienChampagnol authored Oct 30, 2024
2 parents 36e8928 + 5cb6b70 commit 523a2bd
Show file tree
Hide file tree
Showing 15 changed files with 129 additions and 130 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/CICD.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
- name: Release
run: |
cd release/${{ needs.semantic.outputs.version }}
gh release upload v${{ needs.semantic.outputs.version }} geodeapp* latest*
gh release upload v${{ needs.semantic.outputs.version }} vease* latest*
shell: bash

merge:
Expand Down
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,5 @@ logs
/electron-server/venv_viewer
/release
/uploads
geodeapp_back*
geodeapp_viewer*
vease-back*
vease-viewer*
32 changes: 22 additions & 10 deletions electron-builder.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,28 +9,40 @@
"dist-electron"
],
"extraResources": [
"./geodeapp_back*",
"./geodeapp_viewer*"
"./vease-back*",
"./vease-viewer*"
],
"linux": {
"artifactName": "${productName}_${platform}_${version}.${ext}",
"artifactName": "${productName}.${ext}",
"category": "Science",
"target": ["AppImage", "zip"],
"publish": ["github"]
"target": [
"AppImage",
"zip"
],
"publish": [
"github"
]
},
"win": {
"artifactName": "${productName}_${platform}_${version}.${ext}",
"artifactName": "${productName}.${ext}",
"sign": "./customSign.js",
"signingHashAlgorithms": ["sha256"],
"target": ["nsis", "zip"],
"publish": ["github"]
"signingHashAlgorithms": [
"sha256"
],
"target": [
"nsis",
"zip"
],
"publish": [
"github"
]
},
"publish": [
{
"provider": "github",
"host": "github.com",
"owner": "Geode-solutions",
"repo": "GeodeApp"
"repo": "Vease"
}
]
}
6 changes: 3 additions & 3 deletions electron-server/install_back.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ Remove-Item -Recurse -Force .\electron-server\build\ -ErrorAction:SilentlyContin
$folder=".\electron-server\venv_back"
python -m venv $folder

$bin_folder = $folder + "\Lib\site-packages\geodeapp_back"
$bin_folder = $folder + "\Lib\site-packages\vease_back"
.\electron-server\venv_back\Scripts\Activate

pip install -r .\electron-server\requirements_back.txt
pip install pyinstaller
pyinstaller --onefile --collect-data opengeodeweb_back --collect-data geodeapp_back $bin_folder\app.py --distpath .\electron-server\dist_back -n geodeapp_back --clean
Copy-Item .\electron-server\dist_back\geodeapp_back.exe .\
pyinstaller --onefile --collect-data opengeodeweb_back --collect-data vease_back $bin_folder\app.py --distpath .\electron-server\dist_back -n vease-back --clean
Copy-Item .\electron-server\dist_back\vease-back.exe .\
4 changes: 2 additions & 2 deletions electron-server/install_back.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ source $bin_folder/activate
packages_path=$folder/lib/python3.10/site-packages
pip install -r electron-server/requirements_back.txt
pip install pyinstaller
pyinstaller --onefile --collect-data opengeodeweb_back $packages_path/geodeapp_back/app.py --distpath ./electron-server/dist_back -n geodeapp_back --clean
cp ./electron-server/dist_back/geodeapp_back ./
pyinstaller --onefile --collect-data opengeodeweb_back $packages_path/vease_back/app.py --distpath ./electron-server/dist_back -n vease-back --clean
cp ./electron-server/dist_back/vease-back ./
6 changes: 3 additions & 3 deletions electron-server/install_viewer.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ Remove-Item -Recurse -Force .\electron-server\build\ -ErrorAction:SilentlyContin
$folder=".\electron-server\venv_viewer"
python -m venv $folder

$bin_folder = $folder + "\Lib\site-packages\geodeapp_viewer"
$bin_folder = $folder + "\Lib\site-packages\vease_viewer"
.\electron-server\venv_viewer\Scripts\Activate

pip install -r .\electron-server\requirements_viewer.txt
pip install pyinstaller
pyinstaller --onefile --collect-data opengeodeweb_viewer --collect-all vtkmodules $bin_folder\app.py --distpath .\electron-server\dist_viewer -n geodeapp_viewer --clean
Copy-Item .\electron-server\dist_viewer\geodeapp_viewer.exe .\
pyinstaller --onefile --collect-data opengeodeweb_viewer --collect-all vtkmodules $bin_folder\app.py --distpath .\electron-server\dist_viewer -n vease-viewer --clean
Copy-Item .\electron-server\dist_viewer\vease-viewer.exe .\
4 changes: 2 additions & 2 deletions electron-server/install_viewer.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ source $bin_folder/activate
packages_path=$folder/lib/python3.10/site-packages
pip install -r electron-server/requirements_viewer.txt
pip install pyinstaller
pyinstaller --onefile --collect-data opengeodeweb_viewer --collect-all vtkmodules $packages_path/geodeapp_viewer/app.py --distpath ./electron-server/dist_viewer -n geodeapp_viewer --clean
cp ./electron-server/dist_viewer/geodeapp_viewer ./
pyinstaller --onefile --collect-data opengeodeweb_viewer --collect-all vtkmodules $packages_path/vease_viewer/app.py --distpath ./electron-server/dist_viewer -n vease-viewer --clean
cp ./electron-server/dist_viewer/vease-viewer ./
2 changes: 1 addition & 1 deletion electron-server/requirements_back.in
Original file line number Diff line number Diff line change
@@ -1 +1 @@
geodeapp-back
vease-back
69 changes: 34 additions & 35 deletions electron-server/requirements_back.txt
Original file line number Diff line number Diff line change
@@ -1,50 +1,48 @@
#
# This file is autogenerated by pip-compile with Python 3.11
# This file is autogenerated by pip-compile with Python 3.10
# by the following command:
#
# pip-compile electron-server/requirements_back.in
#
asgiref==3.8.1
# via
# flask
# geodeapp-back
# opengeodeweb-back
# vease-back
attrs==24.2.0
# via
# geodeapp-back
# jsonschema
# opengeodeweb-back
# referencing
# vease-back
blinker==1.8.2
# via
# flask
# geodeapp-back
# opengeodeweb-back
# vease-back
click==8.1.7
# via
# flask
# geodeapp-back
# opengeodeweb-back
# vease-back
colorama==0.4.6
# via
# click
# geodeapp-back
# via vease-back
flask[async]==3.0.3
# via
# flask-cors
# geodeapp-back
# opengeodeweb-back
# vease-back
flask-cors==5.0.0
# via
# geodeapp-back
# opengeodeweb-back
# vease-back
geode-background==8.6.1
# via
# geode-explicit
# geode-implicit
# geode-simplex
# geodeapp-back
# opengeodeweb-back
# vease-back
geode-common==33.0.4
# via
# geode-background
Expand All @@ -54,64 +52,62 @@ geode-common==33.0.4
# geode-numerics
# geode-simplex
# geode-viewables
# geodeapp-back
# opengeodeweb-back
# vease-back
geode-conversion==6.0.10
# via
# geode-explicit
# geode-implicit
# geodeapp-back
# opengeodeweb-back
# vease-back
geode-explicit==6.1.9
# via
# geode-implicit
# geodeapp-back
# opengeodeweb-back
# vease-back
geode-implicit==3.2.4
# via
# geodeapp-back
# opengeodeweb-back
# vease-back
geode-numerics==5.1.3
# via
# geode-implicit
# geode-simplex
# geodeapp-back
# opengeodeweb-back
# vease-back
geode-simplex==8.2.10
# via
# geode-implicit
# geodeapp-back
# opengeodeweb-back
# vease-back
geode-viewables==3.0.5
# via
# geodeapp-back
# opengeodeweb-back
geodeapp-back==0.4.1
# via -r electron-server/requirements_back.in
# vease-back
itsdangerous==2.2.0
# via
# flask
# geodeapp-back
# opengeodeweb-back
# vease-back
jinja2==3.1.4
# via
# flask
# geodeapp-back
# opengeodeweb-back
# vease-back
jsonschema==4.23.0
# via
# geodeapp-back
# opengeodeweb-back
# vease-back
jsonschema-specifications==2024.10.1
# via
# geodeapp-back
# jsonschema
# opengeodeweb-back
# vease-back
markupsafe==3.0.1
# via
# geodeapp-back
# jinja2
# opengeodeweb-back
# vease-back
# werkzeug
opengeode-core==15.5.0
# via
Expand All @@ -123,58 +119,61 @@ opengeode-core==15.5.0
# geode-numerics
# geode-simplex
# geode-viewables
# geodeapp-back
# opengeode-geosciences
# opengeode-geosciencesio
# opengeode-inspector
# opengeode-io
# opengeodeweb-back
# vease-back
opengeode-geosciences==8.1.0
# via
# geode-implicit
# geode-viewables
# geodeapp-back
# opengeode-geosciencesio
# opengeodeweb-back
# vease-back
opengeode-geosciencesio==5.2.1
# via
# geode-implicit
# geodeapp-back
# opengeodeweb-back
# vease-back
opengeode-inspector==6.1.4
# via
# geode-explicit
# geode-implicit
# geode-simplex
# geodeapp-back
# opengeodeweb-back
# vease-back
opengeode-io==7.0.3
# via
# geode-implicit
# geode-viewables
# geodeapp-back
# opengeode-geosciencesio
# opengeodeweb-back
# vease-back
opengeodeweb-back==5.3.1
# via geodeapp-back
# via vease-back
referencing==0.35.1
# via
# geodeapp-back
# jsonschema
# jsonschema-specifications
# opengeodeweb-back
# vease-back
rpds-py==0.20.0
# via
# geodeapp-back
# jsonschema
# opengeodeweb-back
# referencing
# vease-back
typing-extensions==4.12.2
# via
# geodeapp-back
# asgiref
# opengeodeweb-back
# vease-back
vease-back==1.0.0
# via -r electron-server/requirements_back.in
werkzeug==3.0.4
# via
# flask
# geodeapp-back
# opengeodeweb-back
# vease-back
2 changes: 1 addition & 1 deletion electron-server/requirements_viewer.in
Original file line number Diff line number Diff line change
@@ -1 +1 @@
geodeapp-viewer[gpu]
vease-viewer[gpu]
Loading

0 comments on commit 523a2bd

Please sign in to comment.