Skip to content

Merge release into main#5114

Closed
pbrubeck wants to merge 18 commits into
mainfrom
pbrubeck/merge-release-into-main
Closed

Merge release into main#5114
pbrubeck wants to merge 18 commits into
mainfrom
pbrubeck/merge-release-into-main

Conversation

@pbrubeck
Copy link
Copy Markdown
Contributor

Description

stephankramer and others added 18 commits May 7, 2026 18:30
* fix interpolation cell subset

* subset not equal to whole domain
…tition (#5078)

---------

Co-authored-by: Leo Collins <leocollins511@gmail.com>
* Remove team member failing link
* Submesh: support tuple subdomain_id
To address discussions held with FEniCS. This will allow us to make UFL releases without needing approval from FEniCS.
---------

Co-authored-by: Josh Hope-Collins <jhc.jss@gmail.com>
Adapts to a webhook update in GitHub. This nicely means that editing the PR description will no longer restart CI.
* SubmeshHierarchy

* Initial Claude-generated demo

* Manual edits to the demo

---------

Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
Co-authored-by: Pablo Brubeck <brubeck@protonmail.com>
* Fix cell_avg + MixedFunctionSpace

* add tests for cell_avg
* Set _SNESContext.options_prefix for fieldsplit and mg_levels
Comment on lines 345 to +387
@@ -601,6 +376,15 @@ jobs:
. venv/bin/activate
firedrake-check
timeout-minutes: 10
=======
uses: ./firedrake-repo/.github/actions/install
with:
os: linux
source_ref: ${{ inputs.source_ref }}
base_ref: ${{ inputs.target_branch }}
gpu: cuda
deps: check
>>>>>>> release
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Comment thread pyproject.toml
Comment on lines +21 to +31
<<<<<<< HEAD
# TODO RELEASE
"fenics-ufl @ git+https://github.com/FEniCS/ufl.git@main",
# TODO RELEASE
"firedrake-fiat @ git+https://github.com/firedrakeproject/fiat.git@main",
=======
# FEniCS may make new minor releases of UFL without warning so we pin each Firedrake
# release to a specific UFL minor version (e.g. 2025.3.x)
"fenics-ufl>=2025.3,<2025.4",
"firedrake-fiat>=2026.4",
>>>>>>> release
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@connorjward do we keep both?

@connorjward
Copy link
Copy Markdown
Contributor

I was going to do this after #5085

@pbrubeck pbrubeck closed this May 14, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants