From 88914a1355dc57e1150211ca816ae6163757c7bf Mon Sep 17 00:00:00 2001 From: Benedikt Seidl Date: Tue, 26 Mar 2024 10:49:00 +0100 Subject: [PATCH] Fixing .f12 scripts for python packages There were two problems: 1. The `*` glob pattern was not functioning because of the quotes 2. The `--target` option does not work in combination with namespace packages: https://github.com/pypa/pip/issues/10110 Both problems would have been caught in the first place if this has been thoroughly tested. Sorry. Change-Id: I2e0829cb9fbe160289e7340d79087a62563121a1 --- packages/cmk-agent-based/.f12 | 6 +++++- packages/cmk-agent-receiver/.f12 | 6 +++++- packages/cmk-graphing/.f12 | 6 +++++- packages/cmk-livestatus-client/.f12 | 6 +++++- packages/cmk-mkp-tool/.f12 | 6 +++++- packages/cmk-rulesets/.f12 | 6 +++++- packages/cmk-server-side-calls/.f12 | 6 +++++- packages/cmk-werks/.f12 | 6 +++++- 8 files changed, 40 insertions(+), 8 deletions(-) diff --git a/packages/cmk-agent-based/.f12 b/packages/cmk-agent-based/.f12 index 2e41f463f0f..3bf522d1c71 100755 --- a/packages/cmk-agent-based/.f12 +++ b/packages/cmk-agent-based/.f12 @@ -13,10 +13,14 @@ pipenv run pip wheel --no-deps --wheel-dir build . +# pip installs the package in the user directory in case of missing permissions +# this might be surprising and hard to spot, so we force the global installation. +# hint: use `omd-setup-version-for-dev` to fix permissions of the checkmk site +export PYTHONNOUSERSITE=1 + "/omd/sites/${SITE}/bin/python3" -m pip install \ --no-deps \ --upgrade \ --force-reinstall \ --isolated \ - --target "/omd/sites/${SITE}/lib/python3.*/site-packages/" \ ./build/*-*-py3-none-any.whl diff --git a/packages/cmk-agent-receiver/.f12 b/packages/cmk-agent-receiver/.f12 index 4c1fd9d317c..3457bf60949 100755 --- a/packages/cmk-agent-receiver/.f12 +++ b/packages/cmk-agent-receiver/.f12 @@ -13,12 +13,16 @@ pipenv run pip wheel --no-deps --wheel-dir build . +# pip installs the package in the user directory in case of missing permissions +# this might be surprising and hard to spot, so we force the global installation +# hint: use `omd-setup-version-for-dev` to fix permissions of the checkmk site. +export PYTHONNOUSERSITE=1 + "/omd/sites/${SITE}/bin/python3" -m pip install \ --no-deps \ --upgrade \ --force-reinstall \ --isolated \ - --target "/omd/sites/${SITE}/lib/python3.*/site-packages/" \ ./build/*-*-py3-none-any.whl if [ -z "$ONLY_COPY" ]; then diff --git a/packages/cmk-graphing/.f12 b/packages/cmk-graphing/.f12 index f67e57c7467..05a027b418e 100755 --- a/packages/cmk-graphing/.f12 +++ b/packages/cmk-graphing/.f12 @@ -13,12 +13,16 @@ pipenv run pip wheel --no-deps --wheel-dir build . +# pip installs the package in the user directory in case of missing permissions +# this might be surprising and hard to spot, so we force the global installation +# hint: use `omd-setup-version-for-dev` to fix permissions of the checkmk site. +export PYTHONNOUSERSITE=1 + "/omd/sites/${SITE}/bin/python3" -m pip install \ --no-deps \ --upgrade \ --force-reinstall \ --isolated \ - --target "/omd/sites/${SITE}/lib/python3.*/site-packages/" \ ./build/*-*-py3-none-any.whl if [ -z "$ONLY_COPY" ]; then diff --git a/packages/cmk-livestatus-client/.f12 b/packages/cmk-livestatus-client/.f12 index f67e57c7467..05a027b418e 100755 --- a/packages/cmk-livestatus-client/.f12 +++ b/packages/cmk-livestatus-client/.f12 @@ -13,12 +13,16 @@ pipenv run pip wheel --no-deps --wheel-dir build . +# pip installs the package in the user directory in case of missing permissions +# this might be surprising and hard to spot, so we force the global installation +# hint: use `omd-setup-version-for-dev` to fix permissions of the checkmk site. +export PYTHONNOUSERSITE=1 + "/omd/sites/${SITE}/bin/python3" -m pip install \ --no-deps \ --upgrade \ --force-reinstall \ --isolated \ - --target "/omd/sites/${SITE}/lib/python3.*/site-packages/" \ ./build/*-*-py3-none-any.whl if [ -z "$ONLY_COPY" ]; then diff --git a/packages/cmk-mkp-tool/.f12 b/packages/cmk-mkp-tool/.f12 index f67e57c7467..05a027b418e 100755 --- a/packages/cmk-mkp-tool/.f12 +++ b/packages/cmk-mkp-tool/.f12 @@ -13,12 +13,16 @@ pipenv run pip wheel --no-deps --wheel-dir build . +# pip installs the package in the user directory in case of missing permissions +# this might be surprising and hard to spot, so we force the global installation +# hint: use `omd-setup-version-for-dev` to fix permissions of the checkmk site. +export PYTHONNOUSERSITE=1 + "/omd/sites/${SITE}/bin/python3" -m pip install \ --no-deps \ --upgrade \ --force-reinstall \ --isolated \ - --target "/omd/sites/${SITE}/lib/python3.*/site-packages/" \ ./build/*-*-py3-none-any.whl if [ -z "$ONLY_COPY" ]; then diff --git a/packages/cmk-rulesets/.f12 b/packages/cmk-rulesets/.f12 index f67e57c7467..05a027b418e 100755 --- a/packages/cmk-rulesets/.f12 +++ b/packages/cmk-rulesets/.f12 @@ -13,12 +13,16 @@ pipenv run pip wheel --no-deps --wheel-dir build . +# pip installs the package in the user directory in case of missing permissions +# this might be surprising and hard to spot, so we force the global installation +# hint: use `omd-setup-version-for-dev` to fix permissions of the checkmk site. +export PYTHONNOUSERSITE=1 + "/omd/sites/${SITE}/bin/python3" -m pip install \ --no-deps \ --upgrade \ --force-reinstall \ --isolated \ - --target "/omd/sites/${SITE}/lib/python3.*/site-packages/" \ ./build/*-*-py3-none-any.whl if [ -z "$ONLY_COPY" ]; then diff --git a/packages/cmk-server-side-calls/.f12 b/packages/cmk-server-side-calls/.f12 index f67e57c7467..05a027b418e 100755 --- a/packages/cmk-server-side-calls/.f12 +++ b/packages/cmk-server-side-calls/.f12 @@ -13,12 +13,16 @@ pipenv run pip wheel --no-deps --wheel-dir build . +# pip installs the package in the user directory in case of missing permissions +# this might be surprising and hard to spot, so we force the global installation +# hint: use `omd-setup-version-for-dev` to fix permissions of the checkmk site. +export PYTHONNOUSERSITE=1 + "/omd/sites/${SITE}/bin/python3" -m pip install \ --no-deps \ --upgrade \ --force-reinstall \ --isolated \ - --target "/omd/sites/${SITE}/lib/python3.*/site-packages/" \ ./build/*-*-py3-none-any.whl if [ -z "$ONLY_COPY" ]; then diff --git a/packages/cmk-werks/.f12 b/packages/cmk-werks/.f12 index f67e57c7467..05a027b418e 100755 --- a/packages/cmk-werks/.f12 +++ b/packages/cmk-werks/.f12 @@ -13,12 +13,16 @@ pipenv run pip wheel --no-deps --wheel-dir build . +# pip installs the package in the user directory in case of missing permissions +# this might be surprising and hard to spot, so we force the global installation +# hint: use `omd-setup-version-for-dev` to fix permissions of the checkmk site. +export PYTHONNOUSERSITE=1 + "/omd/sites/${SITE}/bin/python3" -m pip install \ --no-deps \ --upgrade \ --force-reinstall \ --isolated \ - --target "/omd/sites/${SITE}/lib/python3.*/site-packages/" \ ./build/*-*-py3-none-any.whl if [ -z "$ONLY_COPY" ]; then