Merge branch 'master' of https://github.com/livMatS/dtool-lookup-gui

livMatS · Nov 6, 2024 · a139e8b · a139e8b
2 parents 2413e78 + ab56b79
commit a139e8b
Show file tree

Hide file tree

Showing 5 changed files with 488 additions and 645 deletions.
diff --git a/.github/workflows/build-installer-on-windows.yml b/.github/workflows/build-installer-on-windows.yml
@@ -84,7 +84,7 @@ jobs:
         echo "### pacman -Q ###"
         pacman -Q | tee pacman_Q.txt
         echo "### pacman -Q diff to reference configuration ###"
-        (git diff --ignore-space-change --ignore-cr-at-eol --no-index pyinstaller/mingw64_pacman_Q.txt pacman_Q.txt || true) | tee diff_pacman_q.txt
+        (git diff --ignore-space-change --ignore-cr-at-eol --no-index pyinstaller/win/mingw64_pacman_Q.txt pacman_Q.txt || true) | tee diff_pacman_q.txt
 
         # 2022/01/23, although msys2/setup-msys2@v2 setup has been kept as close as possible to
         # a local reference build system, former diverged from latter's pyinstaller behavior
@@ -104,7 +104,7 @@ jobs:
         pip --version
         echo "### install pythonic dependencies ###"
         python -m pip install --upgrade pip
-        pip install -r pyinstaller/mingw64_requirements.txt
+        pip install -r pyinstaller/win/requirements.txt
         pip install PyInstaller
         echo "PyInstaller version: $(python -m PyInstaller --version)"
 
@@ -132,12 +132,12 @@ jobs:
         echo "### pip freeze --local ###"
         pip freeze --local | tee pip_freeze_local.txt
         echo "### pip freeze --local diff to reference configuration ###"
-        (git diff --ignore-space-change --ignore-cr-at-eol --no-index pyinstaller/mingw64_venv_pip_freeze_local.txt pip_freeze_local.txt || true) | tee diff_pip_freeze_local.txt
+        (git diff --ignore-space-change --ignore-cr-at-eol --no-index pyinstaller/win/mingw64_venv_pip_freeze_local.txt pip_freeze_local.txt || true) | tee diff_pip_freeze_local.txt
 
         echo "### pip freeze ###"
         pip freeze | tee pip_freeze.txt
         echo "### pip freeze diff to reference configuration ###"
-        (git diff --ignore-space-change --ignore-cr-at-eol --no-index pyinstaller/mingw64_venv_pip_freeze.txt pip_freeze.txt || true) | tee diff_pip_freeze.txt
+        (git diff --ignore-space-change --ignore-cr-at-eol --no-index pyinstaller/win/mingw64_venv_pip_freeze.txt pip_freeze.txt || true) | tee diff_pip_freeze.txt
 
     - name: Compile gschemas
       run: |
@@ -149,7 +149,7 @@ jobs:
         source venv/bin/activate
         # only ran into problems when calling PyInstaller or pyinstaller directly,
         # would never find package metadata within the venv, call as module mitigates the issue:
-        python -m PyInstaller -y ./pyinstaller/dtool-lookup-gui-windows.spec 2>&1 | tee pyinstaller.log
+        python -m PyInstaller -y ./pyinstaller/win/dtool-lookup-gui-windows.spec 2>&1 | tee pyinstaller.log
 
     - name: Build installer
       run: |

diff --git a/.github/workflows/build-on-macos.yml b/.github/workflows/build-on-macos.yml
@@ -6,7 +6,7 @@ on:
 jobs:
   build:
 
-    runs-on: macos-14
+    runs-on: macos-13
 
     steps:
 
@@ -24,7 +24,7 @@ jobs:
 
     - name: Install system dependencies
       run: |
-        brew install python pygobject3 gtk+3 gtksourceview4 adwaita-icon-theme create-dmg gfortran
+        brew install python pygobject3 gtk+3 gtksourceview4 adwaita-icon-theme create-dmg gfortran numpy scipy
 
     - name: Log system package info
       run: |
@@ -41,8 +41,7 @@ jobs:
         source venv/bin/activate
 
         pip install --upgrade pip
