From 96f110aa04c6c7c41a4d597d39f0394ed22aabcb Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 26 Dec 2025 12:45:13 +0000 Subject: [PATCH 1/4] Initial plan From 54403983ee2ed53af5d3f7debc36833e087f74e6 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 26 Dec 2025 12:49:27 +0000 Subject: [PATCH 2/4] Remove redundant pyproject.toml existence checks from bump and release scripts Co-authored-by: tschm <2046079+tschm@users.noreply.github.com> --- .rhiza/scripts/bump.sh | 6 ------ .rhiza/scripts/release.sh | 6 ------ 2 files changed, 12 deletions(-) diff --git a/.rhiza/scripts/bump.sh b/.rhiza/scripts/bump.sh index a749c9c1..0259ef2b 100755 --- a/.rhiza/scripts/bump.sh +++ b/.rhiza/scripts/bump.sh @@ -23,12 +23,6 @@ TYPE="" DO_COMMIT="" COMMIT_MSG="" -# Check if pyproject.toml exists -if [ ! -f "pyproject.toml" ]; then - printf "%b[ERROR] pyproject.toml not found in current directory%b\n" "$RED" "$RESET" - exit 1 -fi - # Check if uv is available if [ ! -x "$UV_BIN" ]; then printf "%b[ERROR] uv not found at %s. Run 'make install-uv' first.%b\n" "$RED" "$UV_BIN" "$RESET" diff --git a/.rhiza/scripts/release.sh b/.rhiza/scripts/release.sh index 602f12b5..3ba28d6f 100755 --- a/.rhiza/scripts/release.sh +++ b/.rhiza/scripts/release.sh @@ -47,12 +47,6 @@ while [ $# -gt 0 ]; do esac done -# Check if pyproject.toml exists -if [ ! -f "pyproject.toml" ]; then - printf "%b[ERROR] pyproject.toml not found in current directory%b\n" "$RED" "$RESET" - exit 1 -fi - # Check if uv is available if [ ! -x "$UV_BIN" ]; then printf "%b[ERROR] uv not found at %s. Run 'make install-uv' first.%b\n" "$RED" "$UV_BIN" "$RESET" From 18f4217abbcd3c475c0294993e55d3020d33e8e7 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 26 Dec 2025 12:56:17 +0000 Subject: [PATCH 3/4] Remove redundant pyproject.toml existence checks from Makefile Co-authored-by: tschm <2046079+tschm@users.noreply.github.com> --- Makefile | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/Makefile b/Makefile index b4bea43d..289b0b4c 100644 --- a/Makefile +++ b/Makefile @@ -89,17 +89,13 @@ install: install-uv install-extras ## install ${UV_BIN} pip install -r tests/requirements.txt || { printf "${RED}[ERROR] Failed to install test requirements${RESET}\n"; exit 1; }; \ fi - # Install the dependencies from pyproject.toml (if it exists) - @if [ -f "pyproject.toml" ]; then \ - if [ -f "uv.lock" ]; then \ - printf "${BLUE}[INFO] Installing dependencies from lock file${RESET}\n"; \ - ${UV_BIN} sync --all-extras --frozen || { printf "${RED}[ERROR] Failed to install dependencies${RESET}\n"; exit 1; }; \ - else \ - printf "${YELLOW}[WARN] uv.lock not found. Generating lock file and installing dependencies...${RESET}\n"; \ - ${UV_BIN} sync --all-extras || { printf "${RED}[ERROR] Failed to install dependencies${RESET}\n"; exit 1; }; \ - fi; \ + # Install the dependencies from pyproject.toml + @if [ -f "uv.lock" ]; then \ + printf "${BLUE}[INFO] Installing dependencies from lock file${RESET}\n"; \ + ${UV_BIN} sync --all-extras --frozen || { printf "${RED}[ERROR] Failed to install dependencies${RESET}\n"; exit 1; }; \ else \ - printf "${YELLOW}[WARN] No pyproject.toml found, skipping install${RESET}\n"; \ + printf "${YELLOW}[WARN] uv.lock not found. Generating lock file and installing dependencies...${RESET}\n"; \ + ${UV_BIN} sync --all-extras || { printf "${RED}[ERROR] Failed to install dependencies${RESET}\n"; exit 1; }; \ fi sync: install-uv ## sync with template repository as defined in .github/template.yml @@ -129,12 +125,8 @@ marimo: install ## fire up Marimo server fi ##@ Quality and Formatting -deptry: install-uv ## run deptry if pyproject.toml exists - @if [ -f "pyproject.toml" ]; then \ - ${UVX_BIN} deptry "${SOURCE_FOLDER}"; \ - else \ - printf "${YELLOW} No pyproject.toml found, skipping deptry${RESET}\n"; \ - fi +deptry: install-uv ## run deptry + @${UVX_BIN} deptry "${SOURCE_FOLDER}" fmt: install-uv ## check the pre-commit hooks and the linting @${UVX_BIN} pre-commit run --all-files From 53720a2f1be4d076886dd9523b3ab7b012cc444e Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 26 Dec 2025 12:57:49 +0000 Subject: [PATCH 4/4] Add clarifying comment about pyproject.toml assumption in Makefile Co-authored-by: tschm <2046079+tschm@users.noreply.github.com> --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 289b0b4c..501ad85e 100644 --- a/Makefile +++ b/Makefile @@ -89,7 +89,8 @@ install: install-uv install-extras ## install ${UV_BIN} pip install -r tests/requirements.txt || { printf "${RED}[ERROR] Failed to install test requirements${RESET}\n"; exit 1; }; \ fi - # Install the dependencies from pyproject.toml + # Install dependencies from pyproject.toml + # Note: pyproject.toml is assumed to exist (validation would fail otherwise) @if [ -f "uv.lock" ]; then \ printf "${BLUE}[INFO] Installing dependencies from lock file${RESET}\n"; \ ${UV_BIN} sync --all-extras --frozen || { printf "${RED}[ERROR] Failed to install dependencies${RESET}\n"; exit 1; }; \