Merge branch 'main' of https://github.com/MichaelPesce/watertap-ui in…

…to parameter-sweep-test
watertap-org · Aug 15, 2024 · c99a1ca · c99a1ca
2 parents fc52d4d + 3f28ea9
commit c99a1ca
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 51 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:
-      - "1.0.0rc0"
+      - "1.0.0"
 
 defaults:
   run:
@@ -49,7 +49,7 @@ jobs:
 
       - name: Install Watertap locally
         working-directory: ../
-        run: git clone https://github.com/watertap-org/watertap.git && cd watertap && git fetch --all --tags && git checkout 1.0.0rc0 && pip install --progress-bar off .
+        run: git clone https://github.com/watertap-org/watertap.git && cd watertap && git fetch --all --tags && git checkout 1.0.0 && pip install --progress-bar off .
 
       - name: Transfer Entry points
         run: |
@@ -70,7 +70,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_24.07.16_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.08.15_win64.exe
 
 
       - name: Upload artifact for windows build
@@ -79,4 +79,4 @@ jobs:
         with:
             name: windows-dist
             path: |
-              electron/dist/WaterTAP-UI_24.07.16_win64.exe
+              electron/dist/WaterTAP-UI_24.08.15_win64.exe
diff --git a/backend/app/idaes-hooks/hook-idaes.py b/backend/app/idaes-hooks/hook-idaes.py
@@ -14,32 +14,6 @@ def extract_file_names(files, prefix):
                     ret.append(f'{each}/{each_one}')
     return ret
 
-# pyomo_file_tree = {
-#         "include": {
-#             "asl": [
-#                 'asl_pfgh.h', 'jacpdim.h', 'opcode.hd', 'jac2dim.h', 'obj_adj.h', 'r_opn.hd', 'getstub.h', 'errchk.h', 'arith.h', 'nlp.h', 'stdio1.h', 'nlp2.h', 'asl.h', 'psinfo.h', 'funcadd.h', 'asl_pfg.h', 'avltree.h'
-#             ],
-#             "asl2": [
-#                 'asl_pfgh.h', 'jacpdim.h', 'opcode.hd', 'jac2dim.h', 'obj_adj.h', 'r_opn.hd', 'opno2.h', 'getstub.h', 'errchk.h', 'arith.h', 'nlp.h', 'stdio1.h', 'nlp2.h', 'asl.h', 'psinfo.h', 'funcadd.h', 'asl_pfg.h', 'avltree.h'
-#             ]
-#         },
-#         "lib": ['libpynumero_ASL.dylib', 'libasl.a', 'libasl2.a'],
-#         "share": {
-#             "ampl-asl": ['ampl-asl-config.cmake', 'ampl-asl-config-noconfig.cmake']
-#         }
-#     }
-
-# idaes_file_tree = {
-#     "bin": [
-#         'ipopt_sens', 'cubic_roots.so', 'libstdc++.6.dylib', 'version_lib.txt', 
-#         'libsipopt.dylib', 'libipopt.3.dylib', 'ipopt', 'couenne', 'libipopt.dylib', 
-#         'cbc', 'libgfortran.5.dylib', 'libpynumero_ASL.dylib', 'functions.so', 
-#         'iapws95_external.so', 'license_lib.txt', 'k_aug', 'version_solvers.txt', 
-#         'ipopt_l1', 'bonmin', 'swco2_external.so', 'libsipopt.3.dylib', 'license.txt', 
-#         'ipopt_sens_l1', 'libgcc_s.1.1.dylib', 'clp', 'libgomp.1.dylib', 'dot_sens'
-#         ]
-# }
-
 idaes_file_tree = {
     "bin": [
         'ipopt_sens', 'cubic_roots.so', 'libstdc++.6.dylib', 'version_lib.txt', 
@@ -51,18 +25,9 @@ def extract_file_names(files, prefix):
         'libsipopt.3.dylib', 'license.txt', 'ipopt_sens_l1', 'libgcc_s.1.1.dylib', 
         'clp', 'libgomp.1.dylib', 'dot_sens']
 }
-# pyomo_files = extract_file_names(pyomo_file_tree, "extensions/.pyomo/")
-# print(os.listdir('../extensions/.idaes/bin'))
 idaes_files = extract_file_names(idaes_file_tree, "extensions/.idaes/")
 if sys.platform == "darwin":
     datas=[]
-    # for each in pyomo_files:
-    #     each_one = each.replace('//','/')
-    #     dst_arr = each_one.split('/')[0:-1]
-    #     dst = ""
-    #     for dir in dst_arr:
-    #         dst += f'{dir}/'
-    #     datas.append((f'{each_one}', f'{dst}'))
     for each in idaes_files:
         each_one = each.replace('//','/')
         dst_arr = each_one.split('/')[0:-1]
@@ -71,4 +36,5 @@ def extract_file_names(files, prefix):
             dst += f'{dir}/'
         datas.append((f'{each_one}', f'{dst}'))
 
-    print(datas)
+    print(datas)
+
diff --git a/backend/app/internal/assets/Lorem ipsum.txt b/backend/app/internal/assets/Lorem ipsum.txt
diff --git a/backend/app/main-hooks/hook-watertap.py b/backend/app/main-hooks/hook-watertap.py
@@ -99,10 +99,9 @@
             continue
 datas.append((src_name, "watertap/core"))
 hiddenimports = list(imports)
-# hiddenimports.append("pyomo.common.dependencies.numpy")
-# print("hiddenimports")
-# print(hiddenimports)
-# # manually add all pyomo hidden imports
+# add lorem ipsum.txt for jaraco
+datas.append(('internal/assets/Lorem ipsum.txt', 'jaraco/text'))
+
 pyomo_imports = [
     "networkx",
     "pint",

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": "24.07.16",
+  "version": "24.08.15",
   "private": true,
   "main": "build/main.js",
   "dependencies": {
@@ -71,7 +71,7 @@
     "nsis": {
       "oneClick": false,
       "allowToChangeInstallationDirectory": true,
-      "artifactName": "WaterTAP-UI_24.07.16_win64.exe"
+      "artifactName": "WaterTAP-UI_24.08.15_win64.exe"
     },
     "deb": {
       "depends": [
@@ -107,7 +107,7 @@
     "win": {
       "target": "nsis",
       "icon": "build/nawi-logo.ico",
-      "artifactName": "WaterTAP-UI_24.07.16_win64.exe"
+      "artifactName": "WaterTAP-UI_24.08.15_win64.exe"
     },
     "linux": {
       "target": "Deb",

diff --git a/electron/ui/src/theme.js b/electron/ui/src/theme.js
@@ -23,8 +23,8 @@ export const themes = {
             '(WaterTAP) is an open-source Python-based software package that ' +
             'supports the technoeconomic assessment of full water treatment trains.',
         projectRelease: {
-            'version': '24.07.16', 'depVersions': {
-                'WaterTAP': '1.0.0rc0'
+            'version': '24.08.15', 'depVersions': {
+                'WaterTAP': '1.0.0'
             }
         },
         splashImage: nawiSplash,