Fix GUI publish workflow; Add workflow dispatch trigger (uncommented …

…sections for testing)

.github/workflows/publish.yml

@@ -2,8 +2,8 @@ name: Publish to PyPI and GitHub release
 
 on:
   push:
-    tags:
-    - 'v*'
+    # tags:
+    # - 'v*'
 
 jobs:
   python-package:
@@ -26,8 +26,8 @@ jobs:
     - name: Build package
       run: |
         python -m build . --sdist --wheel
-    - name: Publish to PyPI
-      uses: pypa/gh-action-pypi-publish@release/v1
+    # - name: Publish to PyPI
+    #   uses: pypa/gh-action-pypi-publish@release/v1
     - name: Upload compiled wheels
       uses: actions/upload-artifact@v4
       with:
@@ -55,54 +55,54 @@ jobs:
     - name: Test built DeepLC exe
       run: dist/deeplc/deeplc.exe --ignore-gooey --help
     - name: Run Inno Setup
-      run: ISCC.exe ./deeplc_innosetup.iss /DMyAppVersion=$(python setup.py --version)
+      run: ISCC.exe ./deeplc_innosetup.iss /DAppVersion=${{  github.ref_name }}
     - name: Upload installer
       uses: actions/upload-artifact@v4
       with:
         name: dist
         path: dist/*.exe
 
-  git-release:
-    runs-on: ubuntu-latest
-    needs: [python-package, windows-installer]
-    steps:
-    - name: Download installer
-      uses: actions/download-artifact@v4
-      with:
-        name: dist
-        path: dist
-    - name: Create GitHub Release
-      uses: docker://antonyurchenko/git-release:v4
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        DRAFT_RELEASE: "false"
-        PRE_RELEASE: "false"
-        CHANGELOG_FILE: "CHANGELOG.md"
-      with:
-        args: |
-          dist/*
+  # git-release:
+  #   runs-on: ubuntu-latest
+  #   needs: [python-package, windows-installer]
+  #   steps:
+  #   - name: Download installer
+  #     uses: actions/download-artifact@v4
+  #     with:
+  #       name: dist
+  #       path: dist
+  #   - name: Create GitHub Release
+  #     uses: docker://antonyurchenko/git-release:v4
+  #     env:
+  #       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  #       DRAFT_RELEASE: "false"
+  #       PRE_RELEASE: "false"
+  #       CHANGELOG_FILE: "CHANGELOG.md"
+  #     with:
+  #       args: |
+  #         dist/*
 
-  build-streamlit-image:
-    runs-on: ubuntu-latest
-    needs: python-package
-    steps:
-    - uses: actions/checkout@v4
-    - id: latest_release
-      uses: pozetroninc/github-action-get-latest-release@master
-      with:
-        owner: compomics
-        repo: DeepLC
-    - name: Login to GitHub Container Registry
-      uses: docker/login-action@v3
-      with:
-        registry: ghcr.io
-        username: ${{ github.repository_owner }}
-        password: ${{ secrets.GITHUB_TOKEN }}
-    - name: Build and push to ghcr.io
-      uses: docker/build-push-action@v5
-      with:
-        context: streamlit
-        push: true
-        tags: |
-          ghcr.io/compomics/deeplc-streamlit:${{ steps.latest_release.outputs.release }}
-          ghcr.io/compomics/deeplc-streamlit:latest
+  # build-streamlit-image:
+  #   runs-on: ubuntu-latest
+  #   needs: python-package
+  #   steps:
+  #   - uses: actions/checkout@v4
+  #   - id: latest_release
+  #     uses: pozetroninc/github-action-get-latest-release@master
+  #     with:
+  #       owner: compomics
+  #       repo: DeepLC
+  #   - name: Login to GitHub Container Registry
+  #     uses: docker/login-action@v3
+  #     with:
+  #       registry: ghcr.io
+  #       username: ${{ github.repository_owner }}
+  #       password: ${{ secrets.GITHUB_TOKEN }}
+  #   - name: Build and push to ghcr.io
+  #     uses: docker/build-push-action@v5
+  #     with:
+  #       context: streamlit
+  #       push: true
+  #       tags: |
+  #         ghcr.io/compomics/deeplc-streamlit:${{ steps.latest_release.outputs.release }}
+  #         ghcr.io/compomics/deeplc-streamlit:latest

.github/workflows/test.yml

@@ -5,6 +5,7 @@ on:
     branches:
       - master
   pull_request:
+  workflow_dispatch:
 
 jobs:
   test:

deeplc_innosetup.iss

@@ -1,23 +1,23 @@
-#define MyAppName "DeepLC"
-#define MyAppPublisher "CompOmics"
-#define MyAppURL "https://github.com/compomics/DeepLC"
-#define MyAppExeName "deeplc.exe"
+#define AppName "DeepLC"
+#define AppPublisher "CompOmics"
+#define AppURL "https://github.com/compomics/DeepLC"
+#define AppExeName "deeplc.exe"
 
 [Setup]
 AppId={{5540C6D9-E2DE-42EC-90A7-8598F55EA165}
-AppName={#MyAppName}
-AppVersion={#MyAppVersion}
-AppPublisher={#MyAppPublisher}
-AppPublisherURL={#MyAppURL}
-AppSupportURL={#MyAppURL}
-AppUpdatesURL={#MyAppURL}
-DefaultDirName={autopf}\{#MyAppName}
+AppName={#AppName}
+AppVersion={#AppVersion}
+AppPublisher={#AppPublisher}
+AppPublisherURL={#AppURL}
+AppSupportURL={#AppURL}
+AppUpdatesURL={#AppURL}
+DefaultDirName={autopf}\{#AppName}
 DisableProgramGroupPage=yes
 LicenseFile=.\LICENSE
 PrivilegesRequired=lowest
 PrivilegesRequiredOverridesAllowed=dialog
 OutputDir="dist"
-OutputBaseFilename="{#MyAppName}-{#MyAppVersion}-Windows64bit"
+OutputBaseFilename="{#AppName}-{#AppVersion}-Windows64bit"
 Compression=lzma
 SolidCompression=yes
 WizardStyle=modern
@@ -32,8 +32,8 @@ Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{
 Source: "dist\deeplc\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
 
 [Icons]
-Name: "{autoprograms}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
-Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
+Name: "{autoprograms}\{#AppName}"; Filename: "{app}\{#AppExeName}"
+Name: "{autodesktop}\{#AppName}"; Filename: "{app}\{#AppExeName}"; Tasks: desktopicon
 
 [Run]
-Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent
+Filename: "{app}\{#AppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(AppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent