From a485cf70ab5673a65396ac292b5e08a4665de284 Mon Sep 17 00:00:00 2001 From: Daniel McCloy Date: Tue, 4 Aug 2026 11:58:10 -0500 Subject: [PATCH 1/2] better pixi env --- .github/workflows/main.yml | 2 +- pixi.toml | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 14496b5..5ab9767 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -14,7 +14,7 @@ jobs: - uses: prefix-dev/setup-pixi@v0.10.0 with: pixi-version: v0.66.0 - activate-environment: true + activate-environment: "ci" - name: run tests working-directory: tests run: | diff --git a/pixi.toml b/pixi.toml index 14c3165..5fa9a2f 100644 --- a/pixi.toml +++ b/pixi.toml @@ -1,7 +1,7 @@ [workspace] authors = ["Daniel McCloy "] channels = ["conda-forge"] -name = "dev" +name = "phoible" platforms = ["linux-64"] version = "0.1.0" @@ -9,6 +9,15 @@ version = "0.1.0" [dependencies] r = "4.*" + +[environments.agg.dependencies] +r-zoo = ">=1.8_15,<2" +r-stringi = ">=1.8.7,<2" + +[environments.agg.tasks] +aggregate = { cmd = "Rscript aggregate-raw-data.R", cwd = "scripts" } + +[environments.ci.dependencies] r-dplyr = "1.1.1.*" r-knitr = ">=1.47,<2" r-purrr = ">=1.0.2,<2" From 2756c5f61875a9de0b7276b5317162b2f5dd886a Mon Sep 17 00:00:00 2001 From: Daniel McCloy Date: Tue, 4 Aug 2026 14:26:55 -0500 Subject: [PATCH 2/2] fix --- pixi.toml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pixi.toml b/pixi.toml index 5fa9a2f..da4de45 100644 --- a/pixi.toml +++ b/pixi.toml @@ -10,14 +10,14 @@ version = "0.1.0" [dependencies] r = "4.*" -[environments.agg.dependencies] +[feature.agg.dependencies] r-zoo = ">=1.8_15,<2" r-stringi = ">=1.8.7,<2" -[environments.agg.tasks] +[feature.agg.tasks] aggregate = { cmd = "Rscript aggregate-raw-data.R", cwd = "scripts" } -[environments.ci.dependencies] +[feature.ci.dependencies] r-dplyr = "1.1.1.*" r-knitr = ">=1.47,<2" r-purrr = ">=1.0.2,<2" @@ -25,3 +25,7 @@ r-readr = ">=2.1.5,<3" r-stringr = ">=1.5.1,<2" r-testthat = ">=3.2.1.1,<4" r-withr = ">=3.0.0,<4" + +[environments] +agg = { features = ["agg"] } +ci = { features = ["ci"] }