From 1b804017cec8dc18f8b786bbf061346f29ed876a Mon Sep 17 00:00:00 2001 From: "Jack S. Hale" Date: Tue, 7 Mar 2023 15:00:01 +0100 Subject: [PATCH 1/2] Run standard tests on merge queue. --- .github/workflows/ccpp.yml | 3 +++ python/demo/demo_cahn-hilliard.py | 4 +++- python/demo/demo_poisson.py | 7 +++++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 75ec7edda85..a41627a5387 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -9,6 +9,9 @@ on: pull_request: branches: - main + merge_group: + branches: + - main workflow_dispatch: inputs: ffcx_ref: diff --git a/python/demo/demo_cahn-hilliard.py b/python/demo/demo_cahn-hilliard.py index 5344d732ac8..8282601965f 100644 --- a/python/demo/demo_cahn-hilliard.py +++ b/python/demo/demo_cahn-hilliard.py @@ -24,7 +24,9 @@ # - Interpolation of functions # - Visualisation of a running simulation with pyvista # -# This demo is implemented in {download}`demo_cahn-hilliard.py`. +# {download}`Python script <./demo_poisson.py>`. +# +# {download}`Jupyter notebook <./demo_poisson.ipynb>`. # # ## Equation and problem definition # diff --git a/python/demo/demo_poisson.py b/python/demo/demo_poisson.py index ac0bc000076..2404dcd3051 100644 --- a/python/demo/demo_poisson.py +++ b/python/demo/demo_poisson.py @@ -10,12 +10,15 @@ # # Poisson equation # -# This demo is implemented in {download}`demo_poisson.py`. It -# illustrates how to: +# This demo illustrates how to: # # - Define a {py:class}`FunctionSpace ` # - Define a {py:class}`FunctionSpace ` # - Solve a linear partial differential equation +# +# {download}`Python script <./demo_poisson.py>`. +# +# {download}`Jupyter notebook <./demo_poisson.ipynb>`. # # ## Equation and problem definition # From f130bbbe687a8f4749cf1eb56586a274003d8b8e Mon Sep 17 00:00:00 2001 From: "Jack S. Hale" Date: Tue, 7 Mar 2023 15:22:07 +0100 Subject: [PATCH 2/2] Backout --- python/demo/demo_cahn-hilliard.py | 4 +--- python/demo/demo_poisson.py | 7 ++----- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/python/demo/demo_cahn-hilliard.py b/python/demo/demo_cahn-hilliard.py index 8282601965f..5344d732ac8 100644 --- a/python/demo/demo_cahn-hilliard.py +++ b/python/demo/demo_cahn-hilliard.py @@ -24,9 +24,7 @@ # - Interpolation of functions # - Visualisation of a running simulation with pyvista # -# {download}`Python script <./demo_poisson.py>`. -# -# {download}`Jupyter notebook <./demo_poisson.ipynb>`. +# This demo is implemented in {download}`demo_cahn-hilliard.py`. # # ## Equation and problem definition # diff --git a/python/demo/demo_poisson.py b/python/demo/demo_poisson.py index 2404dcd3051..ac0bc000076 100644 --- a/python/demo/demo_poisson.py +++ b/python/demo/demo_poisson.py @@ -10,15 +10,12 @@ # # Poisson equation # -# This demo illustrates how to: +# This demo is implemented in {download}`demo_poisson.py`. It +# illustrates how to: # # - Define a {py:class}`FunctionSpace ` # - Define a {py:class}`FunctionSpace ` # - Solve a linear partial differential equation -# -# {download}`Python script <./demo_poisson.py>`. -# -# {download}`Jupyter notebook <./demo_poisson.ipynb>`. # # ## Equation and problem definition #