Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion devspaces/context/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
22 changes: 9 additions & 13 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down Expand Up @@ -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 = []
Expand Down
5 changes: 0 additions & 5 deletions tools/devspaces.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions uv.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading