DO NOT MERGE

firedrakeproject · Dec 18, 2024 · f4b93fd · f4b93fd
1 parent 18a952f
commit f4b93fd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -83,6 +83,7 @@ jobs:
             --install defcon \
             --install gadopt \
             --install asQ \
+            --package-branch ufl ksagiyam/merge_upstream \
             || (cat firedrake-install.log && /bin/false)
       - name: Install test dependencies
         run: |

diff --git a/pyproject.toml b/pyproject.toml
@@ -34,7 +34,7 @@ dependencies = [
   "rtree>=1.2",
   "scipy",
   "sympy",
-  "fenics-ufl @ git+https://github.com/firedrakeproject/ufl.git",
+  "fenics-ufl @ git+https://github.com/firedrakeproject/ufl.git@ksagiyam/merge_upstream",
   "fenics-fiat @ git+https://github.com/firedrakeproject/fiat.git",
   "pyadjoint-ad @ git+https://github.com/dolfin-adjoint/pyadjoint.git",
   "loopy @ git+https://github.com/firedrakeproject/loopy.git@main",