From 87dea83bf6428cd91918b0cbfeeb3f665f597d5d Mon Sep 17 00:00:00 2001
From: 1kastner <marvin.kastner@tuhh.de>
Date: Sat, 9 Dec 2023 21:57:49 +0100
Subject: [PATCH 01/22] Update installation-from-remote.yaml

---
 .github/workflows/installation-from-remote.yaml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.github/workflows/installation-from-remote.yaml b/.github/workflows/installation-from-remote.yaml
index 1bc585d0..cb5cd160 100644
--- a/.github/workflows/installation-from-remote.yaml
+++ b/.github/workflows/installation-from-remote.yaml
@@ -31,6 +31,10 @@ jobs:
         conda info
         conda create -n test-install-conflowgen -c conda-forge conflowgen pytest
 
+    - name: Check ConFlowGen version
+      run: |
+        conda search conflowgen -c conda-forge --info
+
     - name: Run tests
       run: |
         conda activate test-install-conflowgen
@@ -63,6 +67,10 @@ jobs:
         conda activate base
         conda create -n test-install-conflowgen -c conda-forge conflowgen pytest
 
+    - name: Check ConFlowGen version
+      run: |
+        conda search conflowgen -c conda-forge --info
+
     - name: Run tests
       run: |
         eval "$(conda shell.bash hook)"

From 1f8c088bbd610d04afc70dcbcfc1c8a1bd70ef6b Mon Sep 17 00:00:00 2001
From: 1kastner <marvin.kastner@tuhh.de>
Date: Sat, 9 Dec 2023 22:09:53 +0100
Subject: [PATCH 02/22] Make version check before installation

---
 .github/workflows/installation-from-remote.yaml | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/installation-from-remote.yaml b/.github/workflows/installation-from-remote.yaml
index cb5cd160..d5fdd77f 100644
--- a/.github/workflows/installation-from-remote.yaml
+++ b/.github/workflows/installation-from-remote.yaml
@@ -28,12 +28,10 @@ jobs:
 
     - name: Install ConFlowGen
       run: |
+        conda clean
         conda info
-        conda create -n test-install-conflowgen -c conda-forge conflowgen pytest
-
-    - name: Check ConFlowGen version
-      run: |
         conda search conflowgen -c conda-forge --info
+        conda create -n test-install-conflowgen -c conda-forge conflowgen pytest
 
     - name: Run tests
       run: |
@@ -63,14 +61,12 @@ jobs:
       run: |
         conda init bash
         eval "$(conda shell.bash hook)"
+        conda clean
         conda info
+        conda search conflowgen -c conda-forge --info
         conda activate base
         conda create -n test-install-conflowgen -c conda-forge conflowgen pytest
 
-    - name: Check ConFlowGen version
-      run: |
-        conda search conflowgen -c conda-forge --info
-
     - name: Run tests
       run: |
         eval "$(conda shell.bash hook)"

From 6c1b698c8ca84a294ade5e961fbbc1dbbf309e08 Mon Sep 17 00:00:00 2001
From: 1kastner <marvin.kastner@tuhh.de>
Date: Sat, 9 Dec 2023 22:12:40 +0100
Subject: [PATCH 03/22] Clean index, tarballs, and say yes to everything

---
 .github/workflows/installation-from-remote.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/installation-from-remote.yaml b/.github/workflows/installation-from-remote.yaml
index d5fdd77f..f2ff71cf 100644
--- a/.github/workflows/installation-from-remote.yaml
+++ b/.github/workflows/installation-from-remote.yaml
@@ -28,7 +28,7 @@ jobs:
 
     - name: Install ConFlowGen
       run: |
-        conda clean
+        conda clean -ity
         conda info
         conda search conflowgen -c conda-forge --info
         conda create -n test-install-conflowgen -c conda-forge conflowgen pytest
@@ -61,7 +61,7 @@ jobs:
       run: |
         conda init bash
         eval "$(conda shell.bash hook)"
-        conda clean
+        conda clean -ity
         conda info
         conda search conflowgen -c conda-forge --info
         conda activate base

From 1273b81f3659d6ac0bdbbd6527616803e5d492ed Mon Sep 17 00:00:00 2001
From: 1kastner <marvin.kastner@tuhh.de>
Date: Sat, 9 Dec 2023 22:40:53 +0100
Subject: [PATCH 04/22] Move ConFlowGen prepareation to own block

---
 .github/workflows/installation-from-remote.yaml | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/installation-from-remote.yaml b/.github/workflows/installation-from-remote.yaml
index f2ff71cf..4750455c 100644
--- a/.github/workflows/installation-from-remote.yaml
+++ b/.github/workflows/installation-from-remote.yaml
@@ -33,10 +33,14 @@ jobs:
         conda search conflowgen -c conda-forge --info
         conda create -n test-install-conflowgen -c conda-forge conflowgen pytest
 
-    - name: Run tests
+    - name: Prepare tests
       run: |
         conda activate test-install-conflowgen
+        conda update conflowgen
         conda install pillow=9.0.0
+
+    - name: Run tests
+      run: |
         python -m pytest --pyargs conflowgen
 
   build-conda-on-linux:
@@ -67,10 +71,14 @@ jobs:
         conda activate base
         conda create -n test-install-conflowgen -c conda-forge conflowgen pytest
 
-    - name: Run tests
+    - name: Prepare tests
       run: |
         eval "$(conda shell.bash hook)"
         conda activate test-install-conflowgen
+        conda update conflowgen
+
+    - name: Run tests
+      run: |
         python -m pytest --pyargs conflowgen
 
   build-pip:

From 43844980401562536f0f424243ac14bb599d375e Mon Sep 17 00:00:00 2001
From: 1kastner <marvin.kastner@tuhh.de>
Date: Sun, 10 Dec 2023 00:41:16 +0100
Subject: [PATCH 05/22] Use latest pip version

---
 .github/workflows/linting.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml
index 96296669..63228b11 100644
--- a/.github/workflows/linting.yml
+++ b/.github/workflows/linting.yml
@@ -33,6 +33,10 @@ jobs:
       with:
         python-version: ${{ matrix.python-version }}
 
+    - name: Use latest version of pip
+      run: |
+        pip3 install --upgrade pip
+
     - name: Install Python dependencies including pylint
       run: |
         pip3 install --user -e .[dev]

From 3c086ade84238350ccb0a37d939170d72096b5b1 Mon Sep 17 00:00:00 2001
From: 1kastner <marvin.kastner@tuhh.de>
Date: Sun, 10 Dec 2023 00:42:53 +0100
Subject: [PATCH 06/22] Use latest version of pip

---
 .github/workflows/unittests.yaml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/unittests.yaml b/.github/workflows/unittests.yaml
index eb289f22..2eed1455 100644
--- a/.github/workflows/unittests.yaml
+++ b/.github/workflows/unittests.yaml
@@ -30,9 +30,13 @@ jobs:
       with:
         python-version: "3.10"
 
+    - name: Use latest version of pip
+      run: |
+        python -m pip install --upgrade pip
+
     - name: Install Python dependencies
       run: |
-        pip3 install --user -e .[dev]
+        python -m pip install --user -e .[dev]
 
     - name: Test with pytest
       run: |

From 87784c62fdcf061598b2a8130fb3e86b8a901b51 Mon Sep 17 00:00:00 2001
From: 1kastner <marvin.kastner@tuhh.de>
Date: Sun, 10 Dec 2023 00:51:42 +0100
Subject: [PATCH 07/22] Update pip

---
 .github/workflows/docs.yaml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml
