From 49342ea304c73c9671f8fafc916b0a0bf82248c8 Mon Sep 17 00:00:00 2001
From: Ewout ter Hoeven <E.M.terHoeven@student.tudelft.nl>
Date: Sun, 25 Aug 2024 16:22:51 +0200
Subject: [PATCH] Update optional dependencies and CI

---
 .github/workflows/test_examples.yml     | 4 ++--
 .github/workflows/test_gis_examples.yml | 6 ++----
 pyproject.toml                          | 7 +++++--
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/test_examples.yml b/.github/workflows/test_examples.yml
index 4821604c..6061c145 100644
--- a/.github/workflows/test_examples.yml
+++ b/.github/workflows/test_examples.yml
@@ -40,7 +40,7 @@ jobs:
     - name: Install dependencies
       run: |
         pip install mesa --pre
-        pip install pytest
+        pip install .[test]
     - name: Test with pytest
       run: pytest -rA -Werror test_examples.py
 
@@ -54,7 +54,7 @@ jobs:
         python-version: "3.12"
     - name: Install dependencies
       run: |
-        pip install pytest
+        pip install .[test]
         pip install -U git+https://github.com/projectmesa/mesa@main#egg=mesa
     - name: Test with pytest
       run: pytest -rA -Werror test_examples.py
diff --git a/.github/workflows/test_gis_examples.yml b/.github/workflows/test_gis_examples.yml
index 71dcfbfe..f52986cf 100644
--- a/.github/workflows/test_gis_examples.yml
+++ b/.github/workflows/test_gis_examples.yml
@@ -39,9 +39,8 @@ jobs:
         python-version: "3.12"
     - name: Install dependencies
       run: |
-        pip install mesa mesa-geo --pre
+        pip install mesa-geo --pre
         pip install .[test_gis]
-        pip install pytest
     - name: Test with pytest
       run: pytest -rA -Werror test_gis_examples.py
 
@@ -55,8 +54,7 @@ jobs:
         python-version: "3.12"
     - name: Install dependencies
       run: |
-        pip install pytest
-        pip install -U git+https://github.com/projectmesa/mesa@main#egg=mesa
         pip install -U git+https://github.com/projectmesa/mesa-geo@main#egg=mesa-geo
+        pip install .[test_gis]
     - name: Test with pytest
       run: pytest -rA -Werror test_gis_examples.py
diff --git a/pyproject.toml b/pyproject.toml
index 41bb1d02..ab2b4abd 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -10,9 +10,12 @@ readme = "README.rst"
 requires-python = ">=3.8"
 
 [project.optional-dependencies]
-test = [""]
+test = [
+    "pytest",
+]
 test_gis = [
-  "momepy",
+    "pytest",
+    "momepy",
 ]
 
 [build-system]