[chg] Switch to uv

Author: j-a-n

.gitlab-ci.yml

@@ -55,59 +55,61 @@ test:lint-and-test:
     - echo -e "${TXT_HEAD}Prepare docker containers${TXT_CLEAR}"
     - $DOCKER_COMPOSE up --detach --wait --wait-timeout 120
 
+    - $DOCKER_COMPOSE exec opsiserver43-dev ping -c1 opsiserver43-cs
+
     - echo -e "${TXT_HEAD}Run linters${TXT_CLEAR}"
-    - $DOCKER_COMPOSE exec opsiserver43-dev poetry run ruff check opsiconfd tests perftest
-    - $DOCKER_COMPOSE exec opsiserver43-dev poetry run mypy opsiconfd tests perftest
+    - $DOCKER_COMPOSE exec opsiserver43-dev uv run ruff check opsiconfd tests perftest
+    - $DOCKER_COMPOSE exec opsiserver43-dev uv run mypy opsiconfd tests perftest
 
     - echo -e "${TXT_HEAD}Run pytest${TXT_CLEAR}"
-    - $DOCKER_COMPOSE exec opsiserver43-dev poetry run pytest -x --tb=short -o junit_family=xunit2 --junitxml=testreport.xml --cov-append --cov opsiconfd --cov-report term --cov-report xml -v tests
+    - $DOCKER_COMPOSE exec opsiserver43-dev uv run pytest -x --tb=short -o junit_family=xunit2 --junitxml=testreport.xml --cov-append --cov opsiconfd --cov-report term --cov-report xml -v tests
 
     - echo -e "${TXT_HEAD}Run perftests${TXT_CLEAR}"
-    - $DOCKER_COMPOSE exec opsiserver43-dev poetry run opsiconfd -c tests/data/default-opsiconfd.conf --workers=1 --log-level-file=5 --log-file=opsiconfd-perftest.log --max-session-per-ip=20000 &
+    - $DOCKER_COMPOSE exec opsiserver43-dev uv run opsiconfd -c tests/data/default-opsiconfd.conf --workers=1 --log-level-file=5 --log-file=opsiconfd-perftest.log --max-session-per-ip=20000 &
     - sleep 10
 
     - echo -e "${TXT_HEAD}Run opsiconfd-perftest${TXT_CLEAR}"
     # Average request time has to be faster than 10 ms
     - |
-      $DOCKER_COMPOSE exec opsiserver43-dev poetry run ./perftest/opsiconfd-perftest.py -l perftest/tests/test_session_loading.json --max-errors 0 --max-avg-seconds-per-request 0.01 --bencher-results bencher-results.json || (
+      $DOCKER_COMPOSE exec opsiserver43-dev uv run ./perftest/opsiconfd-perftest.py -l perftest/tests/test_session_loading.json --max-errors 0 --max-avg-seconds-per-request 0.01 --bencher-results bencher-results.json || (
         echo -e "${TXT_ERROR}opsiconfd-perftest.py failed${TXT_CLEAR}"
         cat opsiconfd-perftest.log
         exit 1
       )
 
     - echo -e "${TXT_HEAD}Run opsiconfd-backend-perftest${TXT_CLEAR}"
     - |
-      $DOCKER_COMPOSE exec opsiserver43-dev poetry run ./perftest/opsiconfd-backend-perftest.py --products 100 --clients 100 --iterations 5 --max-real 30000 || (
+      $DOCKER_COMPOSE exec opsiserver43-dev uv run ./perftest/opsiconfd-backend-perftest.py --products 100 --clients 100 --iterations 5 --max-real 30000 || (
         echo -e "${TXT_ERROR}opsiconfd-backend-perftest.py failed${TXT_CLEAR}"
         cat opsiconfd-perftest.log
         exit 1
       )
 
     - echo -e "${TXT_HEAD}Run file-download memory test${TXT_CLEAR}"
     - |
-      $DOCKER_COMPOSE exec opsiserver43-dev poetry run python ./perftest/file-download.py --clients=5 --file-size=500 --min-download-time=20 --memory-usage-limit 20 || (
+      $DOCKER_COMPOSE exec opsiserver43-dev uv run python ./perftest/file-download.py --clients=5 --file-size=500 --min-download-time=20 --memory-usage-limit 20 || (
         echo -e "${TXT_ERROR}file-download.py failed${TXT_CLEAR}"
         cat opsiconfd-perftest.log
         exit 1
       )
     - |
-      $DOCKER_COMPOSE exec opsiserver43-dev poetry run python ./perftest/file-download.py --clients=10 --file-size=200 --min-download-time=20 --memory-usage-limit 20 --range-requests || (
+      $DOCKER_COMPOSE exec opsiserver43-dev uv run python ./perftest/file-download.py --clients=10 --file-size=200 --min-download-time=20 --memory-usage-limit 20 --range-requests || (
         echo -e "${TXT_ERROR}file-download.py failed (range-requests)${TXT_CLEAR}"
         cat opsiconfd-perftest.log
         exit 1
       )
 
     - echo -e "${TXT_HEAD}Run messagebus websocket load test${TXT_CLEAR}"
     - |
-      $DOCKER_COMPOSE exec opsiserver43-dev poetry run ./perftest/messagebus-clients.py --clients 1000 --event-interval 30 --start-gap 20 || (
+      $DOCKER_COMPOSE exec opsiserver43-dev uv run ./perftest/messagebus-clients.py --clients 1000 --event-interval 30 --start-gap 20 || (
         echo -e "${TXT_ERROR}messagebus-clients.py failed${TXT_CLEAR}"
         cat opsiconfd-perftest.log
         exit 1
       )
 
     - echo -e "${TXT_HEAD}Run opsiconfd get-config duration test${TXT_CLEAR}"
     - |
-      $DOCKER_COMPOSE exec opsiserver43-dev poetry run ./perftest/bencher-command.py -r bencher-results.json -m opsiconfd-get-config-duration -x 1.0 -i 6 poetry run opsiconfd get-config || (
+      $DOCKER_COMPOSE exec opsiserver43-dev uv run ./perftest/bencher-command.py -r bencher-results.json -m opsiconfd-get-config-duration -x 1.0 -i 6 uv run opsiconfd get-config || (
         echo -e "${TXT_ERROR}bencher-command.py failed${TXT_CLEAR}"
         exit 1
       )
@@ -130,11 +132,14 @@ build:linux-pyinstaller:
   tags:
     - linux-docker-x64-hetzner
   script:
+    - export UV_PYTHON_PREFERENCE="only-managed"
+    - export UV_PYTHON="3.13"
     - TRANSIFEX_MIN_REVIEW_RATE=0.0
     - '[ "$CI_COMMIT_TAG" = "" ] || TRANSIFEX_MIN_REVIEW_RATE=1.0'
     - opsi-dev-cli self upgrade
-    - poetry install
-    - poetry run opsi-dev-cli -l debug pyinstaller build
+    - rm -rf .venv
+    - uv sync --frozen
+    - uv run opsi-dev-cli -l debug pyinstaller build
     - mv opsiconfd opsiconfd.src
     - mv dist/opsiconfd ./opsiconfd-amd64
     # Check if binary is working
@@ -150,11 +155,14 @@ build:arm64-pyinstaller:
   tags:
     - linux-arm64
   script:
+    - export UV_PYTHON_PREFERENCE="only-managed"
+    - export UV_PYTHON="3.13"
     - TRANSIFEX_MIN_REVIEW_RATE=0.0
     - '[ "$CI_COMMIT_TAG" = "" ] || TRANSIFEX_MIN_REVIEW_RATE=1.0'
     - opsi-dev-cli self upgrade
-    - poetry install
-    - poetry run opsi-dev-cli -l debug pyinstaller build
+    - rm -rf .venv
+    - uv sync --frozen
+    - uv run opsi-dev-cli -l debug pyinstaller build
     - mv opsiconfd opsiconfd.src
     - mv dist/opsiconfd ./opsiconfd-arm64
     # Check if binary is working

.vscode/tasks.json

@@ -6,7 +6,7 @@
 		{
 			"label": "DB load sql file",
 			"type": "shell",
-			"command": "cat ${input:sql-file} | sed 's/${input:sql-old-hostname}/'$OPSI_HOSTNAME'/g'  | mariadb -h localhost -u $MYSQL_USER --password=$MYSQL_PASSWORD $MYSQL_DATABASE",
+			"command": "cat ${input:sql-file} | sed 's/${input:sql-old-hostname}/'$OPSI_HOSTNAME'/g' | mariadb -h localhost -u $MYSQL_USER --password=$MYSQL_PASSWORD $MYSQL_DATABASE",
 			"presentation": {
 				"reveal": "always",
 				"panel": "dedicated"
@@ -16,7 +16,7 @@
 		{
 			"label": "Redis clean",
 			"type": "shell",
-			"command": "poetry run python ${workspaceFolder}/scripts/clean-redis.py",
+			"command": "uv run ${workspaceFolder}/scripts/clean-redis.py",
 			"presentation": {
 				"reveal": "always",
 				"panel": "dedicated"
@@ -36,7 +36,7 @@
 		{
 			"label": "PyInstaller build",
 			"type": "shell",
-			"command": "sudo poetry run opsi-dev-cli -l debug pyinstaller build --skip-transifex",
+			"command": "sudo uv run opsi-dev-cli -l debug pyinstaller build --skip-transifex",
 			"presentation": {
 				"reveal": "always",
 				"panel": "dedicated"

README.md

@@ -28,7 +28,7 @@ Thus, long runinng JSON-RPC requests could block other requests.
 * You can use the default debug settings or you can set the number of worker and the log level by selecting opsiconfd in the debug/run tab.
 
 ## Run Tests
-* Select "Run Tests" on the Status Bar, use the Test Explorer or run `poetry run pytest --cov-append --cov opsiconfd --cov-report term --cov-report xml -vv tests` in a terminal
+* Select "Run Tests" on the Status Bar, use the Test Explorer or run `uv run pytest --cov-append --cov opsiconfd --cov-report term --cov-report xml -vv tests` in a terminal
 
 
 # Performance
@@ -42,7 +42,7 @@ Thus, long runinng JSON-RPC requests could block other requests.
 
 ### valgrind
 ```
-PYTHONMALLOC=malloc sudo -E valgrind --tool=memcheck --trace-children=yes --dsymutil=yes --leak-check=full --show-leak-kinds=all --log-file=/tmp/valgrind-out poetry run opsiconfd --workers=1 --log-level-stderr=5
+PYTHONMALLOC=malloc sudo -E valgrind --tool=memcheck --trace-children=yes --dsymutil=yes --leak-check=full --show-leak-kinds=all --log-file=/tmp/valgrind-out uv run opsiconfd --workers=1 --log-level-stderr=5
 ```
 * PYTHONMALLOC=debug
 * PYTHONMALLOC=malloc_debug

docker/opsiconfd-dev/Dockerfile

@@ -32,7 +32,8 @@ RUN apt-get update \
 	&& git clone https://github.com/zsh-users/zsh-autosuggestions /root/.oh-my-zsh/custom/plugins/zsh-autosuggestions \
 	&& git clone https://github.com/zsh-users/zsh-syntax-highlighting.git /root/.oh-my-zsh/custom/plugins/zsh-syntax-highlighting \
 	&& git clone --depth=1 https://github.com/romkatv/powerlevel10k.git /root/.oh-my-zsh/custom/themes/powerlevel10k \
-	&& usermod -s /bin/zsh root
+	&& usermod -s /bin/zsh root \
+	&& sed -i 's#secure_path=.*#secure_path=/root/.local/bin:/root/.cargo/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin#' /etc/sudoers
 
 COPY files/ /
 

docker/opsiconfd-dev/common.env

@@ -17,3 +17,6 @@ GF_INSTALL_PLUGINS=simpod-json-datasource
 GF_SERVER_ROOT_URL="%(protocol)s://%(domain)s:%(http_port)s/grafana"
 
 OPSI_ADMIN_PASSWORD=adminuser
+
+UV_PYTHON_PREFERENCE=only-managed
+UV_PYTHON=3.13

docker/opsiconfd-dev/docker-compose.yml

@@ -96,7 +96,7 @@ services:
     env_file:
       - .env
       - opsiserver43-cs.env
-    command: poetry run opsiconfd
+    command: uv run opsiconfd
 
   mysql-cs:
     image: mariadb:10.7

docker/opsiconfd-dev/files/entrypoint.sh

@@ -55,13 +55,13 @@ if [ -d $OPSICONFD_BASE_DIR ]; then
 	stat $state_file || true
 
 	if [ "$state" = "ready" ]; then
-		echo "* opsiconfd poetry venv is ready"
+		echo "* opsiconfd venv is ready"
 		echo "release state lock: $state_lock ($(date +"%Y-%m-%d %H:%M:%S.%N"))"
 		rmdir "$state_lock"
 	elif [ "$state" = "setup" ]; then
 		echo "release state lock: $state_lock ($(date +"%Y-%m-%d %H:%M:%S.%N"))"
 		rmdir "$state_lock"
-		echo "* Waiting until opsiconfd poetry venv is set up"
+		echo "* Waiting until opsiconfd venv is set up"
 		start_time=$(date +%s)
 		i=1
 		while [ "$i" -le 60 ]; do
@@ -78,20 +78,21 @@ if [ -d $OPSICONFD_BASE_DIR ]; then
 			echo "timed out waiting for venv after ${diff} seconds"
 		fi
 	else
-		echo "* Setup opsiconfd poetry venv"
+		echo "* Setup opsiconfd venv"
 		echo -n "setup" > $state_file
 		sleep 2
 		echo "release state lock: $state_lock ($(date +"%Y-%m-%d %H:%M:%S.%N"))"
 		rmdir "$state_lock"
 		cd $OPSICONFD_BASE_DIR
-		poetry lock --no-update
-		poetry install --no-interaction --no-ansi
+		uv sync --frozen
 		[ -n "$DEV_USER" ] && chown -R $DEV_USER $OPSICONFD_BASE_DIR
 		echo -n "ready" > $state_file
 		echo "venv created"
 	fi
 fi
 
 touch /run/.docker-healthy
+
 # Run CMD
+echo "Running: $@"
 exec "$@"

docker/opsiconfd-dev/files/root/.zsh_history

@@ -1,8 +1,8 @@
 : 1700000000:0;git commit -av
 : 1700000000:0;git push -o ci.skip
-: 1700000000:0;sudo -E poetry run pytest --tb=short -x -o junit_family=xunit2 --junitxml=testreport.xml --cov-append --cov opsiconfd --cov-report term --cov-report xml -v tests
-: 1700000000:0;sudo -E poetry run pytest --tb=short -x -vv -s tests/test_config.py -k test_cmdline
-: 1700000000:0;sudo -E poetry run pytest --tb=short -x -vv -s tests
-: 1700000000:0;sudo -E poetry run opsiconfd restore --no-hw-audit --server-id local opsiconfd-backup.msgpack.lz4
-: 1700000000:0;sudo -E poetry run opsiconfd --config-file tests/data/default-opsiconfd.conf --log-level-stderr=5 --max-session-per-ip=20000
-: 1700000000:0;sudo -E poetry run opsiconfd --zeroconf=false --workers=1 --log-level-stderr=5
+: 1700000000:0;sudo -E uv run pytest --tb=short -x -o junit_family=xunit2 --junitxml=testreport.xml --cov-append --cov opsiconfd --cov-report term --cov-report xml -v tests
+: 1700000000:0;sudo -E uv run pytest --tb=short -x -vv -s tests/test_config.py -k test_cmdline
+: 1700000000:0;sudo -E uv run pytest --tb=short -x -vv -s tests
+: 1700000000:0;sudo -E uv run opsiconfd restore --no-hw-audit --server-id local opsiconfd-backup.msgpack.lz4
+: 1700000000:0;sudo -E uv run opsiconfd --config-file tests/data/default-opsiconfd.conf --log-level-stderr=5 --max-session-per-ip=20000
+: 1700000000:0;sudo -E uv run opsiconfd --zeroconf=false --workers=1 --log-level-stderr=5

opsi-dev-tool.yml

@@ -11,9 +11,9 @@ git:
   hooks:
     pre-push: |
       echo "Running ruff..."
-      poetry run ruff check opsiconfd tests perftest
+      uv run ruff check opsiconfd tests perftest
       echo "Running mypy..."
-      poetry run mypy opsiconfd tests perftest
+      uv run mypy opsiconfd tests perftest
 
 transifex:
   upload_resources:
@@ -34,20 +34,17 @@ transifex:
 pyinstaller:
   one_file: no
   strip: yes
+  # TODO: opsi-dev-cli 1.30.0 supports collect_all
+  extra_args:
+    - --collect-all
+    - opsiconfd_data
   hidden_imports:
     all:
       - ipaddress
       - colorsys
-      # UserWarning: You do not have a working installation of the service_identity module: 'No module named 'service_identity''.
-      # Please install it from <https://pypi.python.org/pypi/service_identity> and make sure all of its dependencies are satisfied.
-      # Without the service_identity module, Twisted can perform only rudimentary TLS client hostname verification.
-      # Many valid certificate/hostname mappings may be rejected.
-      - service_identity
       - OPSI.Util.WIM
-      - opsiconfd.application.utils
-      - opsiconfd.rest
-      - opsiconfd.utils.fastapi
   collect_submodules:
+    - opsiconfd
     - pydantic_core
     - pydantic
     - uvicorn
@@ -58,12 +55,9 @@ pyinstaller:
     - websockets
     - wsproto
   scripts:
-    - script: opsiconfd/__main__.py
+    - script: run-opsiconfd
       binaries:
         - opsiconfd
-  data_files:
-    - src: opsiconfd_data/**/*
-      dst: opsiconfd_data
   dirname: opsiconfd
   after_script: |
     find dist/opsiconfd/_internal -iname "*.c" -delete

opsiconfd/__init__.py

@@ -11,7 +11,7 @@
 
 from __future__ import annotations
 
-__version__ = "4.3.26.0"
+__version__ = "4.3.29.16"
 
 
 from contextlib import contextmanager