Ubuntu 24.04 updates. Move to poetry

bin/apply.sh

@@ -2,17 +2,18 @@
 
 base=$(dirname "$0")/..
 cd "$base" || exit 1
-VENV_DIR=${VENV_DIR:="$HOME"/Apps/virtualenvs/home_dir}
 
-if [ ! -f "$VENV_DIR"/bin/activate ] ;then
+if [ ! -f ~/.local/bin/poetry ] ;then
     ./bin/bootstrap.sh
 fi
-. "$VENV_DIR"/bin/activate
-
+poetry install
+VENV_DIR=$(poetry env info -p)
 (
   cd "$base"/collections \
-  && ansible-galaxy collection install -p "${VENV_DIR}/collections" -r requirements.yml \
-  && ansible-galaxy role install -p "${VENV_DIR}/roles" -r requirements.yml
+  && poetry run ansible-galaxy collection install \
+      -p "${VENV_DIR}/collections" -r requirements.yml \
+  && poetry run ansible-galaxy role install \
+      -p "${VENV_DIR}/roles" -r requirements.yml
 )
 
 [ -z "$CI" ] && ANSIBLE_EXTRA_ARGS=("--ask-become-pass")
@@ -22,7 +23,7 @@ ANSIBLE_CALLBACK_WHITELIST=unixy \
 ANSIBLE_STDOUT_CALLBACK=unixy \
 ANSIBLE_COLLECTIONS_PATH="$VENV_DIR"/collections \
 ANSIBLE_ROLES_PATH="$VENV_DIR"/roles:"$base"/roles \
-ansible-playbook \
+poetry run ansible-playbook \
   -e @personal.yml \
   -i inventories/local \
   "${ANSIBLE_EXTRA_ARGS[@]}" \

bin/bootstrap.sh

@@ -1,19 +1,14 @@
 #!/usr/bin/env bash
 set -x
-#BASE=$(dirname "$0")/..
 
-#sudo apt-get install -y --install-recommends python3-dev
+sudo apt-get install -y \
+  --install-recommends \
+  python3-full python3-dev \
+  pipx libffi-dev
 
 mkdir -p ~/.local/bin
 export PATH=$PATH:~/.local/bin
 
-if [ -f ~/.pip/pip.conf ] ;then
-    mv ~/.pip/pip.conf ~/.pip/pip.conv.orig
-fi
+pipx install poetry
 
-export WORKON_HOME=$HOME/Apps/virtualenvs
-mkdir -p "$WORKON_HOME"
-python3 -m venv "$WORKON_HOME"/home_dir
-. "$WORKON_HOME"/home_dir/bin/activate
-pip install --upgrade pip
-pip install -r requirements.txt
+poetry install

roles/backup/tasks/main.yml

@@ -12,7 +12,7 @@
   set_fact:
     cache_directories: "{{ cache_directories|default([]) + [item.stat.path] }}"
   loop: "{{ cache_dirs_stat.results }}"
-  when: item.stat.exists
+  when: item.stat.exists and item.stat.isdir
 
 - name: Mark cache directories with a tag file
   copy:

roles/dev-toolchain/tasks/ubuntu.yml

@@ -33,7 +33,6 @@
   apt:
     name:
       - build-essential
-      - python3-distutils
       - python3-jsonschema
       - python3-pip
       - python3-setuptools
@@ -50,6 +49,7 @@
       - retry
       - clang-format
       - pipx
+      - python3-argcomplete
     state: latest
 
 - name: Remove obsolete packages

roles/yubikey/tasks/ubuntu.yml

@@ -20,11 +20,12 @@
     follow: yes
     state: hard
     force: yes
+  failed_when: false
 
 - name: OpenSC lib link
   file:
     path: /usr/local/lib/opensc-pkcs11.so
     src: /usr/lib/x86_64-linux-gnu/opensc-pkcs11.so
     state: hard
     force: yes
-
+  failed_when: false