From 7b11f6a904dd6bd71c27f427c94724d7ce3eb3a6 Mon Sep 17 00:00:00 2001 From: MichaelPesce Date: Fri, 26 Jan 2024 08:59:57 -0600 Subject: [PATCH 1/6] use watertap 0.11.0 repo for build --- .github/workflows/electron-build.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/electron-build.yml b/.github/workflows/electron-build.yml index 9a4baf8d..54c96423 100644 --- a/.github/workflows/electron-build.yml +++ b/.github/workflows/electron-build.yml @@ -44,13 +44,13 @@ jobs: - name: Get idaes extensions run: idaes get-extensions - - name: Install Watertap locally - working-directory: ../ - run: git clone https://github.com/MichaelPesce/watertap.git && cd watertap && git fetch --all && git checkout 0.10.0_michael && pip install --progress-bar off . - # - name: Install Watertap locally # working-directory: ../ - # run: git clone https://github.com/watertap-org/watertap.git && cd watertap && git fetch --all --tags && git checkout 0.10.0 && pip install --progress-bar off . + # run: git clone https://github.com/MichaelPesce/watertap.git && cd watertap && git fetch --all && git checkout 0.11.0 && pip install --progress-bar off . + + - name: Install Watertap locally + working-directory: ../ + run: git clone https://github.com/watertap-org/watertap.git && cd watertap && git fetch --all --tags && git checkout 0.11.0 && pip install --progress-bar off . - name: Transfer Entry points run: | From db52086dd9dec10acaa307d10314111dc3b843ff Mon Sep 17 00:00:00 2001 From: MichaelPesce Date: Fri, 26 Jan 2024 09:00:36 -0600 Subject: [PATCH 2/6] update version number --- .github/workflows/electron-build.yml | 4 ++-- electron/package-lock.json | 4 ++-- electron/package.json | 6 +++--- electron/ui/src/views/SplashPage/SplashPage.js | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/electron-build.yml b/.github/workflows/electron-build.yml index 54c96423..a7d65b73 100644 --- a/.github/workflows/electron-build.yml +++ b/.github/workflows/electron-build.yml @@ -85,7 +85,7 @@ jobs: - name: Sign Windows Distribution run: | - AzureSignTool sign -kvu "${{ secrets.AZURE_KEY_VAULT_URI }}" -kvi "${{ secrets.AZURE_CLIENT_ID }}" -kvt "${{ secrets.AZURE_TENANT_ID }}" -kvs "${{ secrets.AZURE_CLIENT_SECRET }}" -kvc ${{ secrets.AZURE_CERT_NAME }} -tr http://timestamp.digicert.com -v electron/dist/WaterTAP-UI_23.11.28_win64.exe + AzureSignTool sign -kvu "${{ secrets.AZURE_KEY_VAULT_URI }}" -kvi "${{ secrets.AZURE_CLIENT_ID }}" -kvt "${{ secrets.AZURE_TENANT_ID }}" -kvs "${{ secrets.AZURE_CLIENT_SECRET }}" -kvc ${{ secrets.AZURE_CERT_NAME }} -tr http://timestamp.digicert.com -v electron/dist/WaterTAP-UI_24.01.26_win64.exe - name: Upload artifact for windows build @@ -94,7 +94,7 @@ jobs: with: name: windows-dist path: | - electron/dist/WaterTAP-UI_23.11.28_win64.exe + electron/dist/WaterTAP-UI_24.01.26_win64.exe # windows-build: # name: Windows Build diff --git a/electron/package-lock.json b/electron/package-lock.json index 15cef0c3..a274912c 100644 --- a/electron/package-lock.json +++ b/electron/package-lock.json @@ -1,12 +1,12 @@ { "name": "watertap-ui", - "version": "23.11.28", + "version": "24.01.26", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "watertap-ui", - "version": "23.11.28", + "version": "24.01.26", "dependencies": { "@electron/remote": "^2.0.8", "axios": "^0.27.2", diff --git a/electron/package.json b/electron/package.json index e7981ebf..b5c83eab 100644 --- a/electron/package.json +++ b/electron/package.json @@ -1,7 +1,7 @@ { "name": "watertap-ui", "author": "Michael Pesce ", - "version": "23.11.28", + "version": "24.01.26", "private": true, "main": "build/main.js", "dependencies": { @@ -70,7 +70,7 @@ "nsis": { "oneClick": false, "allowToChangeInstallationDirectory": true, - "artifactName": "WaterTAP-UI_23.11.28_win64.exe" + "artifactName": "WaterTAP-UI_24.01.26_win64.exe" }, "deb": { "depends": [ @@ -106,7 +106,7 @@ "win": { "target": "nsis", "icon": "build/nawi-logo.ico", - "artifactName": "WaterTAP-UI_23.11.28_win64.exe" + "artifactName": "WaterTAP-UI_24.01.26_win64.exe" }, "linux": { "target": "Deb", diff --git a/electron/ui/src/views/SplashPage/SplashPage.js b/electron/ui/src/views/SplashPage/SplashPage.js index db47d94a..26503da8 100644 --- a/electron/ui/src/views/SplashPage/SplashPage.js +++ b/electron/ui/src/views/SplashPage/SplashPage.js @@ -58,7 +58,7 @@ export default function SplashPage() { -

v23.11.28 (WaterTAP v0.10.0)

+

v24.01.26 (WaterTAP v0.10.0)

 From af90c94ce764d4c8d238394bc228d93d91b34e8e Mon Sep 17 00:00:00 2001 From: MichaelPesce Date: Fri, 26 Jan 2024 09:01:14 -0600 Subject: [PATCH 3/6] update watertap version number in splash page --- electron/ui/src/views/SplashPage/SplashPage.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/electron/ui/src/views/SplashPage/SplashPage.js b/electron/ui/src/views/SplashPage/SplashPage.js index 26503da8..1a9916a8 100644 --- a/electron/ui/src/views/SplashPage/SplashPage.js +++ b/electron/ui/src/views/SplashPage/SplashPage.js @@ -58,7 +58,7 @@ export default function SplashPage() { -

v24.01.26 (WaterTAP v0.10.0)

+

v24.01.26 (WaterTAP v0.11.0)

 From c9dceb2dbeab23058ce3090a6f074b9ef0f5acd8 Mon Sep 17 00:00:00 2001 From: MichaelPesce Date: Fri, 26 Jan 2024 09:01:20 -0600 Subject: [PATCH 4/6] run build --- .github/workflows/electron-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/electron-build.yml b/.github/workflows/electron-build.yml index a7d65b73..c18adf0b 100644 --- a/.github/workflows/electron-build.yml +++ b/.github/workflows/electron-build.yml @@ -3,7 +3,7 @@ name: App build on: push: branches: - - "streamline-flowsheet-imports" + - "0.11.0" defaults: run: From 888964f1073ede29783f5d0ea16d3bc350204e4e Mon Sep 17 00:00:00 2001 From: MichaelPesce Date: Fri, 26 Jan 2024 09:54:37 -0600 Subject: [PATCH 5/6] update idaes-extension binaries version to 3.4.0 --- backend/app/internal/get_extensions.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/app/internal/get_extensions.py b/backend/app/internal/get_extensions.py index 1b856aae..1170f261 100644 --- a/backend/app/internal/get_extensions.py +++ b/backend/app/internal/get_extensions.py @@ -40,7 +40,7 @@ def get_idaes_extensions(): print(f'unable to set requests_ca_bundle and ssl_cert_file:\n{e}') print(f'trying to download binaries') from app.internal.download_binaries import download_binaries - download_binaries(release="3.0.0") + download_binaries(release="3.4.0") print(f'extensions have been gotten') print('successfully installed idaes extensions') except PermissionError as e: From 50752c65ea7939e69a29b533a90cbef8b564ccaa Mon Sep 17 00:00:00 2001 From: MichaelPesce Date: Fri, 26 Jan 2024 14:27:00 -0600 Subject: [PATCH 6/6] use idaes default binary release for binaries release version (idaes extnsions) --- backend/app/internal/get_extensions.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/backend/app/internal/get_extensions.py b/backend/app/internal/get_extensions.py index 1170f261..4131e6bb 100644 --- a/backend/app/internal/get_extensions.py +++ b/backend/app/internal/get_extensions.py @@ -40,7 +40,14 @@ def get_idaes_extensions(): print(f'unable to set requests_ca_bundle and ssl_cert_file:\n{e}') print(f'trying to download binaries') from app.internal.download_binaries import download_binaries - download_binaries(release="3.4.0") + binaries_release_version="3.4.0" + try: + from idaes.config import default_binary_release + binaries_release_version = default_binary_release + print(f"got default binary release: {binaries_release_version}") + except Exception as e: + print(f"unable to get default binary release, rolling with {binaries_release_version}") + download_binaries(release=binaries_release_version) print(f'extensions have been gotten') print('successfully installed idaes extensions') except PermissionError as e: