From a37b01ff6bca3e6f17daea4455314db7cfac3c45 Mon Sep 17 00:00:00 2001
From: Matteo Cusini <matteo.cusini@gmail.com>
Date: Fri, 18 Apr 2025 15:07:22 -0700
Subject: [PATCH 1/4] ci: remove relative paths

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

diff --git a/pygeos-tools/pyproject.toml b/pygeos-tools/pyproject.toml
index cc7ce97..9093ef8 100644
--- a/pygeos-tools/pyproject.toml
+++ b/pygeos-tools/pyproject.toml
@@ -24,8 +24,8 @@ classifiers = [
 requires-python = ">= 3.10"
 
 dependencies = [
-    "geos-utils @ file:./geos-utils",
-    "geos-mesh @ file:./geos-mesh",
+    "geos-utils",
+    "geos-mesh",
     "matplotlib",
     "scipy",
     "mpi4py",

From c9580c0e87e3293ab6119a766f77f0c6dda9a001 Mon Sep 17 00:00:00 2001
From: Matteo Cusini <matteo.cusini@gmail.com>
Date: Fri, 18 Apr 2025 16:39:18 -0700
Subject: [PATCH 2/4] fix ci.

---
 .github/workflows/python-package.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
index 456fddd..544052a 100644
--- a/.github/workflows/python-package.yml
+++ b/.github/workflows/python-package.yml
@@ -54,6 +54,13 @@ jobs:
       # working-directory: ./${{ matrix.package-name }}
       run: |
         python -m pip install --upgrade pip
+
+        # install dependencies for the package pygeos-tools (we wll need something better)
+        if [ "${{ matrix.package-name }}" = "pygeos-tools" ]; then
+          echo "Installing prerequisites for pygeos-tools..."
+          python -m pip install ./geos-utils
+          python -m pip install ./geos-mesh
+        fi
         python -m pip install pytest yapf toml
         python -m pip install ./${{ matrix.package-name }}/[test]
     - name: Lint with yapf

From 6e2e58006c2339f827b42e36330665f76047c7bc Mon Sep 17 00:00:00 2001
From: Matteo Cusini <matteo.cusini@gmail.com>
Date: Fri, 18 Apr 2025 16:49:06 -0700
Subject: [PATCH 3/4] try something cleaner.

---
 .github/workflows/python-package.yml | 33 ++++++++++++++++++++--------
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
index 544052a..cbca25d 100644
--- a/.github/workflows/python-package.yml
+++ b/.github/workflows/python-package.yml
@@ -40,7 +40,18 @@ jobs:
       max-parallel: 3
       matrix:
         python-version: ["3.10", "3.11", "3.12"]
-        package-name: ["geos-ats", "geos-mesh", "geos-posp", "geos-timehistory", "geos-trame", "geos-utils", "geos-xml-tools", "geos-xml-viewer", "hdf5-wrapper", "pygeos-tools"]
+        include:
+          - package-name: geos-ats
+          - package-name: geos-mesh
+          - package-name: geos-posp
+          - package-name: geos-timehistory
+          - package-name: geos-trame
+          - package-name: geos-utils
+          - package-name: geos-xml-tools
+          - package-name: geos-xml-viewer
+          - package-name: hdf5-wrapper
+          - package-name: pygeos-tools
+            dependencies: "geos-utils geos-mesh"
 
     steps:
     - uses: actions/checkout@v4
@@ -54,15 +65,20 @@ jobs:
       # working-directory: ./${{ matrix.package-name }}
       run: |
         python -m pip install --upgrade pip
+        python -m pip install pytest yapf toml
+
+        DEPS="${{ matrix.dependencies || '' }}"  
 
-        # install dependencies for the package pygeos-tools (we wll need something better)
-        if [ "${{ matrix.package-name }}" = "pygeos-tools" ]; then
-          echo "Installing prerequisites for pygeos-tools..."
-          python -m pip install ./geos-utils
-          python -m pip install ./geos-mesh
+        if [ -n "$DEPS" ]; then
+        echo "Installing additional dependencies: $DEPS"
+        for dep in $DEPS; do
+          python -m pip install ./$dep
+        done
         fi
-        python -m pip install pytest yapf toml
+
+        echo "Installing main package..."
         python -m pip install ./${{ matrix.package-name }}/[test]
+
     - name: Lint with yapf
       # working-directory: ./${{ matrix.package-name }}
       run: |
@@ -72,5 +88,4 @@ jobs:
       run:
       # python -m pytest ./${{ matrix.package-name }} --doctest-modules --junitxml=junit/test-results.xml --cov-report=xml --cov-report=html |
       # wrap pytest to avoid error when no tests in the package
-        sh -c 'python -m pytest ./${{ matrix.package-name }}; ret=$?; [ $ret = 5 ] && exit 0 || exit $ret'
-         
+        sh -c 'python -m pytest ./${{ matrix.package-name }}; ret=$?; [ $ret = 5 ] && exit 0 || exit $ret'
\ No newline at end of file

From dab5d3688f645ea1f742ae0b35d9755161f7c44d Mon Sep 17 00:00:00 2001
From: Matteo Cusini <matteo.cusini@gmail.com>
Date: Fri, 18 Apr 2025 16:58:43 -0700
Subject: [PATCH 4/4] try this.

---
 .github/workflows/python-package.yml | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
index cbca25d..03f65e1 100644
--- a/.github/workflows/python-package.yml
+++ b/.github/workflows/python-package.yml
@@ -40,19 +40,20 @@ jobs:
       max-parallel: 3
       matrix:
         python-version: ["3.10", "3.11", "3.12"]
+        package-name: 
+          - geos-ats
+          - geos-mesh
+          - geos-posp
+          - geos-timehistory
+          - geos-trame
+          - geos-utils
+          - geos-xml-tools
+          - geos-xml-viewer
+          - hdf5-wrapper
+          - pygeos-tools
         include:
-          - package-name: geos-ats
-          - package-name: geos-mesh
-          - package-name: geos-posp
-          - package-name: geos-timehistory
-          - package-name: geos-trame
-          - package-name: geos-utils
-          - package-name: geos-xml-tools
-          - package-name: geos-xml-viewer
-          - package-name: hdf5-wrapper
           - package-name: pygeos-tools
             dependencies: "geos-utils geos-mesh"
-
     steps:
     - uses: actions/checkout@v4
     - uses: mpi4py/setup-mpi@v1