index eb147a97..ca3f88f6 100644
--- a/.github/workflows/docs.yaml
+++ b/.github/workflows/docs.yaml
@@ -17,7 +17,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.8, "3.10"]  # Check the oldest and newest currently supported Python versions
+        python-version: [3.8, "3.11"]  # Check the oldest and newest currently supported Python versions
 
     steps:
 
@@ -41,9 +41,13 @@ jobs:
       with:
         python-version: ${{ matrix.python-version }}
 
+    - name: Use latest version of pip
+      run: |
+        python -m pip install --upgrade pip
+
     - name: Install Python dependencies including sphinx
       run: |
-        pip3 install --user -e .[dev]
+        python -m pip install --user -e .[dev]
 
     - name: Build documentation and check for warnings
       run: |

From 10766990adf5edaf5caba735f8f0fffc5d9788fc Mon Sep 17 00:00:00 2001
From: 1kastner <marvin.kastner@tuhh.de>
Date: Sun, 10 Dec 2023 00:52:51 +0100
Subject: [PATCH 08/22] Use latest version of pip

---
 .github/workflows/installation-from-remote.yaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/installation-from-remote.yaml b/.github/workflows/installation-from-remote.yaml
index 4750455c..7f36338b 100644
--- a/.github/workflows/installation-from-remote.yaml
+++ b/.github/workflows/installation-from-remote.yaml
@@ -101,6 +101,10 @@ jobs:
       with:
         python-version: '3.10'
 
+    - name: Use latest version of pip
+      run: |
+        python -m pip install --upgrade pip
+
     - name: Install ConFlowGen
       run: |
         python -m pip install conflowgen pytest

From 6f459babb653c46bb9d3c24a956c189e17c41e39 Mon Sep 17 00:00:00 2001
From: 1kastner <marvin.kastner@tuhh.de>
Date: Sun, 10 Dec 2023 00:53:28 +0100
Subject: [PATCH 09/22] use python -m pip instead of pip3

---
 .github/workflows/linting.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml
index 63228b11..7bcd4bec 100644
--- a/.github/workflows/linting.yml
+++ b/.github/workflows/linting.yml
@@ -35,11 +35,11 @@ jobs:
 
     - name: Use latest version of pip
       run: |
-        pip3 install --upgrade pip
+        python -m pip install --upgrade pip
 
     - name: Install Python dependencies including pylint
       run: |
-        pip3 install --user -e .[dev]
+        python -m pip install --user -e .[dev]
 
     - name: Check code quality with pylint
       run: |

From cdb6ba2a44c16deaf75b5b424f2e0ab3d554f687 Mon Sep 17 00:00:00 2001
From: 1kastner <marvin.kastner@tuhh.de>
Date: Sun, 10 Dec 2023 12:14:33 +0100
Subject: [PATCH 10/22] Restrict several versions to improve pip version
 resolution

(cherry picked from commit c20556976db84c7f3002c124387c4ed4ad749e5b)
(cherry picked from commit 2ac7c6fe9d9dc99e20543ccc07bb738211b02fea)
---
 setup.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/setup.py b/setup.py
index 3d70c443..4c1cddc9 100644
--- a/setup.py
+++ b/setup.py
@@ -35,7 +35,7 @@
         'peewee >=3',  # ORM mapper
 
         # documentation - decorators used for sphinx but are part of the source code delivered to customers
-        'enum_tools >=0.7',  # used for documenting enums via decorators
+        'enum_tools >=0.7',  # used for documenting enums via decorators - previous versions are not compatible with this code base
 
         # for creating the visuals
         'matplotlib',  # default plots such as bar charts, pie charts, etc.
@@ -55,11 +55,11 @@
             'nbconvert',
 
             # build documentation
-            'sphinx',  # build the documentation
+            'sphinx >=6.2',  # build the documentation - restrict version to improve pip version resolution
             'sphinx-rtd-theme',  # adding the nice sphinx theme
-            'sphinx-toolbox',  # dependency of enum_tools, we got this as a present
+            'sphinx-toolbox >=3',  # dependency of enum_tools, we got this as a present - restrict version to improve pip version resolution
             'myst-parser',  # for Contributing.md
