fix(chezmoiscripts): install wheel in run_once_after_23-install-pytho…

…n-tools

refactor(chezmoiscripts): remove redundant wheel installation in run_once_after_25-install-optionals
chore(packages): add wheel and upgrade pip

chezmoi/.chezmoidata.yaml

@@ -233,6 +233,8 @@ packages:
     snap: true
   - name: webi
     snap: true
+  - name: wheel
+    pip-user: true
   - name: wslu
     apt: true
   - name: zip

chezmoi/.chezmoiscripts/run_once_after_23-install-python-tools.tmpl

@@ -9,6 +9,7 @@ ensure_path_entry "${HOME}/.local/bin"
 log_task "Upgrading pip and setuptools"
 c /usr/bin/pip3 install --upgrade pip
 c /usr/bin/pip3 install --upgrade setuptools
+c /usr/bin/pip3 install --upgrade wheel
 
 # install pipx
 if ! pipx --version &>/dev/null; then

chezmoi/.chezmoiscripts/run_once_after_25-install-optionals.tmpl

@@ -45,12 +45,6 @@ if ! command -v dotdrop >/dev/null; then
     c pipx install dotdrop
   else
     log_task "Install dotdrop with pip3"
-    if pip3 list | grep -q wheel; then
-      log_task "wheel already installed"
-    else
-      log_task "Installing wheel"
-      c /usr/bin/pip3 install wheel
-    fi
     # Add ~/.local/bin to PATH in order to use dotdrop before finishing the installation
     c /usr/bin/pip3 install dotdrop --user
   fi