From f9338f0f8f4fb1d9f5255f4db23c7f1c68e45518 Mon Sep 17 00:00:00 2001
From: Vincent Delecroix <vincent.delecroix@u-bordeaux.fr>
Date: Fri, 20 Sep 2024 20:00:31 +0200
Subject: [PATCH] fix test.yml

---
 .github/workflows/test.yml | 39 +++++++++++++++++++-------------------
 environment.yml            | 13 ++++++-------
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 963a3462..b6391f1d 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -15,35 +15,36 @@ jobs:
         include:
           - optionals: "sage"
             sagelib: "9.3"
-            python: "3.9.15"
+            python: "3.9"
           - optionals: "sage"
             sagelib: "10.0"
-            python: "3.10.8"
+            python: "3.10"
           - optionals: "sage,sage_flatsurf,pyeantic,pyintervalxt,pyflatsurf,pynormaliz,surface_dynamics"
-             sagelib: "10.4"
-             python: "3.12.15"
+            sagelib: "10.3"
+            python: "3.10"
           # Test optional dependencies in isolation
           - optionals: "sage"
-            sagelib: "10.4"
-            python: "3.12.15"
-          - optionals: "sage,sage_flatsurf"
-            sagelib: "10.4"
-            python: "3.12.15"
+            sagelib: "10.3"
+            python: "3.10"
+          # Recent sage-flatsurf depends on surface-dynamics
+          - optionals: "sage,surface_dynamics,sage_flatsurf"
+            sagelib: "10.3"
+            python: "3.10"
           - optionals: "sage,pyeantic"
-            sagelib: "10.4"
-            python: "3.12.15"
+            sagelib: "10.3"
+            python: "3.10"
           - optionals: "sage,pyintervalxt"
-            sagelib: "10.4"
-            python: "3.12.15"
+            sagelib: "10.3"
+            python: "3.10"
           - optionals: "sage,pynormaliz"
-            sagelib: "10.4"
-            python: "3.12.15"
+            sagelib: "10.3"
+            python: "3.10"
           - optionals: "sage,surface_dynamics"
-            sagelib: "10.4"
-            python: "3.12.15"
+            sagelib: "10.3"
+            python: "3.10"
           - optionals: "sage,pyflatsurf"
-            sagelib: "10.4"
-            python: "3.12.15"
+            sagelib: "10.3"
+            python: "3.10"
     steps:
       - uses: actions/checkout@v2
         with: { submodules: recursive }
diff --git a/environment.yml b/environment.yml
index a2cfedbe..d0c22088 100644
--- a/environment.yml
+++ b/environment.yml
@@ -18,15 +18,12 @@ dependencies:
   - sagelib >=9.3
   # some of the tests rely on ipywidgets which is not required by sagelib
   - ipywidgets
-  # Work around https://github.com/conda-forge/givaro-feedstock/issues/13
-  - givaro=4.1.1=h192cbe9_1
-  - sage-flatsurf  # optional: sage_flatsurf
-  - pyeantic >=1,<2  # optional: pyeantic
+  - pyeantic >=1  # optional: pyeantic
   - pyintervalxt >=3,<4  # optional: pyintervalxt
-  - pyflatsurf >=3.10.1,<4 # optional: pyflatsurf
+  - pyflatsurf >=3.10.1 # optional: pyflatsurf
   # Work around https://github.com/conda-forge/pynormaliz-feedstock/issues/10 by pinning normaliz and pynormaliz
-  - pynormaliz 2.17 # optional: pynormaliz
-  - normaliz 3.9.4  # optional: pynormaliz
+  - pynormaliz 2.19 # optional: pynormaliz
+  - normaliz 3.10.2  # optional: pynormaliz
   - sphinx >=4.2.0,<6  # optional: doc
   - pip
   - surface-dynamics  # optional: surface_dynamics
@@ -34,3 +31,5 @@ dependencies:
     - linkchecker  # optional: doc
     - sphinx_rtd_theme  # optional: doc
     - flipper  # optional: flipper
+    # Use a version including https://github.com/flatsurf/sage-flatsurf/pull/269
+    - git+https://github.com/flatsurf/sage-flatsurf.git