Merge branch 'main' into hotfix_env_var_bottom_collidable_points

ami-iit · Feb 10, 2025 · 115a3de · 115a3de
2 parents bffc0ad + e51cd1c
commit 115a3de
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/pixi.yml b/.github/workflows/pixi.yml
@@ -35,7 +35,7 @@ jobs:
           pixi update --json | pixi exec pixi-diff-to-markdown --explicit-column > diff.md
 
       - name: Test project against updated pixi
-        run: pixi run --environment tasks-cpu test
+        run: pixi run --environment default test
         env:
           PY_COLORS: "1"
           JAX_PLATFORM_NAME: cpu

diff --git a/pyproject.toml b/pyproject.toml
@@ -246,9 +246,9 @@ jaxsim = { path = "./", editable = true }
 
 [tool.pixi.feature.test.tasks]
 pipcheck = "pip check"
-benchmark = { cmd = "pytest --benchmark-only", depends_on = ["pipcheck"] }
+benchmark = { cmd = "pytest --benchmark-only", depends-on = ["pipcheck"] }
 lint = { cmd = "pre-commit run --all-files --hook-stage=manual" }
-test = { cmd = "pytest", depends_on = ["pipcheck"] }
+test = { cmd = "pytest", depends-on = ["pipcheck"] }
 
 [tool.pixi.feature.test.dependencies]
 black-jupyter = "24.*"