-        pip install wheel setuptools setuptools_scm
-        pip install -r requirements.txt
+        pip install -r pyinstaller/macos/requirements.txt
         pip install pyinstaller
 
     - name: Fix setuptools_scm-generated version
@@ -70,7 +69,7 @@ jobs:
     - name: Package executable with pyinstaller
       run: |
         source venv/bin/activate
-        pyinstaller -y ./pyinstaller/dtool-lookup-gui-macos.spec 2>&1 | tee pyinstaller.log
+        pyinstaller -y ./pyinstaller/macos/dtool-lookup-gui-macos.spec 2>&1 | tee pyinstaller.log
         ls -lh dist
         mv dist/dtool-lookup-gui.app dtool-lookup-gui.app
 

diff --git a/.github/workflows/build-on-ubuntu.yml b/.github/workflows/build-on-ubuntu.yml
@@ -53,7 +53,7 @@ jobs:
       run: |
         pip install --upgrade pip
         pip install wheel setuptools_scm
-        pip install -r requirements.txt
+        pip install -r pyinstaller/linux/requirements.txt
         pip install pyinstaller
 
     - name: Fix setuptools_scm-generated version

diff --git a/.github/workflows/build-on-windows.yml b/.github/workflows/build-on-windows.yml
@@ -84,7 +84,7 @@ jobs:
         echo "### pacman -Q ###"
         pacman -Q | tee pacman_Q.txt
         echo "### pacman -Q diff to reference configuration ###"
-        (git diff --ignore-space-change --ignore-cr-at-eol --no-index pyinstaller/mingw64_pacman_Q.txt pacman_Q.txt || true) | tee diff_pacman_q.txt
+        (git diff --ignore-space-change --ignore-cr-at-eol --no-index pyinstaller/win/mingw64_pacman_Q.txt pacman_Q.txt || true) | tee diff_pacman_q.txt
 
         # 2022/01/23, although msys2/setup-msys2@v2 setup has been kept as close as possible to
         # a local reference build system, former diverged from latter's pyinstaller behavior
@@ -104,7 +104,7 @@ jobs:
         pip --version
         echo "### install pythonic dependencies ###"
         python -m pip install --upgrade pip
-        pip install -r pyinstaller/mingw64_requirements.txt
+        pip install -r pyinstaller/win/requirements.txt
         pip install PyInstaller
         echo "PyInstaller version: $(python -m PyInstaller --version)"
 
@@ -132,12 +132,12 @@ jobs:
         echo "### pip freeze --local ###"
         pip freeze --local | tee pip_freeze_local.txt
         echo "### pip freeze --local diff to reference configuration ###"
-        (git diff --ignore-space-change --ignore-cr-at-eol --no-index pyinstaller/mingw64_venv_pip_freeze_local.txt pip_freeze_local.txt || true) | tee diff_pip_freeze_local.txt
+        (git diff --ignore-space-change --ignore-cr-at-eol --no-index pyinstaller/win/mingw64_venv_pip_freeze_local.txt pip_freeze_local.txt || true) | tee diff_pip_freeze_local.txt
 
         echo "### pip freeze ###"
         pip freeze | tee pip_freeze.txt
         echo "### pip freeze diff to reference configuration ###"
-        (git diff --ignore-space-change --ignore-cr-at-eol --no-index pyinstaller/mingw64_venv_pip_freeze.txt pip_freeze.txt || true) | tee diff_pip_freeze.txt
+        (git diff --ignore-space-change --ignore-cr-at-eol --no-index pyinstaller/win/mingw64_venv_pip_freeze.txt pip_freeze.txt || true) | tee diff_pip_freeze.txt
 
     - name: Compile gschemas
       run: |
@@ -149,7 +149,7 @@ jobs:
         source venv/bin/activate
         # only ran into problems when calling PyInstaller or pyinstaller directly,
         # would never find package metadata within the venv, call as module mitigates the issue:
-        python -m PyInstaller -y ./pyinstaller/dtool-lookup-gui-windows-one-file.spec 2>&1 | tee pyinstaller.log
+        python -m PyInstaller -y ./pyinstaller/win/dtool-lookup-gui-windows-one-file.spec 2>&1 | tee pyinstaller.log
         mv dist/dtool-lookup-gui.exe dtool-lookup-gui.exe
 
     - name: Pack build assets