Skip to content

Fix tools->tool in pyproject parsing #94

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
martindurant wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix tools->tool in pyproject parsing #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/projspec/proj/pixi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,15 +60,15 @@ class Pixi(ProjectSpec):
# https://pixi.sh/dev/reference/pixi_manifest/

def match(self) -> bool:
meta = self.proj.pyproject.get("tools", {}).get("pixi", {})
meta = self.proj.pyproject.get("tool", {}).get("pixi", {})
return bool(meta) or "pixi.toml" in self.proj.basenames

def parse(self) -> None:
from projspec.artifact.installable import CondaPackage
from projspec.artifact.python_env import CondaEnv, LockFile
from projspec.content.environment import Environment, Precision, Stack

meta = self.proj.pyproject.get("tools", {}).get("pixi", {})
meta = self.proj.pyproject.get("tool", {}).get("pixi", {})
if "pixi.toml" in self.proj.basenames:
try:
with self.proj.fs.open(self.proj.basenames["pixi.toml"], "rb") as f:
Expand Down
6 changes: 3 additions & 3 deletions src/projspec/proj/uv.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ def parse(self):
stack=Stack.PIP,
precision=Precision.SPEC,
packages=packages,
channels=deep_get(meta, "tools.uv.index", default=[]),
channels=deep_get(meta, "tool.uv.index", default=[]),
)
found = True
except (KeyError, ValueError):
Expand Down Expand Up @@ -160,7 +160,7 @@ def match(self):
self.proj.basenames
):
return True
if "uv" in self.proj.pyproject.get("tools", {}):
if "uv" in self.proj.pyproject.get("tool", {}):
# even if it is present, uv can be explicitly directed to ignore the
# project https://docs.astral.sh/uv/reference/settings/#managed
return self.proj.pyproject["tool"]["uv"].get("managed", True)
Expand All @@ -183,7 +183,7 @@ def parse(self):

super().parse()
meta = self.proj.pyproject
conf = meta.get("tools", {}).get("uv", {})
conf = meta.get("tool", {}).get("uv", {})
try:
with self.get_file("uv.toml") as f:
conf2 = toml.load(f, decoder=PickleableTomlDecoder())
Expand Down
Loading