Merge pull request #107 from MichaelPesce/0.11.0

0.11.0 watertap release
watertap-org · Jan 30, 2024 · ec40e06 · ec40e06
2 parents f58d2a0 + 50752c6
commit ec40e06
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 15 deletions.
diff --git 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:
@@ -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: |
@@ -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/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.0.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:

diff --git a/electron/package-lock.json b/electron/package-lock.json
diff --git a/electron/package.json b/electron/package.json
@@ -1,7 +1,7 @@
 {
   "name": "watertap-ui",
   "author": "Michael Pesce <[email protected]>",
-  "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
@@ -58,7 +58,7 @@ export default function SplashPage() {
                 <Grid item xs={3}> </Grid>
                 <Grid item xs={6}> 
                     <Box>
-                        <p style={{paddingTop:0, marginTop: 0, color:"#9c9c9c"}}>v23.11.28 (WaterTAP v0.10.0)</p>
+                        <p style={{paddingTop:0, marginTop: 0, color:"#9c9c9c"}}>v24.01.26 (WaterTAP v0.11.0)</p>
                     </Box>
                 </Grid>
                 <Grid item xs={3}> </Grid>