Merge branch 'main' into config-cleanup

Author: pmeier

.github/actions/setup-env/action.yml

@@ -3,9 +3,9 @@ description: "Setup development environment"
 
 inputs:
   environment:
-    default: "default"
+    default: "base-py310"
     description:
-      "Pixi environment to activate. Examples include 'default', 'dev-all-py312'"
+      "Pixi environment to activate. Examples include 'base-py310' or 'all-py313'."
 
 runs:
   using: composite

.github/workflows/docker.yml

@@ -38,8 +38,6 @@ jobs:
 
       - name: Setup environment
         uses: ./.github/actions/setup-env
-        with:
-          environment: "dev-py310"
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3

.github/workflows/lint.yml

@@ -18,12 +18,9 @@ jobs:
 
       - name: Setup environment
         uses: ./.github/actions/setup-env
-        with:
-          environment: "dev-py310"
 
       - name: Test optional dependencies
-        run: |
-          pixi run optional-dependencies
+        run: pixi run optional-dependencies
 
   format:
     runs-on: ubuntu-latest
@@ -36,8 +33,6 @@ jobs:
 
       - name: Setup environment
         uses: ./.github/actions/setup-env
-        with:
-          environment: "dev-py310"
 
       - uses: actions/cache@v4
         with:
@@ -64,7 +59,7 @@ jobs:
       - name: Setup environment
         uses: ./.github/actions/setup-env
         with:
-          environment: "dev-all-py310"
+          environment: all-py310
 
       - name: Run type checks
         run: pixi run types

.github/workflows/release.yml

@@ -20,8 +20,6 @@ jobs:
 
       - name: Setup environment
         uses: ./.github/actions/setup-env
-        with:
-          environment: "dev-py310"
 
       - name: Build dists
         run: pixi run build

.github/workflows/test.yml

@@ -24,8 +24,6 @@ jobs:
 
       - name: Setup environment
         uses: ./.github/actions/setup-env
-        with:
-          environment: "dev-py310"
 
       - name: Check if all public packages are importable
         run: python tests/test_importable.py
@@ -37,14 +35,14 @@ jobs:
           - ubuntu-latest
           - windows-latest
           - macos-latest
-        environment: ["dev-all-py310"]
+        environment: ["all-py310"]
         include:
           - os: ubuntu-latest
-            environment: "dev-all-py311"
+            environment: "all-py311"
           - os: ubuntu-latest
-            environment: "dev-all-py312"
+            environment: "all-py312"
           - os: ubuntu-latest
-            environment: "dev-all-py313"
+            environment: "all-py313"
 
       fail-fast: false
 

.readthedocs.yml

@@ -31,11 +31,11 @@ build:
         PIXI_VERSION=v0.45.0 bash
       # We call the full path of the executable /home/docs/.pixi/bin/pixi because
       # the installation process does not add the executable to the $PATH
-      - /home/docs/.pixi/bin/pixi install --frozen --environment dev-all-py312
+      - /home/docs/.pixi/bin/pixi install --frozen --environment all-py310
     post_install:
       - git update-index --really-refresh || true
     build:
       html:
         - mkdir --parents $READTHEDOCS_OUTPUT/html/
-        - /home/docs/.pixi/bin/pixi run --frozen --environment dev-all-py312 mkdocs
-          build --site-dir $READTHEDOCS_OUTPUT/html/
+        - /home/docs/.pixi/bin/pixi run --frozen --environment all-py310 mkdocs build
+          --site-dir $READTHEDOCS_OUTPUT/html/

Dockerfile

@@ -15,7 +15,7 @@ COPY pyproject.toml pixi.lock .
 #    since setuptools-scm cannot infer the version
 RUN echo '[tool.setuptools.package-data]\n"*" = ["*"]' >> pyproject.toml
 ARG SETUPTOOLS_SCM_PRETEND_VERSION_FOR_RAGNA
