Skip to content

Commit 35ac1e9

Browse files
committed
also check the default pypi-dependencies
1 parent 0d5add7 commit 35ac1e9

File tree

1 file changed

+15
-6
lines changed
  • minimum_versions/environments

1 file changed

+15
-6
lines changed

minimum_versions/environments/pixi.py

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -86,14 +86,19 @@ def parse_pixi_environment(name: str, manifest_path: pathlib.Path | None):
8686
raise ValueError(f"Unknown environment: {name}")
8787

8888
if isinstance(env, list):
89-
feature_names = env
89+
feature_names = ["default"] + env
9090
elif isinstance(env, dict) and list(env) != ["features"]:
9191
raise ValueError("Options other than 'features' are not supported.")
9292
else:
93-
feature_names = env["features"]
93+
feature_names = ["default"] + env["features"]
9494

95-
features = [pixi_config.get("dependencies", [])] + [
96-
get_in([feature, "dependencies"], all_features) for feature in feature_names
95+
features = [
96+
(
97+
get_in([feature, "dependencies"], all_features)
98+
if feature != "default"
99+
else pixi_config.get("dependencies", [])
100+
)
101+
for feature in feature_names
97102
]
98103

99104
pins = merge(features)
@@ -102,8 +107,12 @@ def parse_pixi_environment(name: str, manifest_path: pathlib.Path | None):
102107
warnings = []
103108

104109
pypi_dependencies = {
105-
feature: get_in([feature, "pypi-dependencies"], all_features, default=[])
106-
for feature in env["features"]
110+
feature: (
111+
get_in([feature, "pypi-dependencies"], all_features)
112+
if feature != "default"
113+
else pixi_config.get("pypi-dependencies", [])
114+
)
115+
for feature in feature_names
107116
}
108117
with_pypi_dependencies = {
109118
feature: bool(deps) for feature, deps in pypi_dependencies.items() if deps

0 commit comments

Comments
 (0)