From acff17317dbd02e0bbf065b09863ef81624287c9 Mon Sep 17 00:00:00 2001 From: MichaelPesce Date: Thu, 3 Oct 2024 17:00:55 -0400 Subject: [PATCH 1/4] update v numbers, run build --- .github/workflows/electron-build.yml | 8 ++++---- electron/package-lock.json | 4 ++-- electron/package.json | 6 +++--- electron/ui/src/theme.js | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/electron-build.yml b/.github/workflows/electron-build.yml index 134f6bb..824a1c3 100644 --- a/.github/workflows/electron-build.yml +++ b/.github/workflows/electron-build.yml @@ -3,7 +3,7 @@ name: App build on: push: branches: - - "1.0.0" + - "1.1rc0" 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.0 && pip install --progress-bar off . + run: git clone https://github.com/watertap-org/watertap.git && cd watertap && git fetch --all --tags && git checkout 1.1.0rc0 && 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.08.15_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.10.03_win64.exe - name: Upload artifact for windows build @@ -79,4 +79,4 @@ jobs: with: name: windows-dist path: | - electron/dist/WaterTAP-UI_24.08.15_win64.exe + electron/dist/WaterTAP-UI_24.10.03_win64.exe diff --git a/electron/package-lock.json b/electron/package-lock.json index f9e4900..73811fe 100644 --- a/electron/package-lock.json +++ b/electron/package-lock.json @@ -1,12 +1,12 @@ { "name": "watertap-ui", - "version": "24.08.15", + "version": "24.10.03", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "watertap-ui", - "version": "24.08.15", + "version": "24.10.03", "dependencies": { "@electron/remote": "^2.0.8", "@emotion/react": "^11.11.4", diff --git a/electron/package.json b/electron/package.json index 0c7c08e..aac7396 100644 --- a/electron/package.json +++ b/electron/package.json @@ -1,7 +1,7 @@ { "name": "watertap-ui", "author": "Michael Pesce ", - "version": "24.08.15", + "version": "24.10.03", "private": true, "main": "build/main.js", "dependencies": { @@ -71,7 +71,7 @@ "nsis": { "oneClick": false, "allowToChangeInstallationDirectory": true, - "artifactName": "WaterTAP-UI_24.08.15_win64.exe" + "artifactName": "WaterTAP-UI_24.10.03_win64.exe" }, "deb": { "depends": [ @@ -107,7 +107,7 @@ "win": { "target": "nsis", "icon": "build/nawi-logo.ico", - "artifactName": "WaterTAP-UI_24.08.15_win64.exe" + "artifactName": "WaterTAP-UI_24.10.03_win64.exe" }, "linux": { "target": "Deb", diff --git a/electron/ui/src/theme.js b/electron/ui/src/theme.js index 287312e..b72d8b8 100644 --- 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.08.15', 'depVersions': { - 'WaterTAP': '1.0.0' + 'version': '24.10.03', 'depVersions': { + 'WaterTAP': '1.1.0rc0' } }, splashImage: nawiSplash, From 532325d82d061655dc4541bed2054f27f661764a Mon Sep 17 00:00:00 2001 From: MichaelPesce Date: Thu, 3 Oct 2024 19:39:19 -0400 Subject: [PATCH 2/4] update requirements build --- backend/requirements-build.txt | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/backend/requirements-build.txt b/backend/requirements-build.txt index 58d587d..6f83221 100644 --- a/backend/requirements-build.txt +++ b/backend/requirements-build.txt @@ -3,6 +3,7 @@ alabaster==0.7.16 altgraph==0.17.4 annotated-types==0.6.0 anyio==3.6.1 +appdirs==1.4.4 appnope==0.1.4 argon2-cffi==23.1.0 argon2-cffi-bindings==21.2.0 @@ -23,6 +24,7 @@ cfgv==3.4.0 chardet==5.2.0 charset-normalizer==3.3.2 click==8.1.3 +colorama==0.4.6 comm==0.2.2 contourpy==1.2.0 coverage==7.4.4 @@ -41,13 +43,16 @@ executing==2.0.1 fastapi==0.110.0 fastjsonschema==2.19.0 filelock==3.13.1 +flexcache==0.3 +flexparser==0.3.1 fonttools==4.45.1 fqdn==1.5.1 h11==0.13.0 h5py==3.10.0 htmlmin==0.1.12 httpcore==1.0.4 -idaes-pse==2.4.0 +httpx==0.27.0 +idaes-pse==2.6.0 identify==2.5.35 idna==3.3 imagesize==1.4.1 @@ -110,11 +115,13 @@ overrides==7.7.0 packaging==23.2 pandas==2.0.3 pandocfilters==1.5.1 +parameter-sweep==0.1.dev5 parso==0.8.3 pathspec==0.12.1 +pefile==2023.2.7 pexpect==4.9.0 Pillow==10.1.0 -Pint==0.22 +Pint==0.24.3 platformdirs==4.2.0 pluggy==1.3.0 ply==3.11 @@ -133,7 +140,7 @@ pyinstaller==5.3 pyinstaller-hooks-contrib==2024.3 pylint==2.17.7 pymongo==4.6.1 -Pyomo==6.7.1 +Pyomo==6.8.0 pyparsing==3.1.1 pytest==7.4.4 pytest-cov==4.1.0 @@ -142,6 +149,9 @@ python-dotenv==1.0.1 python-json-logger==2.0.7 python-multipart==0.0.5 pytz==2023.3.post1 +pywin32==306 +pywin32-ctypes==0.2.2 +pywinpty==2.0.13 PyYAML==6.0.1 pyzmq==25.1.2 qtconsole==5.5.1 From d4ff6166a260d1e09e915b62a1516553b53b68f3 Mon Sep 17 00:00:00 2001 From: MichaelPesce Date: Fri, 11 Oct 2024 08:24:10 -0400 Subject: [PATCH 3/4] update version numbers; run 1.1.0 build --- .github/workflows/electron-build.yml | 8 ++++---- electron/package-lock.json | 4 ++-- electron/package.json | 6 +++--- electron/ui/src/theme.js | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/electron-build.yml b/.github/workflows/electron-build.yml index 824a1c3..70430da 100644 --- a/.github/workflows/electron-build.yml +++ b/.github/workflows/electron-build.yml @@ -3,7 +3,7 @@ name: App build on: push: branches: - - "1.1rc0" + - "1.1.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.1.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.1.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.10.03_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.10.11_win64.exe - name: Upload artifact for windows build @@ -79,4 +79,4 @@ jobs: with: name: windows-dist path: | - electron/dist/WaterTAP-UI_24.10.03_win64.exe + electron/dist/WaterTAP-UI_24.10.11_win64.exe diff --git a/electron/package-lock.json b/electron/package-lock.json index 73811fe..9d3f646 100644 --- a/electron/package-lock.json +++ b/electron/package-lock.json @@ -1,12 +1,12 @@ { "name": "watertap-ui", - "version": "24.10.03", + "version": "24.10.11", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "watertap-ui", - "version": "24.10.03", + "version": "24.10.11", "dependencies": { "@electron/remote": "^2.0.8", "@emotion/react": "^11.11.4", diff --git a/electron/package.json b/electron/package.json index aac7396..2284420 100644 --- a/electron/package.json +++ b/electron/package.json @@ -1,7 +1,7 @@ { "name": "watertap-ui", "author": "Michael Pesce ", - "version": "24.10.03", + "version": "24.10.11", "private": true, "main": "build/main.js", "dependencies": { @@ -71,7 +71,7 @@ "nsis": { "oneClick": false, "allowToChangeInstallationDirectory": true, - "artifactName": "WaterTAP-UI_24.10.03_win64.exe" + "artifactName": "WaterTAP-UI_24.10.11_win64.exe" }, "deb": { "depends": [ @@ -107,7 +107,7 @@ "win": { "target": "nsis", "icon": "build/nawi-logo.ico", - "artifactName": "WaterTAP-UI_24.10.03_win64.exe" + "artifactName": "WaterTAP-UI_24.10.11_win64.exe" }, "linux": { "target": "Deb", diff --git a/electron/ui/src/theme.js b/electron/ui/src/theme.js index b72d8b8..60d150e 100644 --- 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.10.03', 'depVersions': { - 'WaterTAP': '1.1.0rc0' + 'version': '24.10.11', 'depVersions': { + 'WaterTAP': '1.1.0' } }, splashImage: nawiSplash, From 1ed511ad1ef4ea2ea9ba1cd9ec08632b4798506c Mon Sep 17 00:00:00 2001 From: MichaelPesce Date: Fri, 11 Oct 2024 08:24:29 -0400 Subject: [PATCH 4/4] run 1.1.0 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 70430da..987a70d 100644 --- a/.github/workflows/electron-build.yml +++ b/.github/workflows/electron-build.yml @@ -3,7 +3,7 @@ name: App build on: push: branches: - - "1.1.0" + - "1.1rc0" defaults: run: