diff --git a/.github/workflows/build_macos.yml b/.github/workflows/build_macos.yml index ccdb816..bb2562a 100644 --- a/.github/workflows/build_macos.yml +++ b/.github/workflows/build_macos.yml @@ -17,9 +17,9 @@ jobs: name: Build packages runs-on: macos-11 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python 3.8 - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: "3.8" @@ -72,11 +72,11 @@ jobs: - name: Make installer run: | git clone https://github.com/dbouget/quickpkg.git - quickpkg/quickpkg dist/Raidionics.app --output Raidionics-1.2.2-macOS.pkg - cp -r Raidionics-1.2.2-macOS.pkg dist/Raidionics-1.2.2-macOS-x86_64.pkg + quickpkg/quickpkg dist/Raidionics.app --output Raidionics-1.2.3-macOS.pkg + cp -r Raidionics-1.2.3-macOS.pkg dist/Raidionics-1.2.3-macOS-x86_64.pkg - name: Upload package - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: Package path: ${{github.workspace}}/dist/Raidionics-* diff --git a/.github/workflows/build_macos_arm.yml b/.github/workflows/build_macos_arm.yml index d804a52..acd0c1c 100644 --- a/.github/workflows/build_macos_arm.yml +++ b/.github/workflows/build_macos_arm.yml @@ -9,7 +9,7 @@ jobs: name: Build packages runs-on: self-hosted steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - name: Create environment and install python packages run: | @@ -28,7 +28,7 @@ jobs: python3 -m pip install --upgrade pip pip3 install ffmpeg pip3 install matplotlib - pip install git+https://github.com/dbouget/raidionics_rads_lib.git@macos_arm + pip install git+https://github.com/dbouget/raidionics_rads_lib.git@master pip3 install -r assets/requirements.txt pip install --force-reinstall --no-cache-dir pyside6 pip install urllib3==1.26.6 @@ -67,11 +67,11 @@ jobs: - name: Make installer run: | git clone https://github.com/dbouget/quickpkg.git - quickpkg/quickpkg dist/Raidionics.app --output Raidionics-1.2.2-macOS.pkg - cp -r Raidionics-1.2.2-macOS.pkg dist/Raidionics-1.2.2-macOS-arm64.pkg + quickpkg/quickpkg dist/Raidionics.app --output Raidionics-1.2.3-macOS.pkg + cp -r Raidionics-1.2.3-macOS.pkg dist/Raidionics-1.2.3-macOS-arm64.pkg - name: Upload package - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: Package path: ${{github.workspace}}/dist/Raidionics-* @@ -80,4 +80,4 @@ jobs: - name: Cleanup if: always() run: | - rm -rf ${{github.workspace}}/tmp/ + rm -rf ${{github.workspace}}/tmp/ \ No newline at end of file diff --git a/.github/workflows/build_ubuntu.yml b/.github/workflows/build_ubuntu.yml index efdc1ca..7bb033b 100644 --- a/.github/workflows/build_ubuntu.yml +++ b/.github/workflows/build_ubuntu.yml @@ -14,9 +14,9 @@ jobs: name: Build packages runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python 3.8 - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: "3.8" @@ -72,7 +72,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - pip install git+https://github.com/dbouget/raidionics_rads_lib.git@software + pip install git+https://github.com/dbouget/raidionics_rads_lib.git@master pip install -r assets/requirements.txt pip uninstall -y PySide6 PySide6-Addons PySide6-Essentials pip install --force-reinstall --no-cache-dir pyside6==6.2.4 @@ -108,10 +108,10 @@ jobs: cp -r dist/Raidionics assets/Raidionics_ubuntu/usr/local/bin dpkg-deb --build --root-owner-group assets/Raidionics_ubuntu ls -la - cp -r assets/Raidionics_ubuntu.deb dist/Raidionics-1.2.2-ubuntu.deb + cp -r assets/Raidionics_ubuntu.deb dist/Raidionics-1.2.3-ubuntu.deb - name: Upload package - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: Package path: ${{github.workspace}}/dist/Raidionics-* diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml index 0f9c436..43682e0 100644 --- a/.github/workflows/build_windows.yml +++ b/.github/workflows/build_windows.yml @@ -14,9 +14,9 @@ jobs: name: Build packages runs-on: windows-2019 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python 3.8 - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: "3.8" @@ -41,7 +41,7 @@ jobs: run: | python -m pip install --upgrade pip ls - pip install git+https://github.com/dbouget/raidionics_rads_lib.git@software + pip install git+https://github.com/dbouget/raidionics_rads_lib.git@master pip install -r assets/requirements.txt pip install matplotlib==3.3.4 pip install --force-reinstall --no-cache-dir pyside6 @@ -62,10 +62,10 @@ jobs: - name: Make installer run: | makensis.exe assets/Raidionics.nsi - cp -r assets/Raidionics-1.2.2-win.exe dist/Raidionics-1.2.2-win.exe + cp -r assets/Raidionics-1.2.3-win.exe dist/Raidionics-1.2.3-win.exe - name: Upload package - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: Package path: ${{github.workspace}}/dist/Raidionics-* diff --git a/assets/Raidionics.nsi b/assets/Raidionics.nsi index 39c4ba5..8534ec8 100644 --- a/assets/Raidionics.nsi +++ b/assets/Raidionics.nsi @@ -2,7 +2,7 @@ !define COMP_NAME "SINTEF" !define VERSION "1.2.2" !define DESCRIPTION "Application" -!define INSTALLER_NAME "Raidionics-1.2.2-win.exe" +!define INSTALLER_NAME "Raidionics-1.2.3-win.exe" !define MAIN_APP_EXE "Raidionics.exe" !define INSTALL_TYPE "SetShellVarContext current" !define REG_ROOT "HKLM" diff --git a/assets/main.spec b/assets/main.spec index 71d01e1..590640e 100644 --- a/assets/main.spec +++ b/assets/main.spec @@ -85,7 +85,7 @@ if sys.platform == "darwin": 'CFBundleIdentifier': 'Raidionics', 'CFBundleInfoDictionaryVersion': '6.0', 'CFBundleName': 'Raidionics', - 'CFBundleVersion': '1.2.2', + 'CFBundleVersion': '1.2.3', 'CFBundlePackageType': 'APPL', 'LSBackgroundOnly': 'false', }, diff --git a/assets/main_arm.spec b/assets/main_arm.spec index d717d6f..d86cf8b 100644 --- a/assets/main_arm.spec +++ b/assets/main_arm.spec @@ -84,7 +84,7 @@ if sys.platform == "darwin": 'CFBundleIdentifier': 'Raidionics', 'CFBundleInfoDictionaryVersion': '6.0', 'CFBundleName': 'Raidionics', - 'CFBundleVersion': '1.2.2', + 'CFBundleVersion': '1.2.3', 'CFBundlePackageType': 'APPL', 'LSBackgroundOnly': 'false', }, diff --git a/utils/software_config.py b/utils/software_config.py index f1cd719..aac3c43 100644 --- a/utils/software_config.py +++ b/utils/software_config.py @@ -25,7 +25,7 @@ class SoftwareConfigResources: _software_home_location = None # Main dump location for the software elements (e.g., models, runtime log) _user_preferences_filename = None # json file containing the user preferences (for when reopening the software). _session_log_filename = None # log filename containing the runtime logging for each software execution. - _software_version = "1.2.2" # Current software version (minor) for selecting which models to use in the backend. + _software_version = "1.2.3" # Current software version (minor) for selecting which models to use in the backend. _software_medical_specialty = "neurology" # Overall medical target [neurology, thoracic] @staticmethod