Fixed SimpleITK dtype issue, bundle running locally.

raidionics · Aug 21, 2023 · b8ac3c6 · b8ac3c6
1 parent 1bec6df
commit b8ac3c6
Show file tree

Hide file tree

Showing 9 changed files with 112 additions and 111 deletions.
diff --git a/.github/workflows/build_macos.yml b/.github/workflows/build_macos.yml
@@ -2,7 +2,7 @@ name: Build macOS
 
 on:
   push:
-    branches: [master]
+    branches: [master,update]
   pull_request:
     branches:
       - '*'
@@ -51,7 +51,7 @@ jobs:
 
     - name: Build software
       run: |
-        pip install pyinstaller==5.0
+        pip install pyinstaller==5.3
         mkdir tmp_dependencies
         pyinstaller --noconfirm --clean assets/main.spec
 

diff --git a/.github/workflows/build_macos_m1.yml b/.github/workflows/build_macos_m1.yml
@@ -76,7 +76,7 @@ jobs:
       run: |
         cd ${{github.workspace}}
         source tmp/venv/bin/activate
-        pip3 install pyinstaller
+        pip3 install pyinstaller==5.3
         pip3 install --upgrade PyInstaller pyinstaller-hooks-contrib
         mkdir tmp_dependencies
         pyinstaller --noconfirm --clean assets/main_arm.spec

diff --git a/.github/workflows/build_ubuntu.yml b/.github/workflows/build_ubuntu.yml
@@ -61,7 +61,7 @@ jobs:
 
     - name: Build software
       run: |
-        pip install pyinstaller==5.0
+        pip install pyinstaller==5.3
         mkdir tmp_dependencies
         pyinstaller --noconfirm --clean assets/main.spec
 

diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml
@@ -2,7 +2,7 @@ name: Build Windows
 
 on:
   push:
-    branches: [master]
+    branches: [master,update]
   pull_request:
     branches:
       - '*'
@@ -49,7 +49,7 @@ jobs:
 
     - name: Build software
       run: |              
-        pip install pyinstaller==5.0
+        pip install pyinstaller==5.3
         mkdir tmp_dependencies
         pyinstaller --noconfirm --clean assets/main.spec
 

diff --git a/assets/Raidionics_ubuntu/DEBIAN/control b/assets/Raidionics_ubuntu/DEBIAN/control
@@ -1,5 +1,5 @@
 Package: Raidionics
-Version: 1.2.0
+Version: 1.2.1
 Architecture: i386
 Maintainer: David Bouget <[email protected]>
 Description: Raidionics—Reporting and Data System.

diff --git a/assets/main.spec b/assets/main.spec
@@ -20,7 +20,7 @@ print("PLATFORM:", sys.platform)
 # fix hidden imports
 hidden_imports = loadtxt(cwd + "/assets/requirements.txt", comments="#", delimiter=",", unpack=False, dtype=str)
 hidden_imports = [x.split("=")[0] for x in hidden_imports] + ["ants", "sklearn", "scikit-learn",
- "statsmodels", "gevent", "distutils", "PySide6", "gdown", "raidionicsrads", "raidionicsseg"]
+ "statsmodels", "gevent", "distutils", "PySide6", "gdown", "pydicom", "rt_utils", "raidionicsrads", "raidionicsseg"]
 hidden_imports = [x.lower() for x in hidden_imports]
 
 # copy dependencies and images, remove if folder already exists

diff --git a/assets/main_arm.spec b/assets/main_arm.spec
@@ -18,7 +18,7 @@ print("PLATFORM:", sys.platform)
 
 # fix hidden imports
 hidden_imports = loadtxt(cwd + "/assets/requirements.txt", comments="#", delimiter=",", unpack=False, dtype=str)
-hidden_imports = [x.split("=")[0] for x in hidden_imports] + ["medpy", "sklearn", "scikit-learn",
+hidden_imports = [x.split("=")[0] for x in hidden_imports] + ["sklearn", "scikit-learn",
  "statsmodels", "gevent", "distutils", "PySide6", "gdown", "pydicom", "rt_utils", "raidionicsrads", "raidionicsseg"]
 hidden_imports = [x.lower() for x in hidden_imports]
 

diff --git a/assets/requirements.txt b/assets/requirements.txt
@@ -2,4 +2,4 @@ gdown==4.7.1
 names==0.3.0
 PySide6==6.2.4
 plotly==5.8.0
-#rt_utils==1.2.7
+rt_utils==1.2.7
diff --git a/utils/data_structures/PatientParametersStructure.py b/utils/data_structures/PatientParametersStructure.py