diff --git a/devspaces/context/setup.sh b/devspaces/context/setup.sh index 9523213d..cc702096 100755 --- a/devspaces/context/setup.sh +++ b/devspaces/context/setup.sh @@ -32,7 +32,7 @@ dnf install -y -q \ # python${PYV}-ruamel-yaml \ dnf -y -q clean all -"/usr/bin/python${PYV}" -m pip install --root-user-action=ignore "$(ls -1 ./*.whl)[server]" -r requirements.txt +"/usr/bin/python${PYV}" -m pip install --only-binary :all: --root-user-action=ignore "$(ls -1 ./*.whl)[server]" -r requirements.txt ansible-galaxy collection install -r requirements.yml diff --git a/pyproject.toml b/pyproject.toml index d02d0530..a00c7714 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -520,13 +520,16 @@ uv_sync_locked = false [tool.tox.env.devspaces] commands = [ - [ - "./tools/devspaces.sh", - { default = [], extend = true, replace = "posargs" } - ] + { extend = true, replace = "ref", of = [ + "tool", + "tox", + "env", + "pkg", + "commands" + ] }, + ["./tools/devspaces.sh"], ] commands_post = [["./tools/cleanup.sh"]] -commands_pre = [] dependency_groups = ["ee", "dev"] description = "Build devspaces container image for current architecture" extras = ["server"] @@ -589,14 +592,7 @@ uv_sync_locked = false [tool.tox.env.pkg] commands = [ ["rm", "-rf", "{tox_root}/dist/"], - [ - "python", - "-m", - "build", - "--outdir", - "{tox_root}/dist/", - "{tox_root}" - ], + ["uv", "build", "--out-dir={tox_root}/dist/", "{tox_root}"], ["sh", "-c", "python -m twine check --strict {tox_root}/dist/*"] ] commands_post = [] diff --git a/tools/devspaces.sh b/tools/devspaces.sh index edc64f2f..992024cd 100755 --- a/tools/devspaces.sh +++ b/tools/devspaces.sh @@ -4,11 +4,6 @@ set -euxo pipefail ADT_CONTAINER_ENGINE=${ADT_CONTAINER_ENGINE:-docker} IMAGE_NAME=ansible/ansible-workspace-env-reference:test -mkdir -p out dist -# Ensure that we packaged the code first -# shellcheck disable=SC2207 -rm -f dist/*.* -tox -e pkg # shellcheck disable=SC2207 WHEELS=($(find dist -name '*.whl' -maxdepth 1 -execdir echo '{}' ';')) if [ ${#WHEELS[@]} -ne 1 ]; then diff --git a/uv.lock b/uv.lock index eff5795b..193ff14e 100644 --- a/uv.lock +++ b/uv.lock @@ -2858,7 +2858,7 @@ wheels = [ [[package]] name = "tox" -version = "4.41.0" +version = "4.44.0" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "cachetools", marker = "sys_platform != 'win32'" }, @@ -2871,9 +2871,9 @@ dependencies = [ { name = "pyproject-api", marker = "sys_platform != 'win32'" }, { name = "virtualenv", marker = "sys_platform != 'win32'" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/8e/44/a0eaf15e38b0a85dfaa6ef4f1fe902f4681c4c8050e0e24d76cdd225f2c8/tox-4.41.0.tar.gz", hash = "sha256:58c82bd68d970abc0fd001ca413b10e7422cd83d13f25580f658afab61a85f86", size = 228941, upload-time = "2026-02-19T16:20:24.573Z" } +sdist = { url = "https://files.pythonhosted.org/packages/0b/73/dadb7954bdb3f67662322faaef9fe5ede418527d8cff0c57fa368c558f37/tox-4.44.0.tar.gz", hash = "sha256:0c911cbc448a2ac5dd7cbb6be2f9ffa26d0a10405982f9efea654803b23cec77", size = 243605, upload-time = "2026-02-20T21:29:15.879Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/1f/29/a8b5dd927130882bb848dfbc12d43c81f3415bc516d9d04563ccea26ef23/tox-4.41.0-py3-none-any.whl", hash = "sha256:9579cc7b2c4c0d465e70f91f7897a6d58d6509cdadf20f75ade3510c0b7ce96a", size = 188883, upload-time = "2026-02-19T16:20:22.323Z" }, + { url = "https://files.pythonhosted.org/packages/78/cc/6f3b1775effb0511df6136fd66b59000b1a7977e7d908725d8336649d0fa/tox-4.44.0-py3-none-any.whl", hash = "sha256:b850fb8d1803d132c3120a189b2ae7fe319a07a9cb4254d81ac9c94e3230bc0f", size = 197333, upload-time = "2026-02-20T21:29:14.007Z" }, ] [[package]]