-            'sphinxcontrib-bibtex',  # a good help for citing
+            'sphinxcontrib-bibtex >=2.4',  # a good help for citing - restrict version to improve pip version resolution
             'nbsphinx',  # use Jupyter Notebooks in the documentation
             'ipython',  # for setting up the pygments_lexer
             'ipykernel',  # for allowing nbsphinx to execute the Jupyter Notebooks

From cd222de8caab21911afd14a37878f52c81174cd6 Mon Sep 17 00:00:00 2001
From: 1kastner <marvin.kastner@tuhh.de>
Date: Sun, 10 Dec 2023 20:34:28 +0100
Subject: [PATCH 11/22] Update linting.yml

Test solution proposed at https://github.com/pypa/pip/issues/12430#issuecomment-1849056886
---
 .github/workflows/linting.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml
index 7bcd4bec..4a1034aa 100644
--- a/.github/workflows/linting.yml
+++ b/.github/workflows/linting.yml
@@ -35,7 +35,7 @@ jobs:
 
     - name: Use latest version of pip
       run: |
-        python -m pip install --upgrade pip
+        python -m pip install git+https://github.com/notatallshaw/pip.git@prefer-conflicting-causes
 
     - name: Install Python dependencies including pylint
       run: |

From 2b18a8afc407a0501bcda319bd5af70cb54e4b3b Mon Sep 17 00:00:00 2001
From: 1kastner <marvin.kastner@tuhh.de>
Date: Sun, 10 Dec 2023 23:14:07 +0100
Subject: [PATCH 12/22] Explicitly mention sphinx-tabs

---
 setup.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/setup.py b/setup.py
index 4c1cddc9..7378ac7d 100644
--- a/setup.py
+++ b/setup.py
@@ -73,6 +73,10 @@
             # publish at PyPI
             'wheel',  # use command 'bdist_wheel'
             'twine',  # check and upload package to PyPI
+
+            
+            # pip resolution issue - https://github.com/pypa/pip/issues/12430#issuecomment-1849059000
+            'sphinx-tabs'
         ],
         # a collection of nice-to-haves for working on Jupyter Notebooks - just a favorites list of the authors
         'jupyterlab': [

From 7832d13980cdbf6a6bfa3e963bead819ee102881 Mon Sep 17 00:00:00 2001
From: 1kastner <marvin.kastner@tuhh.de>
Date: Sun, 10 Dec 2023 12:31:21 +0100
Subject: [PATCH 13/22] shorten lines

(cherry picked from commit a07dad8aa4250320105525ff9cc0f743772c66c1)
---
 setup.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/setup.py b/setup.py
index 7378ac7d..1a687ac8 100644
--- a/setup.py
+++ b/setup.py
@@ -35,7 +35,7 @@
         'peewee >=3',  # ORM mapper
 
         # documentation - decorators used for sphinx but are part of the source code delivered to customers
-        'enum_tools >=0.7',  # used for documenting enums via decorators - previous versions are not compatible with this code base
+        'enum_tools >=0.7',  # used for documenting enums via decorators - previous versions are not compatible
 
         # for creating the visuals
         'matplotlib',  # default plots such as bar charts, pie charts, etc.
@@ -57,9 +57,9 @@
             # build documentation
             'sphinx >=6.2',  # build the documentation - restrict version to improve pip version resolution
             'sphinx-rtd-theme',  # adding the nice sphinx theme
-            'sphinx-toolbox >=3',  # dependency of enum_tools, we got this as a present - restrict version to improve pip version resolution
+            'sphinx-toolbox >=3',  # additional dependency of enum_tools - restrict version to improve pip resolution
             'myst-parser',  # for Contributing.md
-            'sphinxcontrib-bibtex >=2.4',  # a good help for citing - restrict version to improve pip version resolution
+            'sphinxcontrib-bibtex >=2.4',  # a good help for citing - restrict version to improve pip resolution
             'nbsphinx',  # use Jupyter Notebooks in the documentation
             'ipython',  # for setting up the pygments_lexer
             'ipykernel',  # for allowing nbsphinx to execute the Jupyter Notebooks

From ee249720260881fe385574e85ef98a1eabfc3921 Mon Sep 17 00:00:00 2001
From: Marvin Kastner <marvin.kastner@tuhh.de>
Date: Sun, 10 Dec 2023 23:24:33 +0100
Subject: [PATCH 14/22] drop empty line

---
 setup.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/setup.py b/setup.py
index 1a687ac8..509301cc 100644
--- a/setup.py
+++ b/setup.py
@@ -74,7 +74,6 @@
             'wheel',  # use command 'bdist_wheel'
             'twine',  # check and upload package to PyPI
 
-            
             # pip resolution issue - https://github.com/pypa/pip/issues/12430#issuecomment-1849059000
             'sphinx-tabs'
         ],

