diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ca04dba6e1fad722b92cab58832a466ae634d72e..a004384d1fe1017755966938d8b7c4593b5aaf26 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -67,7 +67,6 @@ coverage: - coverage.xml when: always expire_in: 7 days - allow_failure: true rules: - if: $CI_COMMIT_BRANCH =~ /^release/ when: manual @@ -97,8 +96,6 @@ zip_tutorials: rules: - if: '$CI_COMMIT_TAG' # Run only on tag pipelines, e.g., for release tags when: always - - if: '$CI_COMMIT_BRANCH =~ /^hotfix/' # Also run on hotfix branches - when: always create_release: stage: release @@ -114,14 +111,15 @@ create_release: - chmod +x /usr/local/bin/release-cli script: - echo "Creating release and attaching tutorials.zip..." - - if [ -z "$CI_COMMIT_TAG" ]; then export CI_COMMIT_TAG="test-dummy-tag"; fi - echo "Using tag $CI_COMMIT_TAG" - - release-cli create --name "Release $CI_COMMIT_TAG" --description "## What's New in $CI_COMMIT_TAG\n- Updated tutorials for version $CI_COMMIT_TAG\n- Tutorials included as tutorials.zip" --tag-name "$CI_COMMIT_TAG" --assets-link "{\"name\":\"tutorials.zip\",\"url\":\"$CI_JOB_URL/artifacts/download\"}" + - release-cli create \ + --name "Release $CI_COMMIT_TAG" \ + --tag-name "$CI_COMMIT_TAG" \ + --description $'## What\'s New in '"$CI_COMMIT_TAG"$'\n- Updated tutorials for version '"$CI_COMMIT_TAG"$'\n- Tutorials included as tutorials.zip' \ + --assets-link "{\"name\":\"tutorials.zip\",\"url\":\"$CI_JOB_URL/artifacts/download\"}" rules: - if: '$CI_COMMIT_TAG' # Run only on tag pipelines, e.g., for release tags when: always - - if: '$CI_COMMIT_BRANCH =~ /^hotfix/' # Also run on hotfix branches - when: always anaconda : stage: deploy @@ -149,9 +147,6 @@ anaconda : allow_failure: true - if: '$CI_COMMIT_BRANCH == "master"' when: on_success - - if: $CI_COMMIT_BRANCH =~ /^hotfix/ - when: manual - allow_failure: true pages: stage: deploy @@ -175,9 +170,6 @@ pages: - python -m pip install -e .[doc] # Build the documentation with Sphinx: - sphinx-build -b html doc/ public/ - # Remove the .ipynb files from public/html/tutorials directory: - - echo "Cleaning up .ipynb files from public/html/tutorials..." - - find public/html/tutorials -name "*.ipynb" -type f -delete retry: max: 2 when: runner_system_failure @@ -186,7 +178,7 @@ pages: paths: - public exclude: - - public/*.ipynb + - public/**/*.ipynb dependencies: [] rules: - if: $CI_COMMIT_BRANCH =~ /^release/ diff --git a/doc/conf.py b/doc/conf.py index 29e360024f7464a6ffe54d7fc48ebe3461df56b4..0ac217aac302475ac7ee42fa9920fbdcc96ea320 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -30,18 +30,20 @@ tutorial_rst_path = "tutorials.rst" # List of tutorial notebooks to process notebooks = [ - 'bvpy_tutorial_1_hello_world.ipynb', - 'bvpy_tutorial_2_domains.ipynb', - 'bvpy_tutorial_3_vforms.ipynb', - 'bvpy_tutorial_4_bnd_cond.ipynb', - 'bvpy_tutorial_5_reaction_diffusion.ipynb', 'bvpy_tutorial_6_linear_elasticity.ipynb', 'bvpy_tutorial_7_hyper_elasticity.ipynb', - 'bvpy_tutorial_8_pyvista.ipynb', - 'bvpy_tutorial_9_gmsh.ipynb', - 'bvpy_tutorial_10_morphoelasticity.ipynb', ] +# 'bvpy_tutorial_1_hello_world.ipynb', +# 'bvpy_tutorial_2_domains.ipynb', +# 'bvpy_tutorial_3_vforms.ipynb', +# 'bvpy_tutorial_4_bnd_cond.ipynb', +# 'bvpy_tutorial_5_reaction_diffusion.ipynb', + +# 'bvpy_tutorial_8_pyvista.ipynb', +# 'bvpy_tutorial_9_gmsh.ipynb', +# 'bvpy_tutorial_10_morphoelasticity.ipynb', + # Ensure the tutorials directory exists os.makedirs(tutorial_output_dir, exist_ok=True) diff --git a/tutorials/bvpy_tutorial_6_linear_elasticity.ipynb b/tutorials/bvpy_tutorial_6_linear_elasticity.ipynb index f751fb32e49758ca76dfbc9b64add8ee0c87ee5a..30ff03c85e457e968f7050036adbc83461904a53 100644 --- a/tutorials/bvpy_tutorial_6_linear_elasticity.ipynb +++ b/tutorials/bvpy_tutorial_6_linear_elasticity.ipynb @@ -816,9 +816,9 @@ "cell_type": "code", "metadata": {}, "source": [ - "fixed_center = [dirichlet(0, boundary='near(x, 0)', subspace=0),\n", - " dirichlet(0, boundary='near(y, 0)', subspace=1),\n", - " dirichlet(0, boundary='near(z, 0)', subspace=2)]" + "fixed_center = [dirichlet(0, boundary='near(x, 0)', subspace=0, method='pointwise'),\n", + " dirichlet(0, boundary='near(y, 0)', subspace=1, method='pointwise'),\n", + " dirichlet(0, boundary='near(z, 0)', subspace=2, method='pointwise')]" ], "outputs": [], "execution_count": null