You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tooling.apache.org by sb...@apache.org on 2025/03/12 12:10:19 UTC
(tooling-trusted-release) branch main updated: Remove uv support
This is an automated email from the ASF dual-hosted git repository.
sbp pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tooling-trusted-release.git
The following commit(s) were added to refs/heads/main by this push:
new f4da399 Remove uv support
f4da399 is described below
commit f4da39941ef237c2137f88a1e4e553392bbbfac1
Author: Sean B. Palmer <se...@miscoranda.com>
AuthorDate: Wed Mar 12 14:10:03 2025 +0200
Remove uv support
---
.venv | 0
Makefile | 3 +--
poetry.toml | 3 +--
scripts/both/add | 4 ----
scripts/both/add-dev | 4 ----
scripts/both/build | 4 ----
scripts/both/compare-dev | 7 -------
scripts/both/sync | 8 --------
scripts/both/sync-dev | 8 --------
scripts/both/up | 7 -------
scripts/uv/add | 2 --
scripts/uv/add-dev | 2 --
scripts/uv/build | 5 -----
scripts/uv/run | 2 --
scripts/uv/sync | 6 ------
scripts/uv/sync-dev | 6 ------
scripts/uv/up | 3 ---
17 files changed, 2 insertions(+), 72 deletions(-)
diff --git a/.venv b/.venv
deleted file mode 100644
index e69de29..0000000
diff --git a/Makefile b/Makefile
index 35db32c..450f68f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,8 @@
.PHONY: build build-alpine-ubuntu certs check docs report run serve sync sync-dev
BIND ?= 127.0.0.1:8080
-MANAGER ?= poetry
PYTHON ?= $(which python3)
-SCRIPTS ?= scripts/$(MANAGER)
+SCRIPTS ?= scripts/poetry
build:
scripts/build
diff --git a/poetry.toml b/poetry.toml
index 7a754e5..ab1033b 100644
--- a/poetry.toml
+++ b/poetry.toml
@@ -1,3 +1,2 @@
[virtualenvs]
-in-project = false
-path = ".venv-poetry"
+in-project = true
diff --git a/scripts/both/add b/scripts/both/add
deleted file mode 100755
index 8f24a1c..0000000
--- a/scripts/both/add
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-set -eu
-scripts/poetry/add "$1"
-scripts/uv/add "$1"
diff --git a/scripts/both/add-dev b/scripts/both/add-dev
deleted file mode 100755
index 945da78..0000000
--- a/scripts/both/add-dev
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-set -eu
-scripts/poetry/add-dev "$1"
-scripts/uv/add-dev "$1"
diff --git a/scripts/both/build b/scripts/both/build
deleted file mode 100755
index c7e41b9..0000000
--- a/scripts/both/build
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-set -eu
-scripts/poetry/build
-scripts/uv/build
diff --git a/scripts/both/compare-dev b/scripts/both/compare-dev
deleted file mode 100755
index cdbf9a7..0000000
--- a/scripts/both/compare-dev
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-set -eu
-# pip3 freeze --path "$(poetry env info --path)/lib/python3.13/site-packages" > state/requirements-poetry.txt
-pip3 freeze --path "$(scripts/poetry/run python3 -c 'import site; print(site.getsitepackages()[0])')" > state/requirements-poetry.txt
-pip3 freeze --path "$(scripts/uv/run python3 -c 'import site; print(site.getsitepackages()[0])')" > state/requirements-uv.txt
-diff state/requirements-poetry.txt state/requirements-uv.txt | bat -p --paging=never
-rm state/requirements-poetry.txt state/requirements-uv.txt
diff --git a/scripts/both/sync b/scripts/both/sync
deleted file mode 100755
index a442bfe..0000000
--- a/scripts/both/sync
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-set -eu
-_python="$(which python3)"
-echo poetry
-scripts/poetry/sync "${1:-$_python}"
-echo uv
-scripts/uv/sync "${1:-$_python}"
-# scripts/both/compare
diff --git a/scripts/both/sync-dev b/scripts/both/sync-dev
deleted file mode 100755
index 0f015ca..0000000
--- a/scripts/both/sync-dev
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-set -eu
-_python="$(which python3)"
-echo poetry
-scripts/poetry/sync-dev "${1:-$_python}"
-echo uv
-scripts/uv/sync-dev "${1:-$_python}"
-scripts/both/compare-dev
diff --git a/scripts/both/up b/scripts/both/up
deleted file mode 100755
index 018e6a4..0000000
--- a/scripts/both/up
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-set -eu
-echo poetry
-scripts/poetry/up
-echo uv
-scripts/uv/up
-scripts/both/compare-dev
diff --git a/scripts/uv/add b/scripts/uv/add
deleted file mode 100755
index 0fb0d90..0000000
--- a/scripts/uv/add
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-UV_PROJECT_ENVIRONMENT=.venv-uv exec uv add "$1"
diff --git a/scripts/uv/add-dev b/scripts/uv/add-dev
deleted file mode 100755
index 6774198..0000000
--- a/scripts/uv/add-dev
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-UV_PROJECT_ENVIRONMENT=.venv-uv exec uv add --dev "$1"
diff --git a/scripts/uv/build b/scripts/uv/build
deleted file mode 100755
index 07f703a..0000000
--- a/scripts/uv/build
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-# Just to check that the containers build successfully
-set -eu
-docker build -t tooling-trusted-release --build-arg SCRIPTS=scripts/uv -f Dockerfile.alpine .
-docker build -t tooling-trusted-release --build-arg SCRIPTS=scripts/uv -f Dockerfile.ubuntu .
diff --git a/scripts/uv/run b/scripts/uv/run
deleted file mode 100755
index b6c8312..0000000
--- a/scripts/uv/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-UV_PROJECT_ENVIRONMENT=.venv-uv exec uv run "$@"
diff --git a/scripts/uv/sync b/scripts/uv/sync
deleted file mode 100755
index 3d6d6f4..0000000
--- a/scripts/uv/sync
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-set -eu
-unset VIRTUAL_ENV
-_python="$(which python3)"
-UV_PROJECT_ENVIRONMENT=.venv-uv uv sync --python "${1:-$_python}" --no-group dev
-UV_PROJECT_ENVIRONMENT=.venv-uv uv sync --python "${1:-$_python}" --no-group dev --reinstall-package asfquart
diff --git a/scripts/uv/sync-dev b/scripts/uv/sync-dev
deleted file mode 100755
index 9f681f9..0000000
--- a/scripts/uv/sync-dev
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-set -eu
-unset VIRTUAL_ENV
-_python="$(which python3)"
-UV_PROJECT_ENVIRONMENT=.venv-uv uv sync --python "${1:-$_python}"
-UV_PROJECT_ENVIRONMENT=.venv-uv uv sync --python "${1:-$_python}" --reinstall-package asfquart
diff --git a/scripts/uv/up b/scripts/uv/up
deleted file mode 100755
index f59f201..0000000
--- a/scripts/uv/up
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-_python="$(which python3)"
-UV_PROJECT_ENVIRONMENT=.venv-uv exec uv lock --python "${1:-$_python}" --upgrade
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@tooling.apache.org
For additional commands, e-mail: commits-help@tooling.apache.org