From 3a4bda6ee910636056502c2764d5c97fdc2e9daf Mon Sep 17 00:00:00 2001
From: Marvin Kastner <marvin.kastner@tuhh.de>
Date: Tue, 12 Dec 2023 09:42:09 +0100
Subject: [PATCH 15/22] Show version when installing from remote

---
 .github/workflows/installation-from-remote.yaml | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/installation-from-remote.yaml b/.github/workflows/installation-from-remote.yaml
index 7f36338b..22c52245 100644
--- a/.github/workflows/installation-from-remote.yaml
+++ b/.github/workflows/installation-from-remote.yaml
@@ -37,10 +37,11 @@ jobs:
       run: |
         conda activate test-install-conflowgen
         conda update conflowgen
-        conda install pillow=9.0.0
+        conda install pillow>=9.0
 
     - name: Run tests
       run: |
+        python -c "import conflowgen; print(conflowgen.__version__)"
         python -m pytest --pyargs conflowgen
 
   build-conda-on-linux:
@@ -71,14 +72,11 @@ jobs:
         conda activate base
         conda create -n test-install-conflowgen -c conda-forge conflowgen pytest
 
-    - name: Prepare tests
+    - name: Run tests
       run: |
         eval "$(conda shell.bash hook)"
         conda activate test-install-conflowgen
-        conda update conflowgen
-
-    - name: Run tests
-      run: |
+        python -c "import conflowgen; print(conflowgen.__version__)"
         python -m pytest --pyargs conflowgen
 
   build-pip:
@@ -112,4 +110,5 @@ jobs:
 
     - name: Run tests
       run: |
+        python -c "import conflowgen; print(conflowgen.__version__)"
         python -m pytest --pyargs conflowgen

From ec7afa767537d9246aff9c79b90f9a9e70888dfa Mon Sep 17 00:00:00 2001
From: Marvin Kastner <marvin.kastner@tuhh.de>
Date: Tue, 12 Dec 2023 09:42:57 +0100
Subject: [PATCH 16/22] Use normal pip again

See https://github.com/pypa/pip/issues/12430#issuecomment-1849059000 for more information
---
 .github/workflows/linting.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml
index 4a1034aa..7bcd4bec 100644
--- a/.github/workflows/linting.yml
+++ b/.github/workflows/linting.yml
@@ -35,7 +35,7 @@ jobs:
 
     - name: Use latest version of pip
       run: |
-        python -m pip install git+https://github.com/notatallshaw/pip.git@prefer-conflicting-causes
+        python -m pip install --upgrade pip
 
     - name: Install Python dependencies including pylint
       run: |

From 10021a8678eee8d622a72f1900486f97013029ba Mon Sep 17 00:00:00 2001
From: Marvin Kastner <marvin.kastner@tuhh.de>
Date: Tue, 12 Dec 2023 10:01:07 +0100
Subject: [PATCH 17/22] Activate conda env because conflowgen was not available

---
 .github/workflows/installation-from-remote.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/installation-from-remote.yaml b/.github/workflows/installation-from-remote.yaml
index 22c52245..e5e4e7e8 100644
--- a/.github/workflows/installation-from-remote.yaml
+++ b/.github/workflows/installation-from-remote.yaml
@@ -41,6 +41,7 @@ jobs:
 
     - name: Run tests
       run: |
+        conda activate test-install-conflowgen
         python -c "import conflowgen; print(conflowgen.__version__)"
         python -m pytest --pyargs conflowgen
 

From d63f061612297cbb5589419bec32dd2f9b6fbed9 Mon Sep 17 00:00:00 2001
From: Marvin Kastner <marvin.kastner@tuhh.de>
Date: Tue, 12 Dec 2023 10:58:27 +0100
Subject: [PATCH 18/22] Issues with windows runner - issue with run block? Try
 single quotes

---
 .github/workflows/installation-from-remote.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/installation-from-remote.yaml b/.github/workflows/installation-from-remote.yaml
index e5e4e7e8..0d35cd98 100644
--- a/.github/workflows/installation-from-remote.yaml
+++ b/.github/workflows/installation-from-remote.yaml
@@ -42,7 +42,7 @@ jobs:
     - name: Run tests
       run: |
         conda activate test-install-conflowgen
-        python -c "import conflowgen; print(conflowgen.__version__)"
+        python -c 'import conflowgen; print(conflowgen.__version__)'
         python -m pytest --pyargs conflowgen
 
   build-conda-on-linux:
@@ -77,7 +77,7 @@ jobs:
       run: |
         eval "$(conda shell.bash hook)"
         conda activate test-install-conflowgen
-        python -c "import conflowgen; print(conflowgen.__version__)"
+        python -c 'import conflowgen; print(conflowgen.__version__)'
         python -m pytest --pyargs conflowgen
 
   build-pip:

From d883ec3257d68859e0e29333f4cfdaa273b37f10 Mon Sep 17 00:00:00 2001
From: Marvin Kastner <marvin.kastner@tuhh.de>
Date: Tue, 12 Dec 2023 10:59:14 +0100
Subject: [PATCH 19/22] (again)

---
 .github/workflows/installation-from-remote.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/installation-from-remote.yaml b/.github/workflows/installation-from-remote.yaml
index 0d35cd98..6dd2d94c 100644
--- a/.github/workflows/installation-from-remote.yaml
+++ b/.github/workflows/installation-from-remote.yaml
@@ -111,5 +111,5 @@ jobs:
 
     - name: Run tests
       run: |
-        python -c "import conflowgen; print(conflowgen.__version__)"
+        python -c 'import conflowgen; print(conflowgen.__version__)'
         python -m pytest --pyargs conflowgen

From 1c349f35d67d71f3f189adc3f464799f2792af1f Mon Sep 17 00:00:00 2001
From: Marvin Kastner <marvin.kastner@tuhh.de>
Date: Tue, 12 Dec 2023 11:38:08 +0100
Subject: [PATCH 20/22] drop show-version line

---
 .github/workflows/installation-from-remote.yaml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/workflows/installation-from-remote.yaml b/.github/workflows/installation-from-remote.yaml
index 6dd2d94c..08f9602c 100644
--- a/.github/workflows/installation-from-remote.yaml
+++ b/.github/workflows/installation-from-remote.yaml
@@ -42,7 +42,6 @@ jobs:
     - name: Run tests
       run: |
         conda activate test-install-conflowgen
-        python -c 'import conflowgen; print(conflowgen.__version__)'
         python -m pytest --pyargs conflowgen
 
   build-conda-on-linux:
@@ -77,7 +76,6 @@ jobs:
       run: |
         eval "$(conda shell.bash hook)"
         conda activate test-install-conflowgen
-        python -c 'import conflowgen; print(conflowgen.__version__)'
         python -m pytest --pyargs conflowgen
 
   build-pip:
@@ -111,5 +109,4 @@ jobs:
 
     - name: Run tests
       run: |
-        python -c 'import conflowgen; print(conflowgen.__version__)'
         python -m pytest --pyargs conflowgen

From ef595d2be483bdc0236d3a341e757f464c6cffc4 Mon Sep 17 00:00:00 2001
From: Marvin Kastner <marvin.kastner@tuhh.de>
Date: Tue, 12 Dec 2023 12:03:33 +0100
Subject: [PATCH 21/22] Try out single code block

---
 .../workflows/installation-from-remote.yaml   | 25 +++----------------
 1 file changed, 3 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/installation-from-remote.yaml b/.github/workflows/installation-from-remote.yaml
index 08f9602c..0883da59 100644
--- a/.github/workflows/installation-from-remote.yaml
+++ b/.github/workflows/installation-from-remote.yaml
@@ -26,22 +26,11 @@ jobs:
         activate-environment: true
         python-version: '3.10'
 
-    - name: Install ConFlowGen
+    - name: Install ConFlowGen and run tests
       run: |
-        conda clean -ity
         conda info
         conda search conflowgen -c conda-forge --info
         conda create -n test-install-conflowgen -c conda-forge conflowgen pytest
-
-    - name: Prepare tests
-      run: |
-        conda activate test-install-conflowgen
-        conda update conflowgen
-        conda install pillow>=9.0
-
-    - name: Run tests
-      run: |
-        conda activate test-install-conflowgen
         python -m pytest --pyargs conflowgen
 
   build-conda-on-linux:
@@ -62,19 +51,14 @@ jobs:
         auto-activate-base: true
         activate-environment: ""
 
-    - name: Install ConFlowGen
+    - name: Install ConFlowGen and run tests
       run: |
         conda init bash
         eval "$(conda shell.bash hook)"
-        conda clean -ity
         conda info
         conda search conflowgen -c conda-forge --info
         conda activate base
         conda create -n test-install-conflowgen -c conda-forge conflowgen pytest
-
-    - name: Run tests
-      run: |
-        eval "$(conda shell.bash hook)"
         conda activate test-install-conflowgen
         python -m pytest --pyargs conflowgen
 
@@ -102,11 +86,8 @@ jobs:
       run: |
         python -m pip install --upgrade pip
 
-    - name: Install ConFlowGen
+    - name: Install ConFlowGen and run tests
       run: |
         python -m pip install conflowgen pytest
         python -m pip show --verbose conflowgen
-
-    - name: Run tests
-      run: |
         python -m pytest --pyargs conflowgen

From 64f0b62c1ce0f11ea2371846f7624653b1c9dbfe Mon Sep 17 00:00:00 2001
From: Marvin Kastner <marvin.kastner@tuhh.de>
Date: Tue, 12 Dec 2023 12:58:04 +0100
Subject: [PATCH 22/22] activate eng, reduce code block

---
 .github/workflows/installation-from-remote.yaml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.github/workflows/installation-from-remote.yaml b/.github/workflows/installation-from-remote.yaml
index 0883da59..a502a2af 100644
--- a/.github/workflows/installation-from-remote.yaml
+++ b/.github/workflows/installation-from-remote.yaml
@@ -31,6 +31,7 @@ jobs:
         conda info
         conda search conflowgen -c conda-forge --info
         conda create -n test-install-conflowgen -c conda-forge conflowgen pytest
+        conda activate test-install-conflowgen
         python -m pytest --pyargs conflowgen
 
   build-conda-on-linux:
@@ -82,10 +83,6 @@ jobs:
       with:
         python-version: '3.10'
 
-    - name: Use latest version of pip
-      run: |
-        python -m pip install --upgrade pip
-
     - name: Install ConFlowGen and run tests
       run: |
         python -m pip install conflowgen pytest