Skip to content

Commit 8a45d0a

Browse files
committed
Merge development branch with conflict resolution
Resolved conflicts: - Renamed workflow files from .yml to .yaml (standard naming) - Removed pdoc workflow (docs now use Sphinx) - Removed obsolete docs/user/Installation.qmd (superseded by restructured docs) - Removed docs/_quarto.yaml (Quarto not used for main docs) - Merged environment.yaml with pytest-mpi and pygmsh from RC Changes from development: - Container configuration updates - Workflow file renames for consistency - Solver improvements for boundary conditions - New test for Poisson natural BCs Underworld development team with AI support from Claude Code
2 parents a881bad + a72ebde commit 8a45d0a

20 files changed

Lines changed: 261 additions & 150 deletions

.github/.devcontainer/DOCKERFILE_GHCS

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ RUN conda install -n base -c conda-forge mamba
44

55
# Here we can install all the dependencies using mamba (as we do in the test scripts)
66

7-
COPY .devcontainer/uw_environment.yml /tmp/conda-tmp/
8-
RUN mamba env update -n base --file /tmp/conda-tmp/uw_environment.yml
7+
COPY .devcontainer/uw_environment.yaml /tmp/conda-tmp/
8+
RUN mamba env update -n base --file /tmp/conda-tmp/uw_environment.yaml
99

1010
# Add other dependencies that can't be installed correctly.
1111

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../environment.yaml

.github/.devcontainer/uw_environment.yml

Lines changed: 0 additions & 1 deletion
This file was deleted.

.github/workflows/build_deploy_pdoc.yml

Lines changed: 0 additions & 67 deletions
This file was deleted.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- name: Install Conda environment with Micromamba
2424
uses: mamba-org/setup-micromamba@v2
2525
with:
26-
environment-file: ./environment.yml
26+
environment-file: ./environment.yaml
2727
cache-downloads: true
2828
cache-environment: true
2929

.github/workflows/deploy_to_gh_pages.yml.disabled

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
- name: Cache book files
3535
uses: actions/cache@v1
3636
env:
37-
# Increase this value to reset cache if etc/example-environment.yml has not changed
37+
# Increase this value to reset cache if etc/example-environment.yaml has not changed
3838
CACHE_NUMBER: 0
3939
with:
4040
path: |
File renamed without changes.

0 commit comments

Comments
 (0)