From 6c2431ec6de77bc9fa1e7a3f3966d1ba1eea02ae Mon Sep 17 00:00:00 2001
From: Johannes Laurin Hoermann <johannes.hoermann@imtek.uni-freiburg.de>
Date: Fri, 8 Nov 2024 11:56:36 +0100
Subject: [PATCH] CI: everything in venv in mingw

---
 .github/workflows/build-installer-on-windows.yml | 15 ++++-----------
 .github/workflows/build-on-windows.yml           | 15 ++++-----------
 2 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/build-installer-on-windows.yml b/.github/workflows/build-installer-on-windows.yml
index 0d3ee65..3528a7d 100644
--- a/.github/workflows/build-installer-on-windows.yml
+++ b/.github/workflows/build-installer-on-windows.yml
@@ -98,6 +98,8 @@ jobs:
     # strategy: only install remaining pythonic dependencies via pip
     - name: Install remaining pythonic dependencies
       run: |
+        source venv/bin/activate
+        
         echo "### python and pip info ###"
         command -v python
         python --version
@@ -111,20 +113,11 @@ jobs:
     - name: Fix setuptools_scm-generated version
       id: fix_version
       run: |
+        source venv/bin/activate
+        
         version=$(SETUPTOOLS_SCM_DEBUG=1 python -m setuptools_scm)  # have version written to file to appear in bundled app as well
         echo "version=$version" >> $GITHUB_OUTPUT
 
-    - name: Create local venv
-      run: |
-        # recursive copy_metadata needed local reinstall of
-        #    $ pip install --ignore-installed six
-        # in minsys2/mingw64, would otherwise fail with
-        #    RuntimeError: No metadata path found for distribution 'six'.
-        # in pyinstaller/hooks/hook-dtoolcore.py
-        python -m venv --system-site-packages venv
-        source venv/bin/activate
-        pip install --ignore-installed six
-
     - name: Log python package info
       run: |
         source venv/bin/activate
diff --git a/.github/workflows/build-on-windows.yml b/.github/workflows/build-on-windows.yml
index a677dd7..6428c85 100644
--- a/.github/workflows/build-on-windows.yml
+++ b/.github/workflows/build-on-windows.yml
@@ -98,6 +98,8 @@ jobs:
     # strategy: only install remaining pythonic dependencies via pip
     - name: Install remaining pythonic dependencies
       run: |
+        source venv/bin/activate
+        
         echo "### python and pip info ###"
         command -v python
         python --version
@@ -111,20 +113,11 @@ jobs:
     - name: Fix setuptools_scm-generated version
       id: fix_version
       run: |
+        source venv/bin/activate
+        
         version=$(SETUPTOOLS_SCM_DEBUG=1 python -m setuptools_scm)  # have version written to file to appear in bundled app as well
         echo "version=$version" >> $GITHUB_OUTPUT
 
-    - name: Create local venv
-      run: |
-        # recursive copy_metadata needed local reinstall of
-        #    $ pip install --ignore-installed six
-        # in minsys2/mingw64, would otherwise fail with
-        #    RuntimeError: No metadata path found for distribution 'six'.
-        # in pyinstaller/hooks/hook-dtoolcore.py
-        python -m venv --system-site-packages venv
-        source venv/bin/activate
-        pip install --ignore-installed six
-
     - name: Log python package info
       run: |
         source venv/bin/activate