From fb4cce32f9247dae8316e7806f7ad50da9adfd97 Mon Sep 17 00:00:00 2001 From: Samuel Wein Date: Wed, 22 May 2024 14:39:24 +0200 Subject: [PATCH 1/6] Update action versions --- .../build-windows-executable-app.yaml | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build-windows-executable-app.yaml b/.github/workflows/build-windows-executable-app.yaml index cffc8ae..d1f43bc 100644 --- a/.github/workflows/build-windows-executable-app.yaml +++ b/.github/workflows/build-windows-executable-app.yaml @@ -11,18 +11,18 @@ jobs: runs-on: windows-latest env: - OPENMS_VERSION: 3.0.0 + OPENMS_VERSION: 3.1.0 steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: OpenMS/OpenMS ref: release/${{ env.OPENMS_VERSION }} path: 'OpenMS' - name: Install Qt - uses: jurplel/install-qt-action@v3 + uses: jurplel/install-qt-action@v34 with: version: '5.15.2' # 5.12.7 is broken https://bugreports.qt.io/browse/QTBUG-81715, > 5.15.2 is not available on official archives (https://github.com/miurahr/aqtinstall/issues/636) host: 'windows' # default: win64_msvc2017_64 @@ -58,7 +58,7 @@ jobs: - name: Cache contrib id: cache-contrib-win - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ${{ github.workspace }}/OpenMS/contrib key: ${{ runner.os }}-contrib3 @@ -77,7 +77,7 @@ jobs: ls - name: Setup ccache cache - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: .ccache key: ${{ runner.os }}-ccache-${{ env.RUN_NAME }}-${{ github.run_number }} @@ -144,13 +144,13 @@ jobs: BUILD_NAME: "${{ env.RUN_NAME }}-Win64-class-topp-${{ github.run_number }}" - name: Upload TOPP tools as artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: OpenMS-bin path: OpenMS/bld/bin - name: Upload share as artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: OpenMS-share path: OpenMS/share @@ -164,16 +164,16 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Download TOPP tools as artifact - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: OpenMS-bin path: openms-bin - name: Download share as artifact - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: OpenMS-share path: share @@ -218,7 +218,7 @@ jobs: cp app.py streamlit_exe - name: Delete OpenMS bin artifact - uses: geekyeggo/delete-artifact@v2 + uses: geekyeggo/delete-artifact@v4 with: name: OpenMS-bin @@ -232,7 +232,7 @@ jobs: 7z a OpenMS-App.zip ./streamlit_exe/* -r - name: Upload artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: OpenMS-App path: OpenMS-App.zip From 4735ed1087fb1dc361d0ea71a88b74cf7662afb4 Mon Sep 17 00:00:00 2001 From: Samuel Wein Date: Wed, 22 May 2024 14:41:28 +0200 Subject: [PATCH 2/6] Update build-windows-executable-app.yaml --- .github/workflows/build-windows-executable-app.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-windows-executable-app.yaml b/.github/workflows/build-windows-executable-app.yaml index d1f43bc..06c00e1 100644 --- a/.github/workflows/build-windows-executable-app.yaml +++ b/.github/workflows/build-windows-executable-app.yaml @@ -22,7 +22,7 @@ jobs: path: 'OpenMS' - name: Install Qt - uses: jurplel/install-qt-action@v34 + uses: jurplel/install-qt-action@v4 with: version: '5.15.2' # 5.12.7 is broken https://bugreports.qt.io/browse/QTBUG-81715, > 5.15.2 is not available on official archives (https://github.com/miurahr/aqtinstall/issues/636) host: 'windows' # default: win64_msvc2017_64 From 6cf19344e560fec8505d5c3bc9d77132316613b2 Mon Sep 17 00:00:00 2001 From: Samuel Wein Date: Wed, 22 May 2024 14:56:22 +0200 Subject: [PATCH 3/6] Update build-windows-executable-app.yaml --- .github/workflows/build-windows-executable-app.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-windows-executable-app.yaml b/.github/workflows/build-windows-executable-app.yaml index 06c00e1..a0de350 100644 --- a/.github/workflows/build-windows-executable-app.yaml +++ b/.github/workflows/build-windows-executable-app.yaml @@ -11,7 +11,7 @@ jobs: runs-on: windows-latest env: - OPENMS_VERSION: 3.1.0 + OPENMS_VERSION: 3.0.0 steps: - name: Checkout From b65dcec08887b16b0cb941e751497a1653bae4ee Mon Sep 17 00:00:00 2001 From: Arslan Date: Mon, 3 Jun 2024 10:39:53 +0200 Subject: [PATCH 4/6] provide link of itself repo for content read --- "pages/4_\360\237\223\226_Windows_executable.py" | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git "a/pages/4_\360\237\223\226_Windows_executable.py" "b/pages/4_\360\237\223\226_Windows_executable.py" index 5e8e8a9..1432253 100644 --- "a/pages/4_\360\237\223\226_Windows_executable.py" +++ "b/pages/4_\360\237\223\226_Windows_executable.py" @@ -54,7 +54,7 @@ def fetch_markdown_content(url): # window executable with embeddable python with tabs[0]: - markdown_url = "https://raw.githubusercontent.com/Arslan-Siraj/streamlit-template/main/win_exe_with_embed_py.md" + markdown_url = "https://raw.githubusercontent.com/OpenMS/streamlit-template/main/win_exe_with_embed_py.md" markdown_content = fetch_markdown_content(markdown_url) @@ -66,7 +66,7 @@ def fetch_markdown_content(url): # window executable with pyinstaller with tabs[1]: # URL of the Markdown document - markdown_url = "https://raw.githubusercontent.com/Arslan-Siraj/streamlit-template/main/win_exe_with_pyinstaller.md" + markdown_url = "https://raw.githubusercontent.com/OpenMS/streamlit-template/main/win_exe_with_pyinstaller.md" markdown_content = fetch_markdown_content(markdown_url) From bf4cb703c920ad59ff4cb14245c96fb28dce3341 Mon Sep 17 00:00:00 2001 From: Arslan Date: Mon, 3 Jun 2024 10:45:04 +0200 Subject: [PATCH 5/6] provide streamlit config inside docker --- .streamlit/config.toml | 2 +- Dockerfile | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.streamlit/config.toml b/.streamlit/config.toml index c127ee1..be4a49e 100644 --- a/.streamlit/config.toml +++ b/.streamlit/config.toml @@ -2,7 +2,7 @@ developmentMode = false [server] -port = 8502 +port = 8501 # should be same as configured in deployment repo [theme] diff --git a/Dockerfile b/Dockerfile index 00c8a2a..6a20657 100644 --- a/Dockerfile +++ b/Dockerfile @@ -114,6 +114,8 @@ COPY src/ /app/src COPY assets/ /app/assets COPY example-data/ /app/example-data COPY pages/ /app/pages +# For streamlit configuration +COPY .streamlit/config.toml /app/.streamlit/config.toml COPY clean-up-workspaces.py /app/clean-up-workspaces.py # add cron job to the crontab From 4a90abe8e1d8381d727cd25ce75a617f00a46e16 Mon Sep 17 00:00:00 2001 From: Arslan Date: Mon, 3 Jun 2024 12:34:04 +0200 Subject: [PATCH 6/6] .config file in Dockerfile_simple --- Dockerfile_simple | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile_simple b/Dockerfile_simple index 827ac0c..30d6a7c 100644 --- a/Dockerfile_simple +++ b/Dockerfile_simple @@ -58,6 +58,8 @@ COPY src/ /app/src COPY assets/ /app/assets COPY example-data/ /app/example-data COPY pages/ /app/pages +# For streamlit configuration +COPY .streamlit/config.toml /app/.streamlit/config.toml COPY clean-up-workspaces.py /app/clean-up-workspaces.py