fixup

Author: indiamai

pyproject.toml

@@ -38,7 +38,7 @@ dependencies = [
   "fenics-ufl @ git+https://github.com/firedrakeproject/ufl.git",
   "firedrake-fiat @ git+https://github.com/firedrakeproject/fiat.git",
   "islpy>=2025.1.5; sys_platform == 'darwin'",
-  "fuse-element @ git+https://github.com/indiamai/fuse.git",
+  "fuse-element @ git+https://github.com/firedrakeproject/fuse.git",
 ]
 classifiers = [
   "Development Status :: 5 - Production/Stable",

requirements-git.txt

@@ -4,8 +4,4 @@ git+https://github.com/dolfin-adjoint/pyadjoint.git#egg=pyadjoint-ad
 git+https://github.com/firedrakeproject/loopy.git@main#egg=loopy
 git+https://github.com/firedrakeproject/petsc.git@firedrake#egg=petsc
 git+https://github.com/firedrakeproject/libsupermesh.git#egg=libsupermesh
-<<<<<<< HEAD
-git+https://github.com/indiamai/redefining_fe.git#egg=redefining_fe
-=======
-git+https://github.com/indiamai/fuse.git#egg=fuse
->>>>>>> 59bca7388 (Rename redefining fe to  fuse (#3960))
+git+https://github.com/firedrakeproject/fuse.git#egg=fuse)

scripts/firedrake-run-split-tests

@@ -24,24 +24,16 @@
 #
 #   * pytest
 #   * pytest-split
-<<<<<<< HEAD
 #   * mpi-pytest
-=======
-#   * pytest-mpi (https://github.com/firedrakeproject/pytest-mpi)
->>>>>>> 834db29ca (Test suite clean up (#3385))
 #   * GNU parallel
 
 num_procs=$1
 num_jobs=$2
 extra_args=${@:3}
 
-<<<<<<< HEAD
 # Set per-job cache directories to avoid race conditions when multiple jobs attempt to compile the same form.
 cache_cmd="PYOP2_CACHE_DIR=\$VIRTUAL_ENV/.cache/pyop2/job{#} \
            FIREDRAKE_TSFC_KERNEL_CACHE_DIR=\$VIRTUAL_ENV/.cache/tsfc/job{#}"
-=======
-log_file_prefix="pytest_nprocs${num_procs}_job"
->>>>>>> 834db29ca (Test suite clean up (#3385))
 
 if [ $num_procs = 1 ]; then
     pytest_exec="python -m pytest"
@@ -55,11 +47,8 @@ pytest_cmd="${pytest_exec} -v \
             --splits ${num_jobs} --group {#} \
             -m ${marker_spec} ${extra_args}"
 
-<<<<<<< HEAD
 log_file_prefix="pytest_nprocs${num_procs}_job"
 
-=======
->>>>>>> 834db29ca (Test suite clean up (#3385))
 # Print the command
 set -x
 
@@ -68,11 +57,7 @@ set -x
 # * Uses tee to pipe stdout+stderr to both stdout and a log file
 # * Writes pytest's exit code to a file called jobN.errcode (for later inspection)
 parallel --line-buffer --tag \
-<<<<<<< HEAD
     "${cache_cmd}; ${pytest_cmd} |& tee ${log_file_prefix}{#}.log; \
-=======
-    "${pytest_cmd} |& tee ${log_file_prefix}{#}.log; \
->>>>>>> 834db29ca (Test suite clean up (#3385))
     echo \${PIPESTATUS[0]} > job{#}.errcode" \
     ::: $(seq ${num_jobs})