From ae1a46a2ccf917317670b95fcf10b74322703ef4 Mon Sep 17 00:00:00 2001
From: pdelboca <patriciodelboca@gmail.com>
Date: Thu, 27 Jun 2024 12:13:50 +0200
Subject: [PATCH 01/21] Prepare server app for pyinstaller (no relative
 imports)

---
 server/__main__.py | 6 +++---
 server/client.py   | 4 ++--
 server/config.py   | 2 +-
 server/project.py  | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/server/__main__.py b/server/__main__.py
index 46f842621..8f1e99fff 100644
--- a/server/__main__.py
+++ b/server/__main__.py
@@ -1,8 +1,8 @@
 import typer
 
-from . import settings
-from .config import Config
-from .server import Server
+from server import settings
+from server.config import Config
+from server.server import Server
 
 
 def main(
diff --git a/server/client.py b/server/client.py
index 49b00fad3..21f58050c 100644
--- a/server/client.py
+++ b/server/client.py
@@ -1,7 +1,7 @@
 from typing import Any, Optional
 
-from . import endpoints
-from .project import Project
+from server import endpoints
+from server.project import Project
 
 
 class Client:
diff --git a/server/config.py b/server/config.py
index d027757b5..4e751efe8 100644
--- a/server/config.py
+++ b/server/config.py
@@ -2,7 +2,7 @@
 
 import attrs
 
-from . import settings
+from server import settings
 
 
 @attrs.define(kw_only=True, repr=False)
diff --git a/server/project.py b/server/project.py
index 982e4e996..778b8e39d 100644
--- a/server/project.py
+++ b/server/project.py
@@ -5,8 +5,8 @@
 
 from frictionless.resources import TextResource
 
-from . import settings
-from .stores import Config, Database, Filesystem, Metadata
+from server import settings
+from server.stores import Config, Database, Filesystem, Metadata
 
 
 class Project:

From 3a1af09353a45eab7d04124f8e3bf6d50119bdef Mon Sep 17 00:00:00 2001
From: pdelboca <patriciodelboca@gmail.com>
Date: Thu, 27 Jun 2024 12:15:09 +0200
Subject: [PATCH 02/21] Add Pyinstaller dependency

---
 pyproject.toml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pyproject.toml b/pyproject.toml
index 3076d84ea..8e4479028 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -35,6 +35,8 @@ dependencies = [
     "pygithub==1.59.1",
     # Zenodo
     "pyzenodo3==1.0.2",
+    # PyInstaller
+    "pyinstaller==6.8.0"
 ]
 
 [tool.setuptools]

From b453ac6d8463b39f6dc6a8791fa08f54a6469b3e Mon Sep 17 00:00:00 2001
From: pdelboca <patriciodelboca@gmail.com>
Date: Thu, 27 Jun 2024 12:31:45 +0200
Subject: [PATCH 03/21] Build server using pyinstaller

---
 build.py | 50 ++++++++------------------------------------------
 1 file changed, 8 insertions(+), 42 deletions(-)

diff --git a/build.py b/build.py
index a1d9f1640..1db7668c6 100644
--- a/build.py
+++ b/build.py
@@ -1,9 +1,6 @@
 import os
 import shutil
-import sys
-import tarfile
-
-import fsspec
+import PyInstaller.__main__
 
 
 def build_assets():
@@ -17,47 +14,16 @@ def build_assets():
     print(f"[assets] Copied '{source}' to '{target}'")
 
 
-def build_runner():
-    cache = ".cache"
-    target = "build/runner"
-
-    os.makedirs(cache, exist_ok=True)
-    shutil.rmtree(target, ignore_errors=True)
-
-    datemark = "20230826"
-    basepath = "https://github.com/indygreg/python-build-standalone/releases/download"
-    filetype = "x86_64-unknown-linux-gnu-install_only"
-    if sys.platform == "darwin":
-        filetype = "x86_64-apple-darwin-install_only"
-    if sys.platform == "win32":
-        filetype = "x86_64-pc-windows-msvc-shared-install_only"
-    filename = f"cpython-3.10.13+{datemark}-{filetype}.tar.gz"
-
-    if not os.path.exists(f"{cache}/{filename}"):
-        local = fsspec.filesystem("file")
-        remote = fsspec.filesystem("http")
-        with local.open(f"{cache}/{filename}", "wb") as file_to:
-            with remote.open(f"{basepath}/{datemark}/{filename}", "rb") as file_from:
-                file_to.write(file_from.read())
-
-    with tarfile.open(f"{cache}/{filename}", "r:gz") as tar:
-        tar.extractall(cache)
-        shutil.move(f"{cache}/python", target)
-
-    print(f"[runner] Copied 'runner' to '{target}'")
-
-
 def build_server():
-    source = "server"
-    target = "build/server"
-
-    shutil.rmtree(target, ignore_errors=True)
-    shutil.copytree(source, target)
-
-    print(f"[server] Copied '{source}' to '{target}'")
+    PyInstaller.__main__.run([
+        'server/__main__.py',
+        '--onefile',
+        '--name', 'server',
+        '--collect-all', 'frictionless',
+        '--distpath', 'build/server'
+    ])
 
 
 if __name__ == "__main__":
     build_assets()
-    build_runner()
     build_server()

From 76ba81829543541c682a49ff5642d18e680dcd92 Mon Sep 17 00:00:00 2001
From: pdelboca <patriciodelboca@gmail.com>
Date: Thu, 27 Jun 2024 12:32:01 +0200
Subject: [PATCH 04/21] Run server using pyinstaller executable

---
 desktop/server.ts   | 6 +-----
 desktop/settings.ts | 2 ++
 desktop/system.ts   | 6 +++---
 desktop/window.ts   | 9 ---------
 4 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/desktop/server.ts b/desktop/server.ts
index 9b81eef22..66535f512 100644
--- a/desktop/server.ts
+++ b/desktop/server.ts
@@ -6,11 +6,7 @@ export async function runServer() {
   log.info(`[Run FastAPI server on port 4040`)
 
   // Start production server
-  const proc = spawnFile(
-    settings.PYTHON_TARGET,
-    ['-m', 'server', settings.APP_TMP, '--port', `4040`],
-    process.resourcesPath
-  )
+  const proc = spawnFile(settings.SERVER_EXEC, [settings.APP_TMP])
 
   return proc
 }
diff --git a/desktop/settings.ts b/desktop/settings.ts
index 235013b80..11d0eeaa3 100644
--- a/desktop/settings.ts
+++ b/desktop/settings.ts
@@ -18,3 +18,5 @@ export const APP_TMP = join(APP_HOME, 'tmp')
 
 export const PYTHON_SOURCE = join(APP_PYTHON, WIN ? 'python.exe' : 'bin/python3')
 export const PYTHON_TARGET = join(APP_PYTHON_VENV, WIN ? 'Scripts\\python.exe' : 'bin/python3')
+
+export const SERVER_EXEC = join(DIST_SERVER, WIN ? 'server.exe': 'server')
diff --git a/desktop/system.ts b/desktop/system.ts
index cbce1dcf6..e8400c652 100644
--- a/desktop/system.ts
+++ b/desktop/system.ts
@@ -10,10 +10,10 @@ export async function execFile(path: string, args: string[], cwd?: string) {
   return stdout
 }
 
-export async function spawnFile(path: string, args: string[], cwd?: string) {
-  log.info('[spawnFile]', { path, args, cwd })
+export async function spawnFile(path: string, args: string[]) {
+  log.info('[spawnFile]', { path, args})
 
-  const proc = cp.spawn(path, args, { cwd })
+  const proc = cp.spawn(path, args)
   proc.stdout.on('data', (data) => log.info(data.toString().trim()))
   proc.stderr.on('data', (data) => log.error(data.toString().trim()))
   proc.on('close', (code) => {
diff --git a/desktop/window.ts b/desktop/window.ts
index 5d232d3f9..072b3fa83 100644
--- a/desktop/window.ts
+++ b/desktop/window.ts
@@ -60,17 +60,8 @@ export async function createWindow() {
   // mainWindow.webContents.openDevTools()
   
   if (!is.dev) {
-    log.info('Opening loading.html')
-    splashWindow.loadFile(resolve(__dirname, '..', 'client', 'loading.html'))
-    splashWindow.center()
     log.info('## Start server')
-    await resources.ensurePython()
-    await python.ensurePythonVirtualEnvironment()
-    splashWindow?.webContents.send('ensureLogs', "python")
-    await python.ensurePythonRequirements()
-    splashWindow?.webContents.send('ensureLogs', "requirements")
     await server.runServer()
-    splashWindow?.webContents.send('ensureLogs', "server")
   }
 
   loadingEvents.emit('finished')

From 96ee0712041d02842a73ef9d285325d5dc91c076 Mon Sep 17 00:00:00 2001
From: pdelboca <patriciodelboca@gmail.com>
Date: Thu, 27 Jun 2024 13:44:48 +0200
Subject: [PATCH 05/21] Restore loading screen

---
 client/loading.html | 20 +-------------------
 desktop/window.ts   |  3 +++
 2 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/client/loading.html b/client/loading.html
index c0fa139fb..3cffe7f0a 100644
--- a/client/loading.html
+++ b/client/loading.html
@@ -6,22 +6,6 @@
     <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline';" />
       <script>
       window?.opendataeditor.ensureLogs((message) => {
-        if (message == "python") {
-          var element = document.getElementById("python")
-          var loader = document.getElementById("loader")
-          element.classList.toggle('pending')
-          element.removeChild(loader)
-          var next = document.getElementById("requirements")
-          next.appendChild(loader)
-        }
-        if (message == "requirements") {
-          var element = document.getElementById("requirements")
-          var loader = document.getElementById("loader")
-          element.classList.toggle('pending')
-          element.removeChild(loader)
-          var next = document.getElementById("server")
-          next.appendChild(loader)
-        }
         if (message == "server") {
           var element = document.getElementById("server")
           var loader = document.getElementById("loader")
@@ -61,9 +45,7 @@
         <h1 style="text-align: center;">Open Data Editor is loading</h1>
         <p style="text-align: center;">The first time launching Open Data Editor needs to ensure requirements are installed.</p>
         <ul id="logs">
-          <li class="pending" id="python">Ensure python is installed <span id="loader" class="loader"></span></li>
-          <li class="pending" id="requirements">Ensure python dependencies are installed</li>
-          <li class="pending" id="server">Ensure server is running</li>
+          <li class="pending" id="server">Starting backend Python server<span id="loader" class="loader"></span></li>
         </ul>
       </div>
     </section>
diff --git a/desktop/window.ts b/desktop/window.ts
index 072b3fa83..f82f8866e 100644
--- a/desktop/window.ts
+++ b/desktop/window.ts
@@ -60,6 +60,9 @@ export async function createWindow() {
   // mainWindow.webContents.openDevTools()
   
   if (!is.dev) {
+    log.info('Opening loading.html')
+    splashWindow.loadFile(resolve(__dirname, '..', 'client', 'loading.html'))
+    splashWindow.center()
     log.info('## Start server')
     await server.runServer()
   }

From 59f2f00e1e5886e61ff0fbbf0042cb69808bc768 Mon Sep 17 00:00:00 2001
From: pdelboca <patriciodelboca@gmail.com>
Date: Thu, 27 Jun 2024 14:12:56 +0200
Subject: [PATCH 06/21] Upgrade to Python 3.11

---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index 8e4479028..4d4820c59 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -47,7 +47,7 @@ path = "package.json"
 pattern = '"version": "(?P<version>.*)"'
 
 [tool.hatch.envs.default]
-python = "3.10"
+python = "3.11"
 dependencies = [
     "ruff",
     "httpx",

From 50f171343d1de6b00eba6ecd47848bf55eae716e Mon Sep 17 00:00:00 2001
From: pdelboca <patriciodelboca@gmail.com>
Date: Thu, 27 Jun 2024 14:13:10 +0200
Subject: [PATCH 07/21] Clean and document build process

---
 build.py              | 5 +++--
 electron-builder.yaml | 7 -------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/build.py b/build.py
index 1db7668c6..fccd0e6d8 100644
--- a/build.py
+++ b/build.py
@@ -15,12 +15,13 @@ def build_assets():
 
 
 def build_server():
+    """Build an executable file for the FastAPI server."""
     PyInstaller.__main__.run([
         'server/__main__.py',
         '--onefile',
         '--name', 'server',
-        '--collect-all', 'frictionless',
-        '--distpath', 'build/server'
+        '--collect-all', 'frictionless',  # Frictionless depends on data files
+        '--distpath', 'build/server'  # Output the file to the build folder
     ])
 
 
diff --git a/electron-builder.yaml b/electron-builder.yaml
index 8f77e4578..35ff07ec9 100644
--- a/electron-builder.yaml
+++ b/electron-builder.yaml
@@ -12,15 +12,8 @@ files:
   - 'build/client/**/*'
   - 'build/desktop/**/*'
 extraResources:
-  - from: 'pyproject.toml'
-    to: 'pyproject.toml'
-  - from: 'build/runner'
-    to: 'runner'
   - from: 'build/server'
     to: 'server'
-    filter:
-      - '**/*'
-      - '!**/__pycache__'
 
 # Linux
 

From 6782a6563c5f380a19b5b07ea1620bff69f40359 Mon Sep 17 00:00:00 2001
From: pdelboca <patriciodelboca@gmail.com>
Date: Thu, 27 Jun 2024 14:18:18 +0200
Subject: [PATCH 08/21] Add build comments

---
 build.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/build.py b/build.py
index fccd0e6d8..20b022cfa 100644
--- a/build.py
+++ b/build.py
@@ -7,21 +7,24 @@ def build_assets():
     source = "desktop/assets"
     target = "build"
 
+    print(f"[assets] Copying '{source}' to '{target}'")
+
     os.makedirs(target, exist_ok=True)
     for name in os.listdir(source):
         shutil.copy(f"{source}/{name}", target)
 
-    print(f"[assets] Copied '{source}' to '{target}'")
-
 
 def build_server():
     """Build an executable file for the FastAPI server."""
+
+    print("[server] Creating executable file for FastAPI server")
     PyInstaller.__main__.run([
         'server/__main__.py',
         '--onefile',
         '--name', 'server',
         '--collect-all', 'frictionless',  # Frictionless depends on data files
-        '--distpath', 'build/server'  # Output the file to the build folder
+        '--distpath', 'build/server',  # Output the file to the build folder
+        '--log-level', 'ERROR'
     ])
 
 

From 4bed9ae2d9fe48148bf1ada6a05564c2d50863a7 Mon Sep 17 00:00:00 2001
From: pdelboca <patriciodelboca@gmail.com>
Date: Thu, 27 Jun 2024 14:32:45 +0200
Subject: [PATCH 09/21] Update github actions to Python 3.11

---
 .github/workflows/general.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/general.yaml b/.github/workflows/general.yaml
index a3ac3e1a9..8590e3af1 100644
--- a/.github/workflows/general.yaml
+++ b/.github/workflows/general.yaml
@@ -24,7 +24,7 @@ jobs:
       - name: Install Python
         uses: actions/setup-python@v4
         with:
-          python-version: '3.10'
+          python-version: '3.11'
       - name: Install Node
         uses: actions/setup-node@v3
         with:
@@ -50,7 +50,7 @@ jobs:
       - name: Install Python
         uses: actions/setup-python@v4
         with:
-          python-version: '3.10'
+          python-version: '3.11'
       - name: Install Node
         uses: actions/setup-node@v3
         with:
@@ -90,7 +90,7 @@ jobs:
       - name: Install Python
         uses: actions/setup-python@v4
         with:
-          python-version: '3.10'
+          python-version: '3.11'
       - name: Install Node
         uses: actions/setup-node@v3
         with:

From 9e64329d0b04e3e1de8b2feaff4e600b96120f3d Mon Sep 17 00:00:00 2001
From: pdelboca <patriciodelboca@gmail.com>
Date: Fri, 28 Jun 2024 09:10:48 +0200
Subject: [PATCH 10/21] Clean old Python related code

---
 desktop/python.ts    | 69 --------------------------------------------
 desktop/resources.ts | 22 --------------
 2 files changed, 91 deletions(-)
 delete mode 100644 desktop/python.ts
 delete mode 100644 desktop/resources.ts

diff --git a/desktop/python.ts b/desktop/python.ts
deleted file mode 100644
index 5144d5afc..000000000
--- a/desktop/python.ts
+++ /dev/null
@@ -1,69 +0,0 @@
-import fs from 'fs'
-import fsp from 'fs/promises'
-import * as settings from './settings'
-import { join } from 'path'
-import log from 'electron-log'
-import toml from 'toml'
-import * as system from './system'
-
-export async function ensurePythonVirtualEnvironment() {
-  // When running, ODE will ensure that a virtual environment for dependencies exists
-  log.info('[ensurePythonVirtualEnvironment]', { path: settings.APP_PYTHON_VENV })
-
-  let message = 'existed'
-  if (!fs.existsSync(settings.APP_PYTHON_VENV)) {
-    await system.execFile(settings.PYTHON_SOURCE, ['-m', 'venv', settings.APP_PYTHON_VENV])
-    message = 'created'
-  }
-
-  log.info('[ensurePythonVirtualEnvironment]', { message })
-}
-
-export async function ensurePythonRequirements() {
-  // When running, ODE will ensure that all python dependencies are installed.
-  log.info('[ensurePythonRequirements]')
-
-  const required = await readRequiredLibraries()
-  const installed = await readInstalledLibraries()
-  const missing = required.filter((spec) => !installed.includes(spec))
-  if (!missing.length) return
-
-  await system.execFile(settings.PYTHON_TARGET, [
-    '-m',
-    'pip',
-    'install',
-    '--upgrade',
-    '--disable-pip-version-check',
-    ...missing,
-  ])
-
-  log.info('[ensurePythonRequirements]', { missing })
-}
-
-export async function readRequiredLibraries() {
-  log.info('[readRequiredLibraries]')
-
-  const path = join(settings.DIST, 'pyproject.toml')
-  const text = await fsp.readFile(path, 'utf-8')
-  const data = toml.parse(text).project.dependencies as string[]
-
-  log.info('[readRequiredLibraries]', { data })
-  return data
-}
-
-export async function readInstalledLibraries() {
-  log.info('[readInstalledLibraries]')
-
-  const text = await system.execFile(settings.PYTHON_TARGET, [
-    '-m',
-    'pip',
-    'list',
-    '--format',
-    'freeze',
-    '--disable-pip-version-check',
-  ])
-  const data = text.split(/\r?\n/).map((line) => line.trim().toLowerCase())
-
-  log.info('[readInstalledLibraries]', { data })
-  return data
-}
diff --git a/desktop/resources.ts b/desktop/resources.ts
deleted file mode 100644
index 6c2750ec9..000000000
--- a/desktop/resources.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import fs from 'fs'
-import fsp from 'fs/promises'
-import * as settings from './settings'
-import log from 'electron-log'
-
-export async function ensurePython() {
-  // ODE builds a Python 3.10 distribution and ships it with the app.
-  // It is generated when running make build
-  log.info('[ensurePython]', { path: settings.APP_PYTHON })
-
-  let message = 'existed'
-  if (!fs.existsSync(settings.APP_PYTHON)) {
-    await fsp.mkdir(settings.APP_PYTHON, { recursive: true })
-    await fsp.cp(settings.DIST_PYTHON, settings.APP_PYTHON, {
-      recursive: true,
-      verbatimSymlinks: true,
-    })
-    message = 'created'
-  }
-
-  log.info('[ensurePython]', { message })
-}

From d9074333fc169cdaeb3ceee8258f8f487fbb4ef9 Mon Sep 17 00:00:00 2001
From: pdelboca <patriciodelboca@gmail.com>
Date: Fri, 28 Jun 2024 09:10:59 +0200
Subject: [PATCH 11/21] Clean and document settings

---
 desktop/settings.ts | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/desktop/settings.ts b/desktop/settings.ts
index 11d0eeaa3..0b69999ee 100644
--- a/desktop/settings.ts
+++ b/desktop/settings.ts
@@ -3,20 +3,19 @@ import { join } from 'path'
 
 export const WIN = process.platform === 'win32'
 export const HOME = os.homedir()
+export const APP_NAME = 'opendataeditor'
+export const APP_USER_MODEL_ID = 'org.opendataeditor'
 
+// DIST point to the folder where the application will be installed in the OS
+// opt in Linux and AppData in Windows
 export const DIST = process.resourcesPath
-export const DIST_PYTHON = join(DIST, 'runner')
-export const DIST_SERVER = join(DIST, 'server')
 
-export const APP_NAME = 'opendataeditor'
-export const APP_USER_MODEL_ID = 'org.opendataeditor'
+// Folder in the OS where we will store data generated by the application
+// Example: /home/<user>/.opendataeditor
 export const APP_HOME = join(HOME, `.${APP_NAME}`)
-export const APP_PYTHON = join(APP_HOME, 'runner')
-export const APP_PYTHON_VENV = join(APP_HOME, 'python')
+
 // APP_TMP will be the folder to upload files the first time the user opens the Application
 export const APP_TMP = join(APP_HOME, 'tmp')
 
-export const PYTHON_SOURCE = join(APP_PYTHON, WIN ? 'python.exe' : 'bin/python3')
-export const PYTHON_TARGET = join(APP_PYTHON_VENV, WIN ? 'Scripts\\python.exe' : 'bin/python3')
-
-export const SERVER_EXEC = join(DIST_SERVER, WIN ? 'server.exe': 'server')
+// Path to the FastAPI executable file to be run by the Desktop Application
+export const SERVER_EXEC = join(DIST, 'server', WIN ? 'server.exe': 'server')

From 12ae98ea3bb8ca025b6209e422aed089930a5b7d Mon Sep 17 00:00:00 2001
From: pdelboca <patriciodelboca@gmail.com>
Date: Fri, 28 Jun 2024 09:17:21 +0200
Subject: [PATCH 12/21] Simplify runServer method

---
 desktop/server.ts | 15 ++++++++++++---
 desktop/system.ts | 28 ----------------------------
 2 files changed, 12 insertions(+), 31 deletions(-)
 delete mode 100644 desktop/system.ts

diff --git a/desktop/server.ts b/desktop/server.ts
index 66535f512..6b20008c1 100644
--- a/desktop/server.ts
+++ b/desktop/server.ts
@@ -1,12 +1,21 @@
-import { spawnFile } from './system'
+import cp from 'child_process'
 import * as settings from './settings'
 import log from 'electron-log'
 
 export async function runServer() {
-  log.info(`[Run FastAPI server on port 4040`)
+  log.info(`[FastAPI Server] Running backend server on port 4040`)
 
   // Start production server
-  const proc = spawnFile(settings.SERVER_EXEC, [settings.APP_TMP])
+  const proc = cp.spawn(settings.SERVER_EXEC, [settings.APP_TMP])
 
+  proc.stdout.on('data', (data) => log.info(data.toString().trim()))
+  proc.stderr.on('data', (data) => log.error(data.toString().trim()))
+  proc.on('close', (code) => {
+    log.info('[FastAPI Server]', { message: `child process exited with code ${code}` })
+  })
+  process.on('exit', () => {
+    log.info('[FastAPI Server]', { message: `exiting child process on node exit` })
+    proc.kill()
+  })
   return proc
 }
diff --git a/desktop/system.ts b/desktop/system.ts
deleted file mode 100644
index e8400c652..000000000
--- a/desktop/system.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import cp from 'child_process'
-import util from 'util'
-import log from 'electron-log'
-const execFilePromise = util.promisify(cp.execFile)
-
-export async function execFile(path: string, args: string[], cwd?: string) {
-  log.info('[execFile]', { path, args, cwd })
-
-  const { stdout } = await execFilePromise(path, args, { cwd })
-  return stdout
-}
-
-export async function spawnFile(path: string, args: string[]) {
-  log.info('[spawnFile]', { path, args})
-
-  const proc = cp.spawn(path, args)
-  proc.stdout.on('data', (data) => log.info(data.toString().trim()))
-  proc.stderr.on('data', (data) => log.error(data.toString().trim()))
-  proc.on('close', (code) => {
-    log.info('[spawnFile]', { message: `child process exited with code ${code}` })
-  })
-  process.on('exit', () => {
-    log.info('[spawnFile]', { message: `exiting child process on node exit` })
-    proc.kill()
-  })
-
-  return proc
-}

From e4e285d09e6cadd49d9a92f006117e65fab4e8a0 Mon Sep 17 00:00:00 2001
From: pdelboca <patriciodelboca@gmail.com>
Date: Fri, 28 Jun 2024 09:18:53 +0200
Subject: [PATCH 13/21] Clean no longer needed imports

---
 desktop/window.ts | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/desktop/window.ts b/desktop/window.ts
index f82f8866e..0475895ab 100644
--- a/desktop/window.ts
+++ b/desktop/window.ts
@@ -4,8 +4,6 @@ import { resolve, join } from 'path'
 import { is } from '@electron-toolkit/utils'
 import log from 'electron-log'
 import * as server from './server'
-import * as python from './python'
-import * as resources from './resources'
 import EventEmitter from 'events'
 
 const loadingEvents = new EventEmitter()
@@ -58,7 +56,7 @@ export async function createWindow() {
 
   // Open the DevTools.
   // mainWindow.webContents.openDevTools()
-  
+
   if (!is.dev) {
     log.info('Opening loading.html')
     splashWindow.loadFile(resolve(__dirname, '..', 'client', 'loading.html'))

From 7895c166383eea5334cc2b4267fe3e742ba514ca Mon Sep 17 00:00:00 2001
From: pdelboca <patriciodelboca@gmail.com>
Date: Fri, 28 Jun 2024 09:21:45 +0200
Subject: [PATCH 14/21] Clean comment

---
 desktop/window.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/desktop/window.ts b/desktop/window.ts
index 0475895ab..de948246c 100644
--- a/desktop/window.ts
+++ b/desktop/window.ts
@@ -12,7 +12,7 @@ const loadingEvents = new EventEmitter()
 import icon from './assets/icon.png?asset'
 
 export async function createWindow() {
-  // Create the browser window.
+
   var splashWindow = new BrowserWindow({
     width: 500,
     height: 500,

From 7a5e768677ee8af7936cef873c4408bbff2d2659 Mon Sep 17 00:00:00 2001
From: pdelboca <patriciodelboca@gmail.com>
Date: Fri, 28 Jun 2024 10:06:08 +0200
Subject: [PATCH 15/21] Show build warnings

---
 build.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.py b/build.py
index 20b022cfa..8f1366372 100644
--- a/build.py
+++ b/build.py
@@ -24,7 +24,7 @@ def build_server():
         '--name', 'server',
         '--collect-all', 'frictionless',  # Frictionless depends on data files
         '--distpath', 'build/server',  # Output the file to the build folder
-        '--log-level', 'ERROR'
+        '--log-level', 'WARN'
     ])
 
 

From 3e9661e8466fc47a0606e311d71e0eec41a32f35 Mon Sep 17 00:00:00 2001
From: pdelboca <patriciodelboca@gmail.com>
Date: Fri, 28 Jun 2024 11:07:40 +0200
Subject: [PATCH 16/21] Do not use onefile as it is more unstable than default.

---
 build.py            | 2 --
 desktop/settings.ts | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/build.py b/build.py
index 8f1366372..02ac05115 100644
--- a/build.py
+++ b/build.py
@@ -20,8 +20,6 @@ def build_server():
     print("[server] Creating executable file for FastAPI server")
     PyInstaller.__main__.run([
         'server/__main__.py',
-        '--onefile',
-        '--name', 'server',
         '--collect-all', 'frictionless',  # Frictionless depends on data files
         '--distpath', 'build/server',  # Output the file to the build folder
         '--log-level', 'WARN'
diff --git a/desktop/settings.ts b/desktop/settings.ts
index 0b69999ee..8364e884c 100644
--- a/desktop/settings.ts
+++ b/desktop/settings.ts
@@ -18,4 +18,4 @@ export const APP_HOME = join(HOME, `.${APP_NAME}`)
 export const APP_TMP = join(APP_HOME, 'tmp')
 
 // Path to the FastAPI executable file to be run by the Desktop Application
-export const SERVER_EXEC = join(DIST, 'server', WIN ? 'server.exe': 'server')
+export const SERVER_EXEC = join(DIST, 'server/__main__', WIN ? '__main__.exe': '__main__')

From 98b45fc2a5cb86639d0aa33fb4d427c9fac64c39 Mon Sep 17 00:00:00 2001
From: pdelboca <patriciodelboca@gmail.com>
Date: Fri, 28 Jun 2024 11:08:25 +0200
Subject: [PATCH 17/21] Add labels to logs

---
 desktop/server.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/desktop/server.ts b/desktop/server.ts
index 6b20008c1..67107737f 100644
--- a/desktop/server.ts
+++ b/desktop/server.ts
@@ -8,8 +8,8 @@ export async function runServer() {
   // Start production server
   const proc = cp.spawn(settings.SERVER_EXEC, [settings.APP_TMP])
 
-  proc.stdout.on('data', (data) => log.info(data.toString().trim()))
-  proc.stderr.on('data', (data) => log.error(data.toString().trim()))
+  proc.stdout.on('data', (data) => log.info(`[FastAPI Server stdout] ${data.toString().trim()}`))
+  proc.stderr.on('data', (data) => log.error(`[FastAPI Server stderr] ${data.toString().trim()}`))
   proc.on('close', (code) => {
     log.info('[FastAPI Server]', { message: `child process exited with code ${code}` })
   })
@@ -19,3 +19,4 @@ export async function runServer() {
   })
   return proc
 }
+

From 66abf028fb93eeca783330a9b64f781a9833bd12 Mon Sep 17 00:00:00 2001
From: pdelboca <patriciodelboca@gmail.com>
Date: Wed, 10 Jul 2024 14:16:09 +0200
Subject: [PATCH 18/21] Increase python version in pyproject.toml

---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index 4d4820c59..3adef7469 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,7 +1,7 @@
 [project]
 name = "opendataeditor"
 dynamic = ["version"]
-requires-python = ">=3.10"
+requires-python = ">=3.11"
 dependencies = [
     # Core
     "fastapi==0.103.1",

From f760aa79302a8af1902cd2337e5f46b4575aede0 Mon Sep 17 00:00:00 2001
From: pdelboca <patriciodelboca@gmail.com>
Date: Wed, 10 Jul 2024 14:17:32 +0200
Subject: [PATCH 19/21] Update doc with proper Python version.

---
 portal/content/docs/contributing/development.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/portal/content/docs/contributing/development.md b/portal/content/docs/contributing/development.md
index c3f02f99e..e048fb79b 100644
--- a/portal/content/docs/contributing/development.md
+++ b/portal/content/docs/contributing/development.md
@@ -10,7 +10,7 @@ Open Data Editor uses a client/server architecture wrapped into a desktop applic
 
 To start working on the project:
 
-- Python 3.10+
+- Python 3.11+
 - Node 20+
 
 ## Enviroment

From 8307242bd7874fe68249d0a0005240daca5e3677 Mon Sep 17 00:00:00 2001
From: pdelboca <patriciodelboca@gmail.com>
Date: Wed, 10 Jul 2024 14:21:16 +0200
Subject: [PATCH 20/21] Add python3.11-dev dependency to the docs

---
 portal/content/docs/contributing/development.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/portal/content/docs/contributing/development.md b/portal/content/docs/contributing/development.md
index e048fb79b..af71258f9 100644
--- a/portal/content/docs/contributing/development.md
+++ b/portal/content/docs/contributing/development.md
@@ -8,10 +8,11 @@ Open Data Editor uses a client/server architecture wrapped into a desktop applic
 
 ## Prerequisites
 
-To start working on the project:
+To start working on the project you need the following dependencies in your machine:
 
 - Python 3.11+
 - Node 20+
+- python3.11-dev (For PyInstaller)
 
 ## Enviroment
 

From 68a7438a79a31ce25804961ac7bb228ce7b4b236 Mon Sep 17 00:00:00 2001
From: pdelboca <patriciodelboca@gmail.com>
Date: Mon, 15 Jul 2024 15:00:12 +0200
Subject: [PATCH 21/21] Use Ubuntu 20.04 as OS to build the application.

---
 .github/workflows/general.yaml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/general.yaml b/.github/workflows/general.yaml
index 8590e3af1..b2c4be1f3 100644
--- a/.github/workflows/general.yaml
+++ b/.github/workflows/general.yaml
@@ -37,11 +37,12 @@ jobs:
         run: make test
 
   # Build
-
+  # For GNU/Linux we need to build our application in the oldest version we want to support.
+  # https://pyinstaller.org/en/stable/usage.html?highlight=glibc#making-gnu-linux-apps-forward-compatible
   build:
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
+        os: [ubuntu-20.04, macos-latest, windows-latest]
     runs-on: ${{ matrix.os }}
     needs: [test]
     steps:
@@ -81,7 +82,7 @@ jobs:
     if: github.event_name == 'push' && contains(github.ref, 'refs/tags/')
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
+        os: [ubuntu-20.04, macos-latest, windows-latest]
     runs-on: ${{ matrix.os }}
     needs: [test]
     steps: