From 38d15d3ee65863bb8a0b1eb975baa708b7438011 Mon Sep 17 00:00:00 2001
From: Tobias Fischer <info@tobiasfischer.info>
Date: Mon, 9 Dec 2024 08:21:04 +1000
Subject: [PATCH 01/24] Use conda-forge numpy

---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 2c884530..bce59a0f 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -32,7 +32,7 @@ jobs:
         
     - name: Install dependencies
       run: |
-        micromamba create -y -n myenv -c conda-forge python=${{ matrix.python-version }} pip pytest-timeout pytest-xvfb
+        micromamba create -y -n myenv -c conda-forge python=${{ matrix.python-version }} pip pytest-timeout pytest-xvfb numpy
     - name: Install open3d on MacOS
       if: runner.os == 'MacOS'
       run: micromamba install -y -n myenv -c conda-forge open3d

From 336fc619dbbbacab94493988e18884ce26db82a0 Mon Sep 17 00:00:00 2001
From: Tobias Fischer <info@tobiasfischer.info>
Date: Mon, 9 Dec 2024 08:25:47 +1000
Subject: [PATCH 02/24] Add matplotlib-base

---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index bce59a0f..5d45ccc2 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -32,7 +32,7 @@ jobs:
         
     - name: Install dependencies
       run: |
-        micromamba create -y -n myenv -c conda-forge python=${{ matrix.python-version }} pip pytest-timeout pytest-xvfb numpy
+        micromamba create -y -n myenv -c conda-forge python=${{ matrix.python-version }} pip pytest-timeout pytest-xvfb numpy matplotlib-base
     - name: Install open3d on MacOS
       if: runner.os == 'MacOS'
       run: micromamba install -y -n myenv -c conda-forge open3d

From a971615fd98f5a9645dac1aa243ccd45fa44ec2c Mon Sep 17 00:00:00 2001
From: Tobias Fischer <info@tobiasfischer.info>
Date: Mon, 9 Dec 2024 08:31:29 +1000
Subject: [PATCH 03/24] do not build data package for now; use python -m pip

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

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 5d45ccc2..4ce403c6 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -41,10 +41,10 @@ jobs:
       run: micromamba install -y -n myenv -c conda-forge wcwidth
     - name: Install package and data package
       run: |
-        micromamba run -n myenv pip install .[dev]
+        micromamba run -n myenv python -m pip install .[dev]
         # install the data package
-        cd mvtb-data
-        micromamba run -n myenv python -m pip install .
+        # cd mvtb-data
+        # micromamba run -n myenv python -m pip install .
     - name: Test with pytest
       env:
         MPLBACKEND: TkAgg

From 1477fb7345be7e55a9e89d9ff13871b42b639ae5 Mon Sep 17 00:00:00 2001
From: Tobias Fischer <info@tobiasfischer.info>
Date: Mon, 9 Dec 2024 08:32:18 +1000
Subject: [PATCH 04/24] bump setup-micromamba

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

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 4ce403c6..51d9ef4c 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -25,7 +25,7 @@ jobs:
         python-version: ["3.8", "3.9", "3.10", "3.11"]
     steps:
     - name: Set up Micromamba for Python ${{ matrix.python-version }}
-      uses: mamba-org/setup-micromamba@v1
+      uses: mamba-org/setup-micromamba@v2
 
     - name: Checkout master branch
       uses: actions/checkout@v4
@@ -59,7 +59,7 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Set up Micromamba for Python 3.11
-      uses: mamba-org/setup-micromamba@v1
+      uses: mamba-org/setup-micromamba@v2
     - name: Install dependencies
       run: |
         micromamba create -y -n myenv -c conda-forge python=3.11 pip coverage

From 0a2a9b39cfaee775f2fbfdba3d66e80caf71adf0 Mon Sep 17 00:00:00 2001
From: Tobias Fischer <info@tobiasfischer.info>
Date: Mon, 9 Dec 2024 08:41:06 +1000
Subject: [PATCH 05/24] Reorganise, use micromamba-shell

---
 .github/workflows/main.yml | 41 +++++++++++++++++++++++++++++---------
 1 file changed, 32 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 51d9ef4c..9135e530 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -24,32 +24,45 @@ jobs:
         os: [windows-latest, ubuntu-latest, macos-13]
         python-version: ["3.8", "3.9", "3.10", "3.11"]
     steps:
+    - name: Checkout master branch
+      uses: actions/checkout@v4
+
     - name: Set up Micromamba for Python ${{ matrix.python-version }}
       uses: mamba-org/setup-micromamba@v2
+      with:
+        init-shell: >-
+         bash
+         powershell
+        environment-name: myenv
+        create-args: >-
+          python=${{ matrix.python-version }}
+          numpy
+          pip
+          pytest-timeout
+          pytest-xvfb
+          matplotlib-base
 
-    - name: Checkout master branch
-      uses: actions/checkout@v4
-        
-    - name: Install dependencies
-      run: |
-        micromamba create -y -n myenv -c conda-forge python=${{ matrix.python-version }} pip pytest-timeout pytest-xvfb numpy matplotlib-base
     - name: Install open3d on MacOS
       if: runner.os == 'MacOS'
       run: micromamba install -y -n myenv -c conda-forge open3d
+      shell: micromamba-shell {0}
     - name: Install wcwidth on Linux
       if: runner.os == 'Linux'
       run: micromamba install -y -n myenv -c conda-forge wcwidth
+      shell: micromamba-shell {0}
     - name: Install package and data package
       run: |
         micromamba run -n myenv python -m pip install .[dev]
         # install the data package
         # cd mvtb-data
         # micromamba run -n myenv python -m pip install .
+      shell: micromamba-shell {0}
     - name: Test with pytest
       env:
         MPLBACKEND: TkAgg
       run: |
         micromamba run -n myenv pytest --ignore=machinevisiontoolbox/blocks --timeout=50 --timeout_method thread -s
+      shell: micromamba-shell {0}
 
   codecov:
     # If all tests pass:
@@ -60,18 +73,28 @@ jobs:
     - uses: actions/checkout@v4
     - name: Set up Micromamba for Python 3.11
       uses: mamba-org/setup-micromamba@v2
-    - name: Install dependencies
+      with:
+        init-shell: >-
+         bash
+         powershell
+        environment-name: myenv
+        create-args: >-
+          python=3.11
+          pip
+          coverage
+    - name: Install package and data package
       run: |
-        micromamba create -y -n myenv -c conda-forge python=3.11 pip coverage
-        micromamba run -n myenv pip install .[dev]
+        micromamba run -n myenv python -m pip install .[dev]
         # install the data package
         cd mvtb-data
         micromamba run -n myenv python -m pip install .
+      shell: micromamba-shell {0}
     - name: Run coverage
       run: |
         micromamba run -n myenv coverage run --source=machinevisiontoolbox -m pytest --ignore=machinevisiontoolbox/blocks
         micromamba run -n myenv coverage report
         micromamba run -n myenv coverage xml
+      shell: micromamba-shell {0}
     - name: upload coverage to Codecov
       uses: codecov/codecov-action@v4
       with:

From b1f8a8bf6b54ccedfd831d78aaad6986e984d8e7 Mon Sep 17 00:00:00 2001
From: Tobias Fischer <info@tobiasfischer.info>
Date: Mon, 9 Dec 2024 08:44:41 +1000
Subject: [PATCH 06/24] no micromamba-shell on win ...

---
 .github/workflows/main.yml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 9135e530..54c4bfc2 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -45,24 +45,20 @@ jobs:
     - name: Install open3d on MacOS
       if: runner.os == 'MacOS'
       run: micromamba install -y -n myenv -c conda-forge open3d
-      shell: micromamba-shell {0}
     - name: Install wcwidth on Linux
       if: runner.os == 'Linux'
       run: micromamba install -y -n myenv -c conda-forge wcwidth
-      shell: micromamba-shell {0}
     - name: Install package and data package
       run: |
         micromamba run -n myenv python -m pip install .[dev]
         # install the data package
         # cd mvtb-data
         # micromamba run -n myenv python -m pip install .
-      shell: micromamba-shell {0}
     - name: Test with pytest
       env:
         MPLBACKEND: TkAgg
       run: |
         micromamba run -n myenv pytest --ignore=machinevisiontoolbox/blocks --timeout=50 --timeout_method thread -s
-      shell: micromamba-shell {0}
 
   codecov:
     # If all tests pass:
@@ -88,13 +84,11 @@ jobs:
         # install the data package
         cd mvtb-data
         micromamba run -n myenv python -m pip install .
-      shell: micromamba-shell {0}
     - name: Run coverage
       run: |
         micromamba run -n myenv coverage run --source=machinevisiontoolbox -m pytest --ignore=machinevisiontoolbox/blocks
         micromamba run -n myenv coverage report
         micromamba run -n myenv coverage xml
-      shell: micromamba-shell {0}
     - name: upload coverage to Codecov
       uses: codecov/codecov-action@v4
       with:

From 5beb1bd6e1eac3fb5f8bcc3842c3826b840289ad Mon Sep 17 00:00:00 2001
From: Tobias Fischer <info@tobiasfischer.info>
Date: Mon, 9 Dec 2024 08:46:49 +1000
Subject: [PATCH 07/24] numpy<2

---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 54c4bfc2..90395875 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -36,7 +36,7 @@ jobs:
         environment-name: myenv
         create-args: >-
           python=${{ matrix.python-version }}
-          numpy
+          numpy<2
           pip
           pytest-timeout
           pytest-xvfb

From 5c1bf938710bf0bf99dddd4251d49d08a0a60e2d Mon Sep 17 00:00:00 2001
From: Tobias Fischer <info@tobiasfischer.info>
Date: Mon, 9 Dec 2024 08:50:33 +1000
Subject: [PATCH 08/24] setuptools-scm

---
 .github/workflows/main.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 90395875..4b4b1965 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -41,6 +41,7 @@ jobs:
           pytest-timeout
           pytest-xvfb
           matplotlib-base
+          setuptools-scm
 
     - name: Install open3d on MacOS
       if: runner.os == 'MacOS'

From 2180ba790b8858c0fc8db70bff2e514dc3d557b8 Mon Sep 17 00:00:00 2001
From: Tobias Fischer <info@tobiasfischer.info>
Date: Mon, 9 Dec 2024 08:52:01 +1000
Subject: [PATCH 09/24] fix deprecation, use --use-feature=in-tree-build

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

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 4b4b1965..fdce79b9 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -51,10 +51,10 @@ jobs:
       run: micromamba install -y -n myenv -c conda-forge wcwidth
     - name: Install package and data package
       run: |
-        micromamba run -n myenv python -m pip install .[dev]
+        micromamba run -n myenv python -m pip install .[dev] --use-feature=in-tree-build
         # install the data package
         # cd mvtb-data
-        # micromamba run -n myenv python -m pip install .
+        # micromamba run -n myenv python -m pip install . --use-feature=in-tree-build
     - name: Test with pytest
       env:
         MPLBACKEND: TkAgg
@@ -81,10 +81,10 @@ jobs:
           coverage
     - name: Install package and data package
       run: |
-        micromamba run -n myenv python -m pip install .[dev]
+        micromamba run -n myenv python -m pip install .[dev] --use-feature=in-tree-build
         # install the data package
         cd mvtb-data
-        micromamba run -n myenv python -m pip install .
+        micromamba run -n myenv python -m pip install . --use-feature=in-tree-build
     - name: Run coverage
       run: |
         micromamba run -n myenv coverage run --source=machinevisiontoolbox -m pytest --ignore=machinevisiontoolbox/blocks

From 773013bc7301a2bfe9ad5c4813076e9de554f8db Mon Sep 17 00:00:00 2001
From: Tobias Fischer <info@tobiasfischer.info>
Date: Mon, 9 Dec 2024 08:54:58 +1000
Subject: [PATCH 10/24] setuptools ..

---
 .github/workflows/main.yml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index fdce79b9..f940b466 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -41,6 +41,7 @@ jobs:
           pytest-timeout
           pytest-xvfb
           matplotlib-base
+          setuptools
           setuptools-scm
 
     - name: Install open3d on MacOS
@@ -51,10 +52,10 @@ jobs:
       run: micromamba install -y -n myenv -c conda-forge wcwidth
     - name: Install package and data package
       run: |
-        micromamba run -n myenv python -m pip install .[dev] --use-feature=in-tree-build
+        micromamba run -n myenv python -m pip install .[dev]
         # install the data package
         # cd mvtb-data
-        # micromamba run -n myenv python -m pip install . --use-feature=in-tree-build
+        # micromamba run -n myenv python -m pip install .
     - name: Test with pytest
       env:
         MPLBACKEND: TkAgg
@@ -81,10 +82,10 @@ jobs:
           coverage
     - name: Install package and data package
       run: |
-        micromamba run -n myenv python -m pip install .[dev] --use-feature=in-tree-build
+        micromamba run -n myenv python -m pip install .[dev]
         # install the data package
         cd mvtb-data
-        micromamba run -n myenv python -m pip install . --use-feature=in-tree-build
+        micromamba run -n myenv python -m pip install .
     - name: Run coverage
       run: |
         micromamba run -n myenv coverage run --source=machinevisiontoolbox -m pytest --ignore=machinevisiontoolbox/blocks

From f9f907f7d07a290c9a7a932856c63ef5d85071ed Mon Sep 17 00:00:00 2001
From: Tobias Fischer <info@tobiasfischer.info>
Date: Mon, 9 Dec 2024 08:58:46 +1000
Subject: [PATCH 11/24] use editable mode

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

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index f940b466..0b19db14 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -52,10 +52,10 @@ jobs:
       run: micromamba install -y -n myenv -c conda-forge wcwidth
     - name: Install package and data package
       run: |
-        micromamba run -n myenv python -m pip install .[dev]
+        micromamba run -n myenv python -m pip install -e .[dev]
         # install the data package
         # cd mvtb-data
-        # micromamba run -n myenv python -m pip install .
+        # micromamba run -n myenv python -m pip install -e .
     - name: Test with pytest
       env:
         MPLBACKEND: TkAgg
@@ -82,10 +82,10 @@ jobs:
           coverage
     - name: Install package and data package
       run: |
-        micromamba run -n myenv python -m pip install .[dev]
+        micromamba run -n myenv python -m pip install -e .[dev]
         # install the data package
         cd mvtb-data
-        micromamba run -n myenv python -m pip install .
+        micromamba run -n myenv python -m pip install -e .
     - name: Run coverage
       run: |
         micromamba run -n myenv coverage run --source=machinevisiontoolbox -m pytest --ignore=machinevisiontoolbox/blocks

From df6f2be8f2c3b5b0cdff326816a1a7d787cf20ae Mon Sep 17 00:00:00 2001
From: Tobias Fischer <info@tobiasfischer.info>
Date: Mon, 9 Dec 2024 09:00:53 +1000
Subject: [PATCH 12/24] Use --no-build-isolation

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

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 0b19db14..e3a5c139 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -52,10 +52,10 @@ jobs:
       run: micromamba install -y -n myenv -c conda-forge wcwidth
     - name: Install package and data package
       run: |
-        micromamba run -n myenv python -m pip install -e .[dev]
+        micromamba run -n myenv python -m pip install -e .[dev] --no-build-isolation
         # install the data package
         # cd mvtb-data
-        # micromamba run -n myenv python -m pip install -e .
+        # micromamba run -n myenv python -m pip install -e . --no-build-isolation
     - name: Test with pytest
       env:
         MPLBACKEND: TkAgg
@@ -82,10 +82,10 @@ jobs:
           coverage
     - name: Install package and data package
       run: |
-        micromamba run -n myenv python -m pip install -e .[dev]
+        micromamba run -n myenv python -m pip install -e .[dev] --no-build-isolation
         # install the data package
         cd mvtb-data
-        micromamba run -n myenv python -m pip install -e .
+        micromamba run -n myenv python -m pip install -e . --no-build-isolation
     - name: Run coverage
       run: |
         micromamba run -n myenv coverage run --source=machinevisiontoolbox -m pytest --ignore=machinevisiontoolbox/blocks

From 4b6d65c5ef1de95f4963e823a1b2cb959024929c Mon Sep 17 00:00:00 2001
From: Tobias Fischer <info@tobiasfischer.info>
Date: Mon, 9 Dec 2024 09:07:19 +1000
Subject: [PATCH 13/24] install deps with conda

---
 .github/workflows/main.yml | 37 +++++++++++++++++++++++++------------
 1 file changed, 25 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index e3a5c139..6e6a9fd9 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -43,19 +43,19 @@ jobs:
           matplotlib-base
           setuptools
           setuptools-scm
+          open3d
+          wcwidth
+          scipy
+          opencv
+          spatialmath-python
+          ansitable
 
-    - name: Install open3d on MacOS
-      if: runner.os == 'MacOS'
-      run: micromamba install -y -n myenv -c conda-forge open3d
-    - name: Install wcwidth on Linux
-      if: runner.os == 'Linux'
-      run: micromamba install -y -n myenv -c conda-forge wcwidth
     - name: Install package and data package
       run: |
-        micromamba run -n myenv python -m pip install -e .[dev] --no-build-isolation
+        micromamba run -n myenv python -m pip install -e .[dev] --no-build-isolation --no-deps
         # install the data package
-        # cd mvtb-data
-        # micromamba run -n myenv python -m pip install -e . --no-build-isolation
+        cd mvtb-data
+        micromamba run -n myenv python -m pip install -e . --no-build-isolation --no-deps
     - name: Test with pytest
       env:
         MPLBACKEND: TkAgg
@@ -78,14 +78,27 @@ jobs:
         environment-name: myenv
         create-args: >-
           python=3.11
-          pip
           coverage
+          numpy<2
+          pip
+          pytest-timeout
+          pytest-xvfb
+          matplotlib-base
+          setuptools
+          setuptools-scm
+          open3d
+          wcwidth
+          scipy
+          opencv
+          spatialmath-python
+          ansitable
+
     - name: Install package and data package
       run: |
-        micromamba run -n myenv python -m pip install -e .[dev] --no-build-isolation
+        micromamba run -n myenv python -m pip install -e .[dev] --no-build-isolation --no-deps
         # install the data package
         cd mvtb-data
-        micromamba run -n myenv python -m pip install -e . --no-build-isolation
+        micromamba run -n myenv python -m pip install -e . --no-build-isolation --no-deps
     - name: Run coverage
       run: |
         micromamba run -n myenv coverage run --source=machinevisiontoolbox -m pytest --ignore=machinevisiontoolbox/blocks

From e8163f6eccd887b75f8039348dcd8fcc856b899c Mon Sep 17 00:00:00 2001
From: Tobias Fischer <info@tobiasfischer.info>
Date: Mon, 9 Dec 2024 09:14:29 +1000
Subject: [PATCH 14/24] fixups

---
 .github/workflows/main.yml | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 6e6a9fd9..1da9c464 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1,6 +1,4 @@
-# This is a basic workflow to help you get started with Actions
-
-name: Test-master
+name: mvtb-main
 
 # Controls when the action will run. 
 on:
@@ -38,6 +36,7 @@ jobs:
           python=${{ matrix.python-version }}
           numpy<2
           pip
+          pytest
           pytest-timeout
           pytest-xvfb
           matplotlib-base
@@ -50,17 +49,21 @@ jobs:
           spatialmath-python
           ansitable
 
+    - name: Install libegl on Linux
+      if: runner.os == 'Linux'
+      run: micromamba install -y -n myenv -c conda-forge libegl
+
     - name: Install package and data package
       run: |
-        micromamba run -n myenv python -m pip install -e .[dev] --no-build-isolation --no-deps
+        micromamba run -n myenv python -m pip install .[dev] --no-build-isolation --no-deps
         # install the data package
         cd mvtb-data
-        micromamba run -n myenv python -m pip install -e . --no-build-isolation --no-deps
+        micromamba run -n myenv python -m pip install . --no-build-isolation --no-deps
     - name: Test with pytest
       env:
         MPLBACKEND: TkAgg
       run: |
-        micromamba run -n myenv pytest --ignore=machinevisiontoolbox/blocks --timeout=50 --timeout_method thread -s
+        micromamba run -n myenv python -m pytest --ignore=machinevisiontoolbox/blocks --timeout=50 --timeout_method thread -s
 
   codecov:
     # If all tests pass:
@@ -81,6 +84,7 @@ jobs:
           coverage
           numpy<2
           pip
+          pytest
           pytest-timeout
           pytest-xvfb
           matplotlib-base
@@ -93,12 +97,16 @@ jobs:
           spatialmath-python
           ansitable
 
+    - name: Install libegl on Linux
+      if: runner.os == 'Linux'
+      run: micromamba install -y -n myenv -c conda-forge libegl
+
     - name: Install package and data package
       run: |
-        micromamba run -n myenv python -m pip install -e .[dev] --no-build-isolation --no-deps
+        micromamba run -n myenv python -m pip install .[dev] --no-build-isolation --no-deps
         # install the data package
         cd mvtb-data
-        micromamba run -n myenv python -m pip install -e . --no-build-isolation --no-deps
+        micromamba run -n myenv python -m pip install . --no-build-isolation --no-deps
     - name: Run coverage
       run: |
         micromamba run -n myenv coverage run --source=machinevisiontoolbox -m pytest --ignore=machinevisiontoolbox/blocks

From 7e0fa81ac36d276d49210512463fa5859190523a Mon Sep 17 00:00:00 2001
From: Tobias Fischer <info@tobiasfischer.info>
Date: Mon, 9 Dec 2024 09:15:26 +1000
Subject: [PATCH 15/24] remove deprecated py38

---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 1da9c464..a35db1da 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -20,7 +20,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [windows-latest, ubuntu-latest, macos-13]
-        python-version: ["3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.9", "3.10", "3.11"]
     steps:
     - name: Checkout master branch
       uses: actions/checkout@v4

From c3941d710518158f68d20aa4d00e9563892b9176 Mon Sep 17 00:00:00 2001
From: Tobias Fischer <info@tobiasfischer.info>
Date: Mon, 9 Dec 2024 09:19:16 +1000
Subject: [PATCH 16/24] check mvtbdata issue

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

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index a35db1da..719d8ee6 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -55,10 +55,10 @@ jobs:
 
     - name: Install package and data package
       run: |
-        micromamba run -n myenv python -m pip install .[dev] --no-build-isolation --no-deps
+        micromamba run -n myenv python -m pip install .[dev] --no-deps
         # install the data package
         cd mvtb-data
-        micromamba run -n myenv python -m pip install . --no-build-isolation --no-deps
+        micromamba run -n myenv python -m pip install . --no-deps
     - name: Test with pytest
       env:
         MPLBACKEND: TkAgg
@@ -103,10 +103,10 @@ jobs:
 
     - name: Install package and data package
       run: |
-        micromamba run -n myenv python -m pip install .[dev] --no-build-isolation --no-deps
+        micromamba run -n myenv python -m pip install .[dev] --no-deps
         # install the data package
         cd mvtb-data
-        micromamba run -n myenv python -m pip install . --no-build-isolation --no-deps
+        micromamba run -n myenv python -m pip install . --no-deps
     - name: Run coverage
       run: |
         micromamba run -n myenv coverage run --source=machinevisiontoolbox -m pytest --ignore=machinevisiontoolbox/blocks

From e6358493fc0384982ecaf150588706a9be6d16a2 Mon Sep 17 00:00:00 2001
From: Tobias Fischer <info@tobiasfischer.info>
Date: Mon, 9 Dec 2024 09:23:17 +1000
Subject: [PATCH 17/24] mvtbdata package

---
 mvtb-data/pyproject.toml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mvtb-data/pyproject.toml b/mvtb-data/pyproject.toml
index f8f31bc3..f259fa52 100644
--- a/mvtb-data/pyproject.toml
+++ b/mvtb-data/pyproject.toml
@@ -23,10 +23,10 @@ keywords = [
 "Bug Tracker" = "https://github.com/petercorke/machinevision-toolbox-python/issues"
 
 [tool.setuptools.packages.find]
-where = ["mvtbdata/data", "mvtbdata/images"]
+where = ["mvtbdata", "mvtbdata/data", "mvtbdata/images"]
 
 [tool.setuptools.package-data]
 mvtbdata = [
     "*.png", "*.jpg", "*.mp4",
     "*.dat", "*.mat", "*.yml", "*.txt", "*.ply",
-]
\ No newline at end of file
+]

From 365ff397e79161d171e040dfa6e91b3b2ae3f258 Mon Sep 17 00:00:00 2001
From: Tobias Fischer <info@tobiasfischer.info>
Date: Mon, 9 Dec 2024 09:25:20 +1000
Subject: [PATCH 18/24] verbose

---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 719d8ee6..d0708ddd 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -58,7 +58,7 @@ jobs:
         micromamba run -n myenv python -m pip install .[dev] --no-deps
         # install the data package
         cd mvtb-data
-        micromamba run -n myenv python -m pip install . --no-deps
+        micromamba run -n myenv python -m pip install . --no-deps --verbose
     - name: Test with pytest
       env:
         MPLBACKEND: TkAgg

From 1830abbf555ef008a356e8aee40c3c7a01c8e239 Mon Sep 17 00:00:00 2001
From: Tobias Fischer <info@tobiasfischer.info>
Date: Mon, 9 Dec 2024 09:29:13 +1000
Subject: [PATCH 19/24]  --no-build-isolation

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

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index d0708ddd..65b7a483 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -55,10 +55,10 @@ jobs:
 
     - name: Install package and data package
       run: |
-        micromamba run -n myenv python -m pip install .[dev] --no-deps
+        micromamba run -n myenv python -m pip install .[dev] --no-deps --no-build-isolation
         # install the data package
         cd mvtb-data
-        micromamba run -n myenv python -m pip install . --no-deps --verbose
+        micromamba run -n myenv python -m pip install . --no-deps --no-build-isolation --verbose
     - name: Test with pytest
       env:
         MPLBACKEND: TkAgg
@@ -103,10 +103,10 @@ jobs:
 
     - name: Install package and data package
       run: |
-        micromamba run -n myenv python -m pip install .[dev] --no-deps
+        micromamba run -n myenv python -m pip install .[dev] --no-deps --no-build-isolation
         # install the data package
         cd mvtb-data
-        micromamba run -n myenv python -m pip install . --no-deps
+        micromamba run -n myenv python -m pip install . --no-deps --no-build-isolation
     - name: Run coverage
       run: |
         micromamba run -n myenv coverage run --source=machinevisiontoolbox -m pytest --ignore=machinevisiontoolbox/blocks

From e16461af2483c2810c1024014dafad5b34d02bc7 Mon Sep 17 00:00:00 2001
From: Tobias Fischer <info@tobiasfischer.info>
Date: Mon, 9 Dec 2024 09:29:51 +1000
Subject: [PATCH 20/24] Create __init__.py

---
 mvtb-data/mvtbdata/images/__init__.py | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 mvtb-data/mvtbdata/images/__init__.py

diff --git a/mvtb-data/mvtbdata/images/__init__.py b/mvtb-data/mvtbdata/images/__init__.py
new file mode 100644
index 00000000..8b137891
--- /dev/null
+++ b/mvtb-data/mvtbdata/images/__init__.py
@@ -0,0 +1 @@
+

From 5397f826b5ef94684a0a4a1e8e0b16e9a0d82d50 Mon Sep 17 00:00:00 2001
From: Tobias Fischer <info@tobiasfischer.info>
Date: Mon, 9 Dec 2024 09:30:04 +1000
Subject: [PATCH 21/24] Create __init__.py

---
 mvtb-data/mvtbdata/data/__init__.py | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 mvtb-data/mvtbdata/data/__init__.py

diff --git a/mvtb-data/mvtbdata/data/__init__.py b/mvtb-data/mvtbdata/data/__init__.py
new file mode 100644
index 00000000..8b137891
--- /dev/null
+++ b/mvtb-data/mvtbdata/data/__init__.py
@@ -0,0 +1 @@
+

From 72a70fecb9b4f20be79e592ef41bfaa64e46fff6 Mon Sep 17 00:00:00 2001
From: Tobias Fischer <info@tobiasfischer.info>
Date: Mon, 9 Dec 2024 09:36:31 +1000
Subject: [PATCH 22/24] add pythonpath for pytest

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

diff --git a/pyproject.toml b/pyproject.toml
index 3691aa8c..052a750c 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -75,13 +75,16 @@ docs = [
     "sphinx-favicon",
 ]
 
-[build-system]
+[tool.pytest.ini_options]
+pythonpath = [
+  ".", "machinevisiontoolbox", "mvtb-data", "mvtb-data/mvtbdata",
+]
 
+[build-system]
 requires = ["setuptools", "oldest-supported-numpy"]
 build-backend = "setuptools.build_meta"
 
 [tool.setuptools]
-
 packages = [
     "machinevisiontoolbox",
     "machinevisiontoolbox.base",

From e3f54afa285aed0c164d8531286ddb557b66b847 Mon Sep 17 00:00:00 2001
From: Tobias Fischer <info@tobiasfischer.info>
Date: Mon, 9 Dec 2024 09:38:58 +1000
Subject: [PATCH 23/24] no more verbose

---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 65b7a483..8a7afa6b 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -58,7 +58,7 @@ jobs:
         micromamba run -n myenv python -m pip install .[dev] --no-deps --no-build-isolation
         # install the data package
         cd mvtb-data
-        micromamba run -n myenv python -m pip install . --no-deps --no-build-isolation --verbose
+        micromamba run -n myenv python -m pip install . --no-deps --no-build-isolation
     - name: Test with pytest
       env:
         MPLBACKEND: TkAgg

From 0099af833f5ba7e2dd9584a0448f9ad75b4fa614 Mon Sep 17 00:00:00 2001
From: Tobias Fischer <info@tobiasfischer.info>
Date: Mon, 9 Dec 2024 09:46:31 +1000
Subject: [PATCH 24/24] add python=3.12

---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 8a7afa6b..73e0d22d 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -20,7 +20,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [windows-latest, ubuntu-latest, macos-13]
-        python-version: ["3.9", "3.10", "3.11"]
+        python-version: ["3.9", "3.10", "3.11", "3.12"]
     steps:
     - name: Checkout master branch
       uses: actions/checkout@v4