-ARG ENVIRONMENT="default-all-py313"
+ARG ENVIRONMENT="all-docker"
 
 RUN <<EOF
 pixi shell-hook --frozen --environment $ENVIRONMENT --shell bash > /shell-hook.sh;
@@ -33,7 +33,7 @@ USER bodil
 
 WORKDIR /var/ragna
 
-COPY --from=build --chown=bodil:bodil /var/ragna/.pixi/envs/default-all-py313 /var/ragna/.pixi/envs/default-all-py313
+COPY --from=build --chown=bodil:bodil /var/ragna/.pixi/envs/${ENVIRONMENT} /var/ragna/.pixi/envs/${ENVIRONMENT}
 COPY --from=build --chown=bodil:bodil --chmod=0755 /entrypoint.sh /entrypoint.sh
 COPY --from=build --chown=bodil:bodil /var/ragna/ragna /var/ragna/ragna
 

docs/community/contribute.md

@@ -29,30 +29,26 @@ git clone https://github.com/<your-username>/ragna.git
 
 ### Set up development environment and run Ragna
 
-We use [Pixi](https://pixi.sh/dev/) to manage development environments with Ragna.
-
-Ragna has three main development environments: `dev-all-py310`, `dev-all-py311`, and
-`dev-all-py312`, which use Python 3.10, 3.11, and 3.12, respectively. The environment
-`dev-all` is the same as `dev-all-py310`. The environment `dev-all` is used as an
-example in the sections below, but you can use any of the three Python versions you
-like.
+We use [Pixi](https://pixi.sh/dev/) to manage development environments with Ragna. The
+main development environment is `all-py310`, which should be used for most use cases and
+is used in the sections below.
 
 To install a development environment, run
 
 ```bash
-pixi install -e dev-all --frozen
+pixi install --environment all-py310 --frozen
 ```
 
 You can then run Ragna with
 
 ```bash
-pixi run -e dev-all ragna deploy
+pixi run --environment all-py310 ragna deploy
 ```
 
 You can verify that a development version of Ragna is correctly installed with
 
 ```bash
-pixi run -e dev-all ragna --version
+pixi run --environment all-py310 ragna --version
 # Ideal output: ragna <version-number> devXXXX from ...
 ```
 
@@ -75,7 +71,7 @@ on each pull request.
 You can run Ragna tests with
 
 ```bash
-pixi run -e dev-all test
+pixi run --environment all-py310 test
 ```
 
 #### Formatting & Linting
@@ -84,21 +80,21 @@ To run the [Ruff code formatter and checker](https://docs.astral.sh/ruff/formatt
 well as other useful formatting and linting tools, you can use
 
 ```bash
-pixi run -e dev pre-commit
+pixi run --environment all-py310 pre-commit
 ```
 
 #### Type checking
 
 You can check type annotations with [Mypy](https://mypy-lang.org/) using
 
 ```bash
-pixi run -e dev-all types
+pixi run --environment all-py310 types
 ```
 
 or
 
 ```bash
-pixi run -e dev-all mypy
+pixi run --environment all-py310 mypy
 ```
 
 #### All of the above
@@ -107,7 +103,7 @@ To run all the above checks using a single command as they would be run on the C
 can use
 
 ```bash
-pixi run -e dev-all ci
+pixi run ---environment all-py310 ci
 ```
 
 ## Contribute documentation
@@ -127,13 +123,11 @@ To start a development build of the website that auto-refreshes on new changes,
 following from the project root:
 
 ```bash
-pixi run -e dev-all mkdocs serve
+pixi run --environment all-py310 mkdocs serve
 ```
 
 This serves the docs website at [http://127.0.0.1:8000](http://127.0.0.1:8000).
 
-You must use a `dev-all*` environment to build the docs.
-
 ### View, add, or update images
 
 Ragna tracks most image files with [`git-lfs`](https://git-lfs.com).