Skip to content

Commit a829c6b

Browse files
TimotheusBachingerTimotheusBachinger
committed
Good bye pipenv, long live uv!
We had a good time, but now uv is here. Change-Id: I1c25bb1c8dde6a82181cf374e6acd28645592d44
1 parent c9f4af7 commit a829c6b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+94
-217
lines changed

‎BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ write_file(
140140

141141
create_venv(
142142
name = "create_venv",
143-
destination_folder = ".venv_uv",
143+
destination_folder = ".venv",
144144
requirements_txt = "@//:requirements_lock.txt",
145145
site_packages_extra_files = [":sitecustomize.py"],
146146
)

‎Makefile

+7-18
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,8 @@ DIST_ARCHIVE := check-mk-$(EDITION)-$(OMD_VERSION).tar.gz
1010
TAROPTS := --owner=root --group=root --exclude=.svn --exclude=*~ \
1111
--exclude=.gitignore --exclude=*.swp --exclude=.f12 \
1212
--exclude=__pycache__ --exclude=*.pyc
13-
PIPENV := scripts/run-pipenv
13+
UVENV := scripts/run-uvenv
1414

15-
LOCK_FD := 200
16-
LOCK_PATH := .venv.lock
1715
PY_PATH := .venv/bin/python
1816
ifneq ("$(wildcard $(PY_PATH))","")
1917
PY_VIRT_MAJ_MIN := $(shell "${PY_PATH}" -c "from sys import version_info as v; print(f'{v.major}.{v.minor}')")
@@ -29,7 +27,7 @@ CI ?= false
2927
format format-c test-format-c format-python format-shell \
3028
help install mrproper mrclean \
3129
packages setup setversion version openapi \
32-
Pipfile.lock protobuf-files frontend-vue .venv
30+
requirements_lock.txt protobuf-files frontend-vue .venv
3331

3432
help:
3533
@echo "setup --> Prepare system for development and building"
@@ -124,8 +122,8 @@ frontend-vue:
124122

125123
announcement:
126124
mkdir -p $(CHECK_MK_ANNOUNCE_FOLDER)
127-
PYTHONPATH=${PYTHONPATH}:$(REPO_PATH) $(PIPENV) run python -m cmk.utils.werks announce .werks $(VERSION) --format=md > $(CHECK_MK_ANNOUNCE_MD)
128-
PYTHONPATH=${PYTHONPATH}:$(REPO_PATH) $(PIPENV) run python -m cmk.utils.werks announce .werks $(VERSION) --format=txt > $(CHECK_MK_ANNOUNCE_TXT)
125+
PYTHONPATH=${PYTHONPATH}:$(REPO_PATH) $(UVENV) python -m cmk.utils.werks announce .werks $(VERSION) --format=md > $(CHECK_MK_ANNOUNCE_MD)
126+
PYTHONPATH=${PYTHONPATH}:$(REPO_PATH) $(UVENV) python -m cmk.utils.werks announce .werks $(VERSION) --format=txt > $(CHECK_MK_ANNOUNCE_TXT)
129127
tar -czf $(CHECK_MK_ANNOUNCE_TAR) -C $(CHECK_MK_ANNOUNCE_FOLDER) .
130128

131129
packages:
@@ -231,7 +229,7 @@ ifeq ($(ENTERPRISE),yes)
231229
endif
232230

233231
format-python:
234-
./scripts/run-pipenv run ruff check --select I --fix
232+
./scripts/run-uvenv ruff check --select I --fix
235233
./.venv/bin/ruff format
236234

237235

@@ -248,7 +246,7 @@ documentation:
248246
echo Nothing to do here remove this target
249247

250248
sw-documentation-docker:
251-
scripts/run-in-docker.sh scripts/run-pipenv run make -C doc/documentation html
249+
scripts/run-in-docker.sh scripts/run-uvenv make -C doc/documentation html
252250

253251
Pipfile.lock:
254252
@( \
@@ -266,15 +264,6 @@ Pipfile.lock:
266264
fi \
267265
) $(LOCK_FD)>$(LOCK_PATH)
268266

269-
270-
# .venv is PHONY because the dependencies are resolved now in the make_venv script
267+
# .venv is PHONY because the dependencies are resolved by bazel
271268
.venv: Pipfile.lock
272-
@( \
273-
flock $(LOCK_FD); \
274-
$(REPO_PATH)/scripts/make_venv \
275-
) $(LOCK_FD)>$(LOCK_PATH)
276-
277-
278-
# .venv_uv is PHONY because the dependencies are resolved by bazel
279-
.venv_uv: Pipfile.lock
280269
CC="gcc" $(REPO_PATH)/scripts/run-bazel.sh run //:create_venv

‎buildscripts/scripts/assert-release-build-artifacts.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ def main() {
3737
usernameVariable: 'NEXUS_USER')]) {
3838
withEnv(["PYTHONUNBUFFERED=1"]) {
3939
dir("${checkout_dir}") {
40-
sh(script: """scripts/run-pipenv run \
40+
sh(script: """scripts/run-uvenv \
4141
buildscripts/scripts/assert_build_artifacts.py \
4242
--editions_file "${checkout_dir}/editions.yml" \
4343
assert_build_artifacts \

‎buildscripts/scripts/build-cloud-images.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ def create_publish_stages(targets_names, version, publish) {
184184
// Used global env variable from jenkins:
185185
// AWS_MARKETPLACE_SCANNER_ARN and AWS_AMI_IMAGE_PRODUCT_ID
186186
sh("""
187-
scripts/run-pipenv run buildscripts/scripts/publish_cloud_images.py \
187+
scripts/run-uvenv buildscripts/scripts/publish_cloud_images.py \
188188
--cloud-type ${target} --new-version ${version} \
189189
--build-tag '${env.JOB_BASE_NAME}-${env.BUILD_NUMBER}' --image-name ${name} \
190190
--marketplace-scanner-arn '${AWS_MARKETPLACE_SCANNER_ARN}' \

‎buildscripts/scripts/build-cmk-container.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
- DOCKER_USERNAME=carl.lama
1313
- DOCKER_PASSPHRASE=eatingHands
1414
15-
scripts/run-pipenv run python \
15+
scripts/run-uvenv python \
1616
buildscripts/scripts/build-cmk-container.py \
1717
--branch=master \
1818
--edition=enterprise \
@@ -27,7 +27,7 @@
2727
- INTERNAL_DEPLOY_PORT=42
2828
- [email protected]:/path/
2929
30-
scripts/run-pipenv run python \
30+
scripts/run-uvenv python \
3131
buildscripts/scripts/build-cmk-container.py \
3232
--branch=2.2.0 \
3333
--edition=enterprise \

‎buildscripts/scripts/build-cmk-image.groovy

+3-3
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ def main() {
114114
/// to have an arbitrary location, so we have to provide
115115
/// `download` inside the checkout_dir
116116
sh("""
117-
scripts/run-pipenv run python \
117+
scripts/run-uvenv python \
118118
buildscripts/scripts/build-cmk-container.py \
119119
--branch=${branch_name} \
120120
--edition=${EDITION} \
@@ -170,7 +170,7 @@ def main() {
170170
smart_stage(name: "Load image", condition: !build_image) {
171171
withCredentials([file(credentialsId: 'Release_Key', variable: 'RELEASE_KEY')]) {
172172
sh("""
173-
scripts/run-pipenv run python \
173+
scripts/run-uvenv python \
174174
buildscripts/scripts/build-cmk-container.py \
175175
--branch=${branch_name} \
176176
--edition=${EDITION} \
@@ -185,7 +185,7 @@ def main() {
185185

186186
smart_stage(name: "Push images", condition: push_to_registry) {
187187
sh("""
188-
scripts/run-pipenv run python \
188+
scripts/run-uvenv python \
189189
buildscripts/scripts/build-cmk-container.py \
190190
--branch=${branch_name} \
191191
--edition=${EDITION} \

‎buildscripts/scripts/compile-all-werks.groovy

+4-4
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ def main() {
2929
dir("${checkout_dir}") {
3030
/* groovylint-disable LineLength */
3131
sh("""
32-
scripts/run-pipenv run echo build venv...
33-
scripts/run-pipenv run python3 -m cmk.utils.werks collect cmk ./ > cmk.json
34-
scripts/run-pipenv run python3 -m cmk.utils.werks collect cma ${WORKSPACE}/cma > cma.json
35-
scripts/run-pipenv run python3 -m cmk.utils.werks collect checkmk_kube_agent ${WORKSPACE}/checkmk_kube_agent > kube.json
32+
scripts/run-uvenv echo build venv...
33+
scripts/run-uvenv python3 -m cmk.utils.werks collect cmk ./ > cmk.json
34+
scripts/run-uvenv python3 -m cmk.utils.werks collect cma ${WORKSPACE}/cma > cma.json
35+
scripts/run-uvenv python3 -m cmk.utils.werks collect checkmk_kube_agent ${WORKSPACE}/checkmk_kube_agent > kube.json
3636
3737
# jq -s '.[0] * .[1] * .[2]' cma.json cmk.json kube.json > all_werks.json
3838
# no need to install jq!!!!!

‎buildscripts/scripts/send-werks-to-mailing-lists.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ def main() {
9292
sh("""
9393
git config --add user.name ${user};
9494
git config --add user.email ${JENKINS_MAIL};
95-
scripts/run-pipenv run python3 -m cmk.utils.werks mail \
95+
scripts/run-uvenv python3 -m cmk.utils.werks mail \
9696
. origin/${branch} werk_mail ${cmd_line};
9797
""");
9898
}

‎buildscripts/scripts/stages.yml

+8-8
Original file line numberDiff line numberDiff line change
@@ -281,22 +281,22 @@ STAGES:
281281
DIR: ""
282282
ENV_VARS:
283283
CHANGED_WERK_FILES: "${CHANGED_WERK_FILES}"
284-
COMMAND: "./scripts/run-in-docker.sh ./scripts/run-pipenv run python -m cmk.werks.validate &> ${RESULTS}/werk_validate.txt"
284+
COMMAND: "./scripts/run-in-docker.sh ./scripts/run-uvenv python -m cmk.werks.validate &> ${RESULTS}/werk_validate.txt"
285285
TEXT_ON_SKIP: "No Werk files changed"
286286
RESULT_CHECK_FILE_PATTERN: "results/werk_validate.txt"
287287

288288
- NAME: "Python Werks Commands"
289289
ONLY_WHEN_NOT_EMPTY: CHANGED_REFERENCE_IMAGE,CHANGED_WERK_CODE_FILES
290290
DIR: ""
291291
COMMAND: |
292-
scripts/run-in-docker.sh scripts/run-pipenv run python3 -m cmk.utils.werks collect cmk . --substitute-branches $(git symbolic-ref --short HEAD):HEAD &> ${RESULTS}/werk_commands.txt
293-
scripts/run-in-docker.sh scripts/run-pipenv run python3 -m cmk.utils.werks announce .werks $(make print-VERSION) --format md &>> ${RESULTS}/werk_commands.txt
294-
scripts/run-in-docker.sh scripts/run-pipenv run python3 -m cmk.utils.werks announce .werks $(make print-VERSION) --format txt &>> ${RESULTS}/werk_commands.txt
295-
scripts/run-in-docker.sh scripts/run-pipenv run python3 -m cmk.utils.werks precompile .werks precompiled.json &>> ${RESULTS}/werk_commands.txt
296-
scripts/run-in-docker.sh scripts/run-pipenv run python3 -m cmk.utils.werks changelog CHANGELOG precompiled.json &>> ${RESULTS}/werk_commands.txt
292+
scripts/run-in-docker.sh scripts/run-uvenv python3 -m cmk.utils.werks collect cmk . --substitute-branches $(git symbolic-ref --short HEAD):HEAD &> ${RESULTS}/werk_commands.txt
293+
scripts/run-in-docker.sh scripts/run-uvenv python3 -m cmk.utils.werks announce .werks $(make print-VERSION) --format md &>> ${RESULTS}/werk_commands.txt
294+
scripts/run-in-docker.sh scripts/run-uvenv python3 -m cmk.utils.werks announce .werks $(make print-VERSION) --format txt &>> ${RESULTS}/werk_commands.txt
295+
scripts/run-in-docker.sh scripts/run-uvenv python3 -m cmk.utils.werks precompile .werks precompiled.json &>> ${RESULTS}/werk_commands.txt
296+
scripts/run-in-docker.sh scripts/run-uvenv python3 -m cmk.utils.werks changelog CHANGELOG precompiled.json &>> ${RESULTS}/werk_commands.txt
297297
# we don't have access to the fixup notes in ci, we might have to fetch them, or temporarily disable this check:
298-
scripts/run-in-docker.sh scripts/run-pipenv run python3 -m cmk.utils.werks mail . HEAD werk_mail --assume-no-notes-but=$(git log --before="$(date --date="4 weeks ago" --iso=seconds)" --format="%H" --max-count=1) &>> ${RESULTS}/werk_commands.txt
299-
scripts/run-in-docker.sh scripts/run-pipenv run ./werk list &>> ${RESULTS}/werk_commands.txt
298+
scripts/run-in-docker.sh scripts/run-uvenv python3 -m cmk.utils.werks mail . HEAD werk_mail --assume-no-notes-but=$(git log --before="$(date --date="4 weeks ago" --iso=seconds)" --format="%H" --max-count=1) &>> ${RESULTS}/werk_commands.txt
299+
scripts/run-in-docker.sh scripts/run-uvenv ./werk list &>> ${RESULTS}/werk_commands.txt
300300
TEXT_ON_SKIP: "No Werk code files changed"
301301
RESULT_CHECK_FILE_PATTERN: "results/werk_commands.txt"
302302

‎buildscripts/scripts/test-gerrit.groovy

+1-16
Original file line numberDiff line numberDiff line change
@@ -42,21 +42,6 @@ def main() {
4242
sh("buildscripts/scripts/ensure-workspace-integrity");
4343
}
4444
sh("rm -rf ${result_dir}; mkdir ${result_dir}");
45-
46-
/// Reason for the following try/catch block:
47-
/// Jenkins will abort jobs (e.g. in case of a new patch set) with SIGKILL (at least this is what we think)
48-
/// in case a job is aborted during a rebuild of the .venv, the .venv will be left broken
49-
/// the next run in this workspace will use the .venv as-is but fail to import modules
50-
/// attempts to use a trap in the .venv Makefile-target were also not succesful - SIGKILL is not trap-able...
51-
/// So at the end, we need to use a groovy try/catch to ensure a rebuild in the next job in case something failed
52-
try {
53-
sh("""scripts/run-in-docker.sh \
54-
make .venv
55-
""");
56-
} catch (e) {
57-
sh("rm -rf .venv");
58-
throw e;
59-
}
6045
}
6146
time_stage_started = test_gerrit_helper.log_stage_duration(time_stage_started);
6247
}
@@ -66,7 +51,7 @@ def main() {
6651
stage("Create stages") {
6752
/// Generate list of stages to be added - save them locally for reference
6853
sh("""scripts/run-in-docker.sh \
69-
scripts/run-pipenv run \
54+
scripts/run-uvenv \
7055
buildscripts/scripts/validate_changes.py \
7156
--env "RESULTS=${result_dir}" \
7257
--env "WORKSPACE=${checkout_dir}" \

‎buildscripts/scripts/unpublish-container-image.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ def main() {
4343
withEnv(["PYTHONUNBUFFERED=1"]) {
4444
dir("${checkout_dir}") {
4545

46-
command = """scripts/run-pipenv run \
46+
command = """scripts/run-uvenv \
4747
buildscripts/scripts/unpublish-container-image.py \
4848
--editions_file editions.yml --edition ${EDITION} \
4949
${ACTION}

‎buildscripts/scripts/utils/docker_image_aliases_helper.groovy

-6
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ inside_container = {Map arg1=[:], Closure arg2 ->
8181
+ (mount_host_user_files ? ["-v /etc/passwd:/etc/passwd:ro -v /etc/group:/etc/group:ro"] : [])
8282
+ ((mount_reference_repo && reference_repo_dir) ? ["-v ${reference_repo_dir}:${reference_repo_dir}:ro"] : [])
8383
+ (create_cache_folder ? ["-v \"${container_shadow_workspace}/home_cache:${env.HOME}/.cache\""] : [])
84-
+ ["-v \"${container_shadow_workspace}/venv:${checkout_dir}/.venv\""]
8584
+ ["-v \"${container_shadow_workspace}/checkout_cache:${checkout_dir}/.cache\""]
8685
).join(" ");
8786
/// We have to make sure both, the source directory and (if applicable) the target
@@ -107,11 +106,6 @@ inside_container = {Map arg1=[:], Closure arg2 ->
107106
mkdir -p "${container_shadow_workspace}/home_cache"
108107
mkdir -p "${container_shadow_workspace}/home/.cache"
109108
110-
# create mount dirs for <checkout_dir>/.venv
111-
mkdir -p "${checkout_dir}/.venv"
112-
mkdir -p "${container_shadow_workspace}/venv"
113-
mkdir -p "${container_shadow_workspace}/home/\$(realpath -s --relative-to="${env.HOME}" "${checkout_dir}/.venv")"
114-
115109
# create mount dirs for <checkout_dir>/.cache
116110
mkdir -p "${checkout_dir}/.cache"
117111
mkdir -p "${container_shadow_workspace}/checkout_cache"

‎defines/README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -140,17 +140,17 @@ examples for newly added elements. In general
140140
* Consumers:
141141
- CI / Gerrit triggered Change Validation Pipeline
142142
- Local execution of same steps by invoking the `make-what-gerrit-makes`
143-
make target or by running
143+
make target or by running
144144
```sh
145-
scripts/run-pipenv run buildscripts/scripts/validate_changes.py \
145+
scripts/run-uvenv buildscripts/scripts/validate_changes.py \
146146
-e BASE_COMMIT_ID=origin/master \
147147
-e WORKSPACE="$(pwd)" \
148148
-e RESULTS="$(pwd)/results"
149149
```
150150
manually
151151

152152
* Future plans
153-
- File should also contain all other (non `test-gerrit`) tests and used in
153+
- File should also contain all other (non `test-gerrit`) tests and used in
154154
all other test pipelines
155155
- Test-Steps should be "container-agnostic" i.e. run all test steps natively
156156
enabling the CI using it's own way to run container

‎doc/documentation/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ include ../../defines.make
77
# You can set these variables from the command line, and also
88
# from the environment for the first two.
99
SPHINXOPTS ?= -W
10-
SPHINXBUILD ?= ../../scripts/run-pipenv run sphinx-build
10+
SPHINXBUILD ?= ../../scripts/run-uvenv sphinx-build
1111
SOURCEDIR = .
1212
BUILDDIR = _build
1313

‎doc/plugin-api/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ REPO_PATH := $(realpath $(dir $(realpath $(dir $(realpath $(dir $(lastword $(MAK
66

77
include $(REPO_PATH)/defines.make
88

9-
PIPENV := $(REPO_PATH)/scripts/run-pipenv
9+
UVENV := $(REPO_PATH)/scripts/run-uvenv
1010

1111

1212
# You can set these variables from the command line, and also
1313
# from the environment for the first one.
1414
SPHINXOPTS ?= --keep-going
15-
SPHINXBUILD := $(PIPENV) run sphinx-build
15+
SPHINXBUILD := $(UVENV) sphinx-build
1616
BASEDIR = $(REPO_PATH)/doc/plugin-api
1717
SOURCEDIR = $(BASEDIR)/source
1818
BUILDDIR = $(BASEDIR)/build

‎omd/packages/packages.make

+1
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ $(INTERMEDIATE_INSTALL_BAZEL):
5353
#openssl-install-intermediate target simultaneously enough to run into
5454
#string-replacements which have been done before. So we don't add `--strict`
5555
# for now
56+
# TODO: Remove pipenv also from the omd builds
5657
$(REPO_PATH)/omd/run-pipenv run cmk-dev binreplace \
5758
--regular-expression \
5859
--inplace \

‎packages/cmk-agent-receiver/run

+1-1
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ setup_venv() {
116116
# Further: uv seems to fall back to clang, see https://github.com/astral-sh/uv/issues/8036
117117
CC="gcc" ${BAZEL_CMD} run //:create_venv
118118
# shellcheck source=/dev/null
119-
source "$(bazel info workspace)"/.venv_uv/bin/activate
119+
source "$(bazel info workspace)"/.venv/bin/activate
120120
SETUP_VENV_RAN=yes
121121
}
122122

‎packages/cmk-ccc/run

+1-1
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ setup_venv() {
116116
# Further: uv seems to fall back to clang, see https://github.com/astral-sh/uv/issues/8036
117117
CC="gcc" ${BAZEL_CMD} run //:create_venv
118118
# shellcheck source=/dev/null
119-
source "$("$BAZEL_CMD" info workspace)"/.venv_uv/bin/activate
119+
source "$("$BAZEL_CMD" info workspace)"/.venv/bin/activate
120120
SETUP_VENV_RAN=yes
121121
}
122122

‎packages/cmk-crypto/run

+1-1
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ setup_venv() {
116116
# Further: uv seems to fall back to clang, see https://github.com/astral-sh/uv/issues/8036
117117
CC="gcc" ${BAZEL_CMD} run //:create_venv
118118
# shellcheck source=/dev/null
119-
source "$(bazel info workspace)"/.venv_uv/bin/activate
119+
source "$(bazel info workspace)"/.venv/bin/activate
120120
SETUP_VENV_RAN=yes
121121
}
122122

‎packages/cmk-events/run

+1-1
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ setup_venv() {
116116
# Further: uv seems to fall back to clang, see https://github.com/astral-sh/uv/issues/8036
117117
CC="gcc" ${BAZEL_CMD} run //:create_venv
118118
# shellcheck source=/dev/null
119-
source "$(bazel info workspace)"/.venv_uv/bin/activate
119+
source "$(bazel info workspace)"/.venv/bin/activate
120120
SETUP_VENV_RAN=yes
121121
}
122122

‎packages/cmk-graphing/run

+1-1
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ setup_venv() {
116116
# Further: uv seems to fall back to clang, see https://github.com/astral-sh/uv/issues/8036
117117
CC="gcc" ${BAZEL_CMD} run //:create_venv
118118
# shellcheck source=/dev/null
119-
source "$(bazel info workspace)"/.venv_uv/bin/activate
119+
source "$(bazel info workspace)"/.venv/bin/activate
120120
SETUP_VENV_RAN=yes
121121
}
122122

‎packages/cmk-livestatus-client/run

+1-1
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ setup_venv() {
116116
# Further: uv seems to fall back to clang, see https://github.com/astral-sh/uv/issues/8036
117117
CC="gcc" ${BAZEL_CMD} run //:create_venv
118118
# shellcheck source=/dev/null
119-
source "$(bazel info workspace)"/.venv_uv/bin/activate
119+
source "$(bazel info workspace)"/.venv/bin/activate
120120
SETUP_VENV_RAN=yes
121121
}
122122

‎packages/cmk-messaging/run

+1-1
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ setup_venv() {
116116
# Further: uv seems to fall back to clang, see https://github.com/astral-sh/uv/issues/8036
117117
CC="gcc" ${BAZEL_CMD} run //:create_venv
118118
# shellcheck source=/dev/null
119-
source "$(bazel info workspace)"/.venv_uv/bin/activate
119+
source "$(bazel info workspace)"/.venv/bin/activate
120120
SETUP_VENV_RAN=yes
121121
}
122122

‎packages/cmk-mkp-tool/run

+1-1
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ setup_venv() {
116116
# Further: uv seems to fall back to clang, see https://github.com/astral-sh/uv/issues/8036
117117
CC="gcc" ${BAZEL_CMD} run //:create_venv
118118
# shellcheck source=/dev/null
119-
source "$(bazel info workspace)"/.venv_uv/bin/activate
119+
source "$(bazel info workspace)"/.venv/bin/activate
120120
SETUP_VENV_RAN=yes
121121
}
122122

‎packages/cmk-rulesets/run

+1-1
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ setup_venv() {
116116
# Further: uv seems to fall back to clang, see https://github.com/astral-sh/uv/issues/8036
117117
CC="gcc" ${BAZEL_CMD} run //:create_venv
118118
# shellcheck source=/dev/null
119-
source "$(bazel info workspace)"/.venv_uv/bin/activate
119+
source "$(bazel info workspace)"/.venv/bin/activate
120120
SETUP_VENV_RAN=yes
121121
}
122122

‎packages/cmk-server-side-calls/run

+1-1
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ setup_venv() {
116116
# Further: uv seems to fall back to clang, see https://github.com/astral-sh/uv/issues/8036
117117
CC="gcc" ${BAZEL_CMD} run //:create_venv
118118
# shellcheck source=/dev/null
119-
source "$(bazel info workspace)"/.venv_uv/bin/activate
119+
source "$(bazel info workspace)"/.venv/bin/activate
120120
SETUP_VENV_RAN=yes
121121
}
122122

0 commit comments

Comments
 (0)