Merge branch 'release/0.3.5'

NEWS.rst

@@ -2,6 +2,25 @@
 News
 ====
 
+0.3.5
+=====
+
+Changed
+-------
+
+- Stop passing --resolver=backtracking
+  -- It's been pip-tools' default for while already,
+  and it's irrelevant to uv
+- Update container build scripts:
+    - use newer base images
+    - install uv and rich-cli
+    - don't bother installing highlight and corresponding alias
+
+Fixed
+-----
+
+- Fix pipz animation link in readme
+
 0.3.4
 =====
 

README.rst

@@ -107,7 +107,7 @@ Basic usage of ``envin`` and ``pipacs``:
 
 Basic usage of ``pipz``:
 
-.. image:: https://gist.github.com/AndydeCleyre/de117a9aec8360413b8547e1a5ab3484/raw/c58e242b36b6ca721ffae89463554e09b79f7a9c/pipz.svg?sanitize=true
+.. image:: https://gist.githubusercontent.com/AndydeCleyre/de117a9aec8360413b8547e1a5ab3484/raw/c58e242b36b6ca721ffae89463554e09b79f7a9c/pipz.svg?sanitize=true
    :alt: Animated pipz demo
    :width: 100%
 
@@ -153,8 +153,8 @@ Try it in isolation with docker or podman with one of these commands:
 
 .. code:: console
 
-  $ docker run --net=host -it --rm quay.io/andykluger/zpy-ubuntu:master
-  $ podman run --net=host -it --rm quay.io/andykluger/zpy-ubuntu:master
+  $ docker run --net=host -it --rm -e TERM=$TERM quay.io/andykluger/zpy-ubuntu:master
+  $ podman run --net=host -it --rm -e TERM=$TERM quay.io/andykluger/zpy-ubuntu:master
 
 Replace "ubuntu" with "alpine" or "fedora" if you prefer.
 

doc/mkdocs/requirements.txt

@@ -10,18 +10,18 @@ markdown==3.6             # via mkdocs, mkdocs-material, pymdown-extensions
 markupsafe==2.1.5         # via jinja2, mkdocs
 mergedeep==1.3.4          # via mkdocs
 mkdocs==1.5.3             # via -r requirements.in, mkdocs-material
-mkdocs-material==9.5.17   # via -r requirements.in
+mkdocs-material==9.5.18   # via -r requirements.in
 mkdocs-material-extensions==1.3.1  # via mkdocs-material
 packaging==24.0           # via mkdocs
 paginate==0.5.6           # via mkdocs-material
 pathspec==0.12.1          # via mkdocs
 platformdirs==4.2.0       # via mkdocs
 pygments==2.17.2          # via mkdocs-material
-pymdown-extensions==10.7.1  # via mkdocs-material
+pymdown-extensions==10.8  # via mkdocs-material
 python-dateutil==2.9.0.post0  # via ghp-import
 pyyaml==6.0.1             # via mkdocs, pymdown-extensions, pyyaml-env-tag
 pyyaml-env-tag==0.1       # via mkdocs
-regex==2023.12.25         # via mkdocs-material
+regex==2024.4.16          # via mkdocs-material
 requests==2.31.0          # via mkdocs-material
 six==1.16.0               # via python-dateutil
 urllib3==2.2.1            # via requests

doc/src/new_proj/pipacs.md

@@ -59,7 +59,7 @@ pipacs [-c <category>] [-h] <pkgspec>... [-- <pip-compile-arg>...]
     When a zpy function internally calls `pip-compile` or `uv pip compile`,
     it provides these flags by default:
     ```shell
-    --no-header --annotation-style=line --strip-extras --allow-unsafe --resolver=backtracking
+    --no-header --annotation-style=line --strip-extras --allow-unsafe
     ```
     You can *add* `pip-compile` flags in a particular instance using the double dash syntax, like:
     ```console

mk/ctnr/zcomet.sh

@@ -10,7 +10,7 @@ user=dev
 ctnr_run () {  # [-u] <cmd> [<cmd-arg>...]
   _u=root
   if [ "$1" = -u ]; then _u=$user; shift; fi
-  buildah run --user $_u "$ctnr" "$@"
+  buildah run --net=host --user $_u "$ctnr" "$@"
 }
 
 ctnr_append () {  # [-u] <dest-path>
@@ -23,7 +23,7 @@ pkgs=zsh  # ca-certificates git less sudo wget
 fat="/home/${user}/.zcomet/repos/*/*/.git"
 case $distro in
   fedora)
-    basetag=${2:-36}
+    basetag=${2:-39}
     pkgs="$pkgs git-core"
     fat="$fat /var/cache/* /var/log/* /usr/lib*/python3.*/__pycache__"
     alias ctnr_pkg="ctnr_run dnf -yq --setopt=install_weak_deps=False"
@@ -32,7 +32,7 @@ case $distro in
     alias ctnr_mkuser="ctnr_run useradd -m -s /bin/zsh"
   ;;
   alpine)
-    basetag=${2:-3.15}
+    basetag=${2:-3.19}
     pkgs="$pkgs git sudo"
     fat="$fat /var/cache/apk/*"
     alias ctnr_pkg="ctnr_run apk -q --no-progress"

mk/ctnr/zpy.sh

@@ -21,7 +21,7 @@ gitroot="$(git -C "$(dirname "$0")" rev-parse --show-toplevel)"
 ctnr_run () {  # [-u] <cmd> [<cmd-arg>...]
   _u=root
   if [ "$1" = -u ]; then _u=$user; shift; fi
-  buildah run --user $_u "$ctnr" "$@"
+  buildah run --net=host --user $_u "$ctnr" "$@"
 }
 
 ctnr_append () {  # [-u] <dest-path>
@@ -30,8 +30,8 @@ ctnr_append () {  # [-u] <dest-path>
   ctnr_run $_u sh -c "cat >>$1"
 }
 
-pkgs='fzf python3'            # minimal, common
-pkgs="$pkgs highlight micro"  # recommended, common
+pkgs='fzf python3'  # minimal, common
+pkgs="$pkgs micro"  # recommended, common
 fat="/home/${user}/.zcomet/repos/*/*/.git /usr/lib*/python3.*/__pycache__"
 case $distro in
   fedora)
@@ -43,8 +43,8 @@ case $distro in
     alias ctnr_pkg_add="ctnr_pkg install"
   ;;
   alpine)
-    pkgs="$pkgs pcre2-tools"               # minimal
-    pkgs="$pkgs gcc python3-dev musl-dev"  # numpy, pandas, etc.
+    pkgs="$pkgs pcre2-tools"                             # minimal
+    pkgs="$pkgs gcc python3-dev musl-dev linux-headers"  # numpy, pandas, taskipy, etc.
     fat="$fat /var/cache/apk/*"
     alias ctnr_pkg="ctnr_run apk -q --no-progress"
     alias ctnr_pkg_upgrade="ctnr_pkg upgrade"
@@ -78,7 +78,6 @@ ctnr_pkg_add $pkgs
 # Set variables
 <<EOF ctnr_append -u /home/${user}/.zshenv
 export EDITOR='micro'
-export HIGHLIGHT_OPTIONS='-O truecolor -s ekvoli -t 4 --force --stdout'
 export LESS='ij.3JRWX'
 EOF
 
@@ -108,14 +107,15 @@ fi
 printf 'zpy_branch: %s\n' "$zpy_branch"
 printf 'zpy_version: %s\n' "$zpy_version"
 
+ctnr_run -u zsh -ic 'pipz install --cmd uv uv; pipz install --cmd rich rich-cli'
+
 # Install standalone vpy script, for simpler shebangs
 ctnr_run -u mkdir -p /home/${user}/.local/bin
 ctnr_run -u zsh -ic 'zpy mkbin vpy ~/.local/bin/vpy'
 
 # Set aliases
 <<EOF ctnr_append -u /home/${user}/.zshrc
 alias e="\$EDITOR"
-alias h="highlight"
 mkcd () { mkdir \$1 && cd \$1 }
 
 EOF

zpy.plugin.zsh

@@ -505,7 +505,6 @@ ZPY_PROCS=${${$(nproc 2>/dev/null):-$(sysctl -n hw.logicalcpu 2>/dev/null)}:-4}
         --annotation-style=line
         --strip-extras
         --allow-unsafe
-        --resolver=backtracking
     )
     # After updating minimum pip-tools to support each of these, add them:
     # --write-relative-to-output