diff --git a/.envrc b/.envrc index 05db1f57..e1d415a5 100644 --- a/.envrc +++ b/.envrc @@ -4,7 +4,7 @@ elif [ -e venv ]; then source venv/bin/activate elif [ -e .pixi ]; then watch_file pixi.lock - eval "$(pixi shell-hook --environment compwa-policy)" + eval "$(pixi shell-hook)" else layout anaconda fi diff --git a/pyproject.toml b/pyproject.toml index 999d9e52..11457715 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -161,13 +161,13 @@ env = {PRETTIER_LEGACY_CLI = "1"} python = "3.9.*" [tool.pixi.environments] -compwa-policy = {features = [ +default = {features = [ "dev", "doc", "sty", "test", "types", -], solve-group = "default"} +]} [tool.pixi.feature.dev.tasks.ci] depends_on = ["cov", "doc", "linkcheck", "sty"] diff --git a/src/compwa_policy/check_dev_files/pixi.py b/src/compwa_policy/check_dev_files/pixi.py index 99c7e7f9..0df36bd8 100644 --- a/src/compwa_policy/check_dev_files/pixi.py +++ b/src/compwa_policy/check_dev_files/pixi.py @@ -358,16 +358,12 @@ def __contains_line(path: Path, expected_line: str) -> bool: def _update_dev_environment(pyproject: ModifiablePyproject) -> None: if not pyproject.has_table("project.optional-dependencies"): return - optional_dependencies = sorted(pyproject.get_table("project.optional-dependencies")) + optional_dependencies = pyproject.get_table("project.optional-dependencies") expected = inline_table() - expected.update({ - "features": to_toml_array(optional_dependencies), - "solve-group": "default", - }) + expected["features"] = to_toml_array(sorted(optional_dependencies)) environments = pyproject.get_table("tool.pixi.environments", create=True) - package_name = pyproject.get_package_name(raise_on_missing=True) - if environments.get(package_name) != expected: - environments[package_name] = expected + if environments.get("default") != expected: + environments["default"] = expected msg = "Updated Pixi developer environment" pyproject.append_to_changelog(msg)