V1.5.0 merge

Author: MahdiAll99

.DS_Store

@@ -79,7 +79,7 @@ jobs:
           VERSION: ${{ steps.get-tag.outputs.VERSION }}
 
   build-linux-ubuntu:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
 
     steps:
       - name: Checkout code

.github/workflows/automaticBuilding.yml

@@ -7,7 +7,7 @@ permissions:
   contents: write
 jobs:
   build-linux-ubuntu:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
 
     steps:
       - name: Checkout code

.github/workflows/automaticBuildingLinux.yml

@@ -145,7 +145,7 @@ dmypy.json
 pythonCode/submodules/MEDimage/*
 pythonCode/submodules/MEDprofiles/*
 
-# Go executables
+# Go executables 
 go_server/main
 go_server/main.exe
 

.gitignore

@@ -187,7 +187,7 @@ export function getBundledPythonEnvironment() {
 }
 
 export async function installRequiredPythonPackages(mainWindow) {
-  let requirementsFileName = process.platform === "darwin" ? "requirements_mac.txt" : "requirements.txt"
+  let requirementsFileName = "merged_requirements.txt"
   if (process.env.NODE_ENV === "production") {
     installPythonPackage(mainWindow, pythonExecutablePath, null, path.join(process.cwd(), "resources", "pythonEnv", requirementsFileName))
   } else {
@@ -208,6 +208,12 @@ function comparePythonInstalledPackages(pythonPackages, requirements) {
       if (pythonPackage.name === requirementName && pythonPackage.version === requirementVersion) {
         found = true
         break
+      } else if (pythonPackage.name.replace('-', '_') === requirementName && pythonPackage.version === requirementVersion) {
+        found = true
+        break
+      } else if (pythonPackage.name.replace('_', '-') === requirementName && pythonPackage.version === requirementVersion) {
+        found = true
+        break
       }
     }
     if (!found) {
@@ -360,9 +366,9 @@ export async function installBundledPythonExecutable(mainWindow) {
 
       // Install the required python packages
       if (process.env.NODE_ENV === "production") {
-        installPythonPackage(mainWindow, pythonExecutablePath, null, path.join(process.cwd(), "resources", "pythonEnv", "requirements.txt"))
+        installPythonPackage(mainWindow, pythonExecutablePath, null, path.join(process.cwd(), "resources", "pythonEnv", "merged_requirements.txt"))
       } else {
-        installPythonPackage(mainWindow, pythonExecutablePath, null, path.join(process.cwd(), "pythonEnv", "requirements.txt"))
+        installPythonPackage(mainWindow, pythonExecutablePath, null, path.join(process.cwd(), "pythonEnv", "merged_requirements.txt"))
       }
       let removeCommand = `rm ${outputFileName}`
       let removePromise = exec(removeCommand, { shell: "powershell.exe" })
@@ -429,9 +435,9 @@ export async function installBundledPythonExecutable(mainWindow) {
       console.log("process.resourcesPath: ", process.resourcesPath)
       // Install the required python packages
       if (process.env.NODE_ENV === "production") {
-        installPythonPackage(mainWindow, pythonExecutablePath, null, path.join(process.resourcesPath, "pythonEnv", "requirements.txt"))
+        installPythonPackage(mainWindow, pythonExecutablePath, null, path.join(process.resourcesPath, "pythonEnv", "merged_requirements.txt"))
       } else {
-        installPythonPackage(mainWindow, pythonExecutablePath, null, path.join(process.cwd(), "pythonEnv", "requirements.txt"))
+        installPythonPackage(mainWindow, pythonExecutablePath, null, path.join(process.cwd(), "pythonEnv", "merged_requirements.txt"))
       }
     }
   }

build/.DS_Store

@@ -2,7 +2,7 @@
   "private": true,
   "name": "medomicslab-application",
   "description": "MEDomicsLab application",
-  "version": "1.0.0",
+  "version": "1.5.0",
   "author": "MEDomicsLab Team",
   "main": "app/background.js",
   "build": {