From ab2b18a24272d9bfacd8f0c614e18dbadc1a663a Mon Sep 17 00:00:00 2001 From: Andy Kluger Date: Tue, 12 Nov 2024 12:25:38 -0500 Subject: [PATCH 01/19] reverse-list layout for fzf/skim --- NEWS.rst | 8 ++++++++ zpy.plugin.zsh | 6 +++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/NEWS.rst b/NEWS.rst index 7944449..2703572 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -2,6 +2,14 @@ News ==== +Unreleased +========== + +Changed +------- + +- Use reverse-list layout for fzf/skim instead of reverse + 0.3.11 ====== diff --git a/zpy.plugin.zsh b/zpy.plugin.zsh index 54773d7..035f2f3 100644 --- a/zpy.plugin.zsh +++ b/zpy.plugin.zsh @@ -299,7 +299,7 @@ ZPY_PROCS=${${$(nproc 2>/dev/null):-$(sysctl -n hw.logicalcpu 2>/dev/null)}:-4} .zpy_fzf_cmd || return local fzf_cmd=$REPLY - local multi fzf_args=(--reverse -0 --preview='<{}/*.in') + local multi fzf_args=(--layout=reverse-list -0 --preview='<{}/*.in') if [[ $1 == --multi ]] { unset reply fzf_args+=(-m) @@ -1830,7 +1830,7 @@ for pkg in pkgs: local fzf_cmd=$REPLY local fzf_args=() fzf_header fzf_prompt multi - fzf_args=(--reverse -0) + fzf_args=(--layout=reverse-list -0) fzf_header='Packages:' fzf_prompt='Which package? ' while [[ $1 == --(header|multi) ]] { @@ -1908,7 +1908,7 @@ for pkg in pkgs: projects_home=$1; shift bins_home=$1; shift - local bins_showlist=() bins_hidelist=() linkonly=1 fzf_args=(--reverse -m -0) fzf_header=Installing + local bins_showlist=() bins_hidelist=() linkonly=1 fzf_args=(--layout=reverse-list -m -0) fzf_header=Installing while [[ $1 == --(cmd|activate|no-cmd|auto1|header) ]] { if [[ $1 == --cmd ]] { bins_showlist=(${(s:,:)2}); shift 2 } if [[ $1 == --no-cmd ]] { bins_hidelist=(${(s:,:)2}); shift 2 } From 6eae9c2731d77a0302b96534e57a28fa4cf34f9d Mon Sep 17 00:00:00 2001 From: Andy Kluger Date: Tue, 12 Nov 2024 12:43:41 -0500 Subject: [PATCH 02/19] Update skim repo link in docs --- doc/src/deps.md | 4 ++-- doc/src/start.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/src/deps.md b/doc/src/deps.md index 02f73e7..bcd11ed 100644 --- a/doc/src/deps.md +++ b/doc/src/deps.md @@ -1,7 +1,7 @@ # Dependencies The primary requirements are Zsh, Python, and -[`fzf`](https://github.com/junegunn/fzf) *or* [`sk` (skim)](https://github.com/lotabout/skim), +[`fzf`](https://github.com/junegunn/fzf) *or* [`sk` (skim)](https://github.com/skim-rs/skim), with optional additions for more colorful output, alternative json parsers, and faster performance. ## Suggested Dependencies by Platform @@ -48,7 +48,7 @@ with optional additions for more colorful output, alternative json parsers, and - [Zsh](https://repology.org/project/zsh/versions) - [Python](https://repology.org/project/python/versions) - - [`fzf`](https://github.com/junegunn/fzf) *or* [`sk` (skim)](https://github.com/lotabout/skim) + - [`fzf`](https://github.com/junegunn/fzf) *or* [`sk` (skim)](https://github.com/skim-rs/skim) === "The optional ones" diff --git a/doc/src/start.md b/doc/src/start.md index 4b1a724..c84b229 100644 --- a/doc/src/start.md +++ b/doc/src/start.md @@ -7,7 +7,7 @@ ## Install locally Aside from Zsh and Python, the only dependency you're likely to *need* is -[`fzf`](https://github.com/junegunn/fzf) *or* [`sk` (skim)](https://github.com/lotabout/skim). +[`fzf`](https://github.com/junegunn/fzf) *or* [`sk` (skim)](https://github.com/skim-rs/skim). For more details and recommended package manager commands, see [Dependencies](deps.md). To install `zpy` itself, you only need to source the file `zpy.plugin.zsh` From dcc2eb0b1ab17d0bfd330100e06e8c5f065ecb17 Mon Sep 17 00:00:00 2001 From: Andy Kluger Date: Mon, 18 Nov 2024 12:07:29 -0500 Subject: [PATCH 03/19] pypc: Don't add '.' as dependency --- NEWS.rst | 1 + zpy.plugin.zsh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/NEWS.rst b/NEWS.rst index 2703572..10cb3cf 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -9,6 +9,7 @@ Changed ------- - Use reverse-list layout for fzf/skim instead of reverse +- pypc: don't add '.' to any dependency list 0.3.11 ====== diff --git a/zpy.plugin.zsh b/zpy.plugin.zsh index 035f2f3..3861567 100644 --- a/zpy.plugin.zsh +++ b/zpy.plugin.zsh @@ -1435,7 +1435,7 @@ def reqs_from_reqsin(reqsin): reqs.append( re.search(r'^(-\S+\s+)*([^#]+)', line).group(2).rstrip() ) - return sorted(set(r for r in reqs if r.strip())) + return sorted(set(r for r in reqs if r.strip() and r not in ('.',))) suffix = 'requirements.in' From 804f537ef3960ef86519a1011cb4de6e056422ba Mon Sep 17 00:00:00 2001 From: Andy Kluger Date: Mon, 18 Nov 2024 12:08:13 -0500 Subject: [PATCH 04/19] Make completion docs clearer --- doc/src/completions.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/doc/src/completions.md b/doc/src/completions.md index 8f4a7a9..7e3148f 100644 --- a/doc/src/completions.md +++ b/doc/src/completions.md @@ -10,26 +10,26 @@ somewhere before loading zpy: autoload -Uz compinit && compinit ``` +I'll also recommend: + +```shell +zstyle ':completion:*' menu select +``` + Some functions allow you to pass arguments through to other tools, like `pip`, `pip-compile`, and `uv`. Completion will work for those if you install their own completion definitions. If using `uv`, neither `pip` nor `pip-compile` will be relevant. -`uv` completion can be installed with something like the following, -depending on your `$fpath`: +`uv` completion is installed by creating a `_uv` file +in one of your `$fpath` folders (usually `~/.local/share/zsh/site-functions`): ```console % uv generate-shell-completion zsh >~/.local/share/zsh/site-functions/_uv ``` -You can check for appropriate folders with: - -```console -% print -rl -- $fpath -``` - -Filter to .../username/... paths for the most likely candidates: +You can check for appropriate `$fpath` folders with: ```console % print -rl -- ${(M)fpath:#*/$USER/*} From b6c5de4fb2b16147e285af54416f9494028b1274 Mon Sep 17 00:00:00 2001 From: Andy Kluger Date: Tue, 19 Nov 2024 18:40:40 -0500 Subject: [PATCH 05/19] Add gat highlighting backend (optional) --- NEWS.rst | 1 + doc/src/deps.md | 1 + zpy.plugin.zsh | 5 ++++- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/NEWS.rst b/NEWS.rst index 10cb3cf..0ad119f 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -10,6 +10,7 @@ Changed - Use reverse-list layout for fzf/skim instead of reverse - pypc: don't add '.' to any dependency list +- Add optional syntax highlighter backend: gat 0.3.11 ====== diff --git a/doc/src/deps.md b/doc/src/deps.md index bcd11ed..99ee163 100644 --- a/doc/src/deps.md +++ b/doc/src/deps.md @@ -55,6 +55,7 @@ with optional additions for more colorful output, alternative json parsers, and - [uv](https://github.com/astral-sh/uv/) -- for faster performance, leaner venvs, and more operational feedback - [highlight](https://repology.org/project/highlight/versions) + *or* [gat](https://github.com/koki-develop/gat/) *or* [bat](https://repology.org/project/bat/versions) *or* [rich-cli](https://github.com/Textualize/rich-cli) -- for pretty syntax highlighting; rich-cli adds fancy tables diff --git a/zpy.plugin.zsh b/zpy.plugin.zsh index 3861567..8ef7a39 100644 --- a/zpy.plugin.zsh +++ b/zpy.plugin.zsh @@ -108,13 +108,16 @@ ZPY_PROCS=${${$(nproc 2>/dev/null):-$(sysctl -n hw.logicalcpu 2>/dev/null)}:-4} # the first of the next. This is true of at least highlight 3.58. # The method below bypasses both issues consistently - # across all known versions of highlight, and still outperforms bat: + # across all known versions of highlight, and still outperforms the rest: local content=$(<&0) if [[ $content ]] { local themes=(aiseered blacknblue bluegreen ekvoli navy) HIGHLIGHT_OPTIONS=${HIGHLIGHT_OPTIONS:-"-s $themes[RANDOM % $#themes + 1]"} \ highlight -O truecolor --stdout --force -S $1 <<<$content } + } elif (( $+commands[gat] )) { # recommended themes: base16-snazzy, doom-one, gruvbox, onedark, vulcan + GAT_THEME=${GAT_THEME:-doom-one} \ + gat --force-color -l $1 } elif (( $+commands[bat] )) { # recommended themes: ansi, zenburn BAT_THEME=${BAT_THEME:-ansi} \ bat --color always --paging never -p -l $1 From 1e0e0a6b17b7702fd759ce02e9d744d54c306455 Mon Sep 17 00:00:00 2001 From: Andy Kluger Date: Tue, 19 Nov 2024 22:14:23 -0500 Subject: [PATCH 06/19] Ensure to use python3 for internal out-of-venv uses --- NEWS.rst | 1 + zpy.plugin.zsh | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/NEWS.rst b/NEWS.rst index 0ad119f..34914b9 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -11,6 +11,7 @@ Changed - Use reverse-list layout for fzf/skim instead of reverse - pypc: don't add '.' to any dependency list - Add optional syntax highlighter backend: gat +- Ensure to use ``python3`` instead of ``python`` for out-of-venv internal usages 0.3.11 ====== diff --git a/zpy.plugin.zsh b/zpy.plugin.zsh index 8ef7a39..c0b932c 100644 --- a/zpy.plugin.zsh +++ b/zpy.plugin.zsh @@ -1523,7 +1523,7 @@ Path('''${newtoml}''').write_text(tomlkit.dumps(toml_data)) jq --argjson val "$value" "${keypath}=\$val" "$jsonfile" )" >$jsonfile } else { - python -c " + python3 -c " from collections import defaultdict from json import loads, dumps from pathlib import Path @@ -2952,7 +2952,7 @@ _.zpy_ui_pipz () { ) wheezy.template =(<<<${(F)template}) $json >$txt } else { - python -c " + python3 -c " from pathlib import Path from json import loads From 4754010292819fb2c797e0cac069272271a3cb34 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Wed, 20 Nov 2024 09:09:22 +0000 Subject: [PATCH 07/19] Bump PyPI requirements [Automated] --- doc/mkdocs/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/mkdocs/requirements.txt b/doc/mkdocs/requirements.txt index 2911f3f..3bd0919 100644 --- a/doc/mkdocs/requirements.txt +++ b/doc/mkdocs/requirements.txt @@ -11,7 +11,7 @@ markupsafe==3.0.2 # via jinja2, mkdocs mergedeep==1.3.4 # via mkdocs, mkdocs-get-deps mkdocs==1.6.1 # via -r requirements.in, mkdocs-material mkdocs-get-deps==0.2.0 # via mkdocs -mkdocs-material==9.5.44 # via -r requirements.in +mkdocs-material==9.5.45 # via -r requirements.in mkdocs-material-extensions==1.3.1 # via mkdocs-material packaging==24.2 # via mkdocs paginate==0.5.7 # via mkdocs-material From 673f87562af706e0784f2328ee9874856faf45dd Mon Sep 17 00:00:00 2001 From: Andy Kluger Date: Sun, 24 Nov 2024 16:52:22 -0500 Subject: [PATCH 08/19] fixup NEWS --- NEWS.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NEWS.rst b/NEWS.rst index 34914b9..0a3e01f 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -11,7 +11,7 @@ Changed - Use reverse-list layout for fzf/skim instead of reverse - pypc: don't add '.' to any dependency list - Add optional syntax highlighter backend: gat -- Ensure to use ``python3`` instead of ``python`` for out-of-venv internal usages +- Ensure to use ``python3`` instead of ``python`` for out-of-venv internal uses 0.3.11 ====== From bcc90b433fe45b1912c579d33a12443377f2cc87 Mon Sep 17 00:00:00 2001 From: Andy Kluger Date: Sun, 24 Nov 2024 16:58:13 -0500 Subject: [PATCH 09/19] DRY blocklist --- zpy.plugin.zsh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/zpy.plugin.zsh b/zpy.plugin.zsh index c0b932c..3470a70 100644 --- a/zpy.plugin.zsh +++ b/zpy.plugin.zsh @@ -1235,17 +1235,19 @@ ZPY_PROCS=${${$(nproc 2>/dev/null):-$(sysctl -n hw.logicalcpu 2>/dev/null)}:-4} rehash + local blocklist=(setuptools six pip pip-tools wheel) + local cells=() if (( $+commands[jq] )) { cells=($( .zpy_ui_vrun $vrun_args $list_outdated 2>/dev/null \ - | jq -r '.[] | select(.name|test("^(setuptools|six|pip|pip-tools|wheel)$")|not) | .name,.version,.latest_version' + | jq -r '.[] | select(.name|test("^('${(j:|:)blocklist}')$")|not) | .name,.version,.latest_version' )) } elif (( $+commands[wheezy.template] )) { local template=( '@require(__args__)' '@for pkg in __args__[0]:' - '@if pkg["name"] not in ("setuptools", "six", "pip", "pip-tools", "wheel"):' + '@if pkg["name"] not in ("'${(j:", ":)blocklist}'"):' '@pkg["name"]' '@pkg["version"]' '@pkg["latest_version"]' @@ -1264,7 +1266,7 @@ import sys from json import load pkgs = load(sys.stdin) for pkg in pkgs: - if pkg["name"] not in ("setuptools", "six", "pip", "pip-tools", "wheel"): + if pkg["name"] not in ("'${(j:", ":)blocklist}'"): print(pkg["name"], pkg["version"], pkg["latest_version"], sep="\n") ' )) From e3317881f268a0b9d72b9de39be458ff73c3c015 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Tue, 26 Nov 2024 09:09:46 +0000 Subject: [PATCH 10/19] Bump PyPI requirements [Automated] --- doc/mkdocs/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/mkdocs/requirements.txt b/doc/mkdocs/requirements.txt index 3bd0919..8c8e90b 100644 --- a/doc/mkdocs/requirements.txt +++ b/doc/mkdocs/requirements.txt @@ -11,7 +11,7 @@ markupsafe==3.0.2 # via jinja2, mkdocs mergedeep==1.3.4 # via mkdocs, mkdocs-get-deps mkdocs==1.6.1 # via -r requirements.in, mkdocs-material mkdocs-get-deps==0.2.0 # via mkdocs -mkdocs-material==9.5.45 # via -r requirements.in +mkdocs-material==9.5.46 # via -r requirements.in mkdocs-material-extensions==1.3.1 # via mkdocs-material packaging==24.2 # via mkdocs paginate==0.5.7 # via mkdocs-material From b633e2cbc749cb4f1758b1104171e09db4bc2333 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Sun, 1 Dec 2024 09:08:23 +0000 Subject: [PATCH 11/19] Bump PyPI requirements [Automated] --- doc/mkdocs/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/mkdocs/requirements.txt b/doc/mkdocs/requirements.txt index 8c8e90b..40e9926 100644 --- a/doc/mkdocs/requirements.txt +++ b/doc/mkdocs/requirements.txt @@ -11,7 +11,7 @@ markupsafe==3.0.2 # via jinja2, mkdocs mergedeep==1.3.4 # via mkdocs, mkdocs-get-deps mkdocs==1.6.1 # via -r requirements.in, mkdocs-material mkdocs-get-deps==0.2.0 # via mkdocs -mkdocs-material==9.5.46 # via -r requirements.in +mkdocs-material==9.5.47 # via -r requirements.in mkdocs-material-extensions==1.3.1 # via mkdocs-material packaging==24.2 # via mkdocs paginate==0.5.7 # via mkdocs-material From 84c094b45bbb297fa074699fc86ef7ebedacefb2 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Thu, 5 Dec 2024 09:09:54 +0000 Subject: [PATCH 12/19] Bump PyPI requirements [Automated] --- doc/mkdocs/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/mkdocs/requirements.txt b/doc/mkdocs/requirements.txt index 40e9926..5686dec 100644 --- a/doc/mkdocs/requirements.txt +++ b/doc/mkdocs/requirements.txt @@ -24,6 +24,6 @@ pyyaml==6.0.2 # via mkdocs, mkdocs-get-deps, pymdown-extensions, pyy pyyaml-env-tag==0.1 # via mkdocs regex==2024.11.6 # via mkdocs-material requests==2.32.3 # via mkdocs-material -six==1.16.0 # via python-dateutil +six==1.17.0 # via python-dateutil urllib3==2.2.3 # via requests watchdog==6.0.0 # via mkdocs From 00e16162e61eedb805a35d71dfb327fb85195ce6 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Mon, 9 Dec 2024 09:10:42 +0000 Subject: [PATCH 13/19] Bump PyPI requirements [Automated] --- doc/mkdocs/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/mkdocs/requirements.txt b/doc/mkdocs/requirements.txt index 5686dec..772e0d5 100644 --- a/doc/mkdocs/requirements.txt +++ b/doc/mkdocs/requirements.txt @@ -11,7 +11,7 @@ markupsafe==3.0.2 # via jinja2, mkdocs mergedeep==1.3.4 # via mkdocs, mkdocs-get-deps mkdocs==1.6.1 # via -r requirements.in, mkdocs-material mkdocs-get-deps==0.2.0 # via mkdocs -mkdocs-material==9.5.47 # via -r requirements.in +mkdocs-material==9.5.48 # via -r requirements.in mkdocs-material-extensions==1.3.1 # via mkdocs-material packaging==24.2 # via mkdocs paginate==0.5.7 # via mkdocs-material From 635ad9dd400f5563e115ac8d2c3b1c16adc70435 Mon Sep 17 00:00:00 2001 From: Andy Kluger Date: Wed, 11 Dec 2024 13:26:10 -0500 Subject: [PATCH 14/19] Add mise auto venv activation docs --- doc/src/direnv.md | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/doc/src/direnv.md b/doc/src/direnv.md index 209a255..b389189 100644 --- a/doc/src/direnv.md +++ b/doc/src/direnv.md @@ -32,6 +32,28 @@ please open an issue or discussion on GitHub. This ensures the proper project folder is used, even if you're activating the script by entering a deeper subdirectory. +=== "mise" + + [mise](https://mise.jdx.dev/) supports + [automatic venv activation](https://mise.jdx.dev/lang/python.html#automatic-virtualenv-activation), + so we can configure the venv location to match zpy's. + + Let's create a self-contained script for `venvs_path`, + so that we can easily call it from Bash. + + Assuming `~/.local/bin` is in your `PATH`, run + + ```console + $ zpy mkbin venvs_path ~/.local/bin/ + ``` + + Now you can add the following to your project's `mise.toml`: + + ```toml + [env._.python] + venv = "{{exec(command='venvs_path')}}/venv" + ``` + === "direnv" [direnv](https://github.com/direnv/direnv/) From 03d150ee7baf9f302e1bf129e382ca96665fcff9 Mon Sep 17 00:00:00 2001 From: Andy Kluger Date: Wed, 11 Dec 2024 13:30:44 -0500 Subject: [PATCH 15/19] zcomet ctnr: set fpath, bump alpine tag --- mk/ctnr/zcomet.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mk/ctnr/zcomet.sh b/mk/ctnr/zcomet.sh index 0c468e3..1dfa23a 100755 --- a/mk/ctnr/zcomet.sh +++ b/mk/ctnr/zcomet.sh @@ -32,7 +32,7 @@ case $distro in alias ctnr_mkuser="ctnr_run useradd -m -s /bin/zsh" ;; alpine) - basetag=${2:-3.20} + basetag=${2:-3.21} pkgs="$pkgs git sudo" fat="$fat /var/cache/apk/*" alias ctnr_pkg="ctnr_run apk -q --no-progress" @@ -87,6 +87,7 @@ ctnr_run -u git clone -q --depth 1 https://github.com/agkozak/zcomet /home/$user # Add settings and plugins to .zshrc: ctnr_run -u rm -f /home/$user/.zshrc < Date: Wed, 11 Dec 2024 13:32:13 -0500 Subject: [PATCH 16/19] Install uv completion in demo container --- mk/ctnr/zpy.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mk/ctnr/zpy.sh b/mk/ctnr/zpy.sh index 822f9b9..adc48ac 100755 --- a/mk/ctnr/zpy.sh +++ b/mk/ctnr/zpy.sh @@ -108,10 +108,13 @@ fi printf 'zpy_branch: %s\n' "$zpy_branch" printf 'zpy_version: %s\n' "$zpy_version" +# Install uv, rich-cli ctnr_run -u zsh -ic 'pipz install --cmd uv uv; pipz install --cmd rich rich-cli' +ctnr_run -u mkdir -p /home/${user}/.local/share/zsh/site-functions +# shellcheck disable=SC2088 +ctnr_run -u sh -c '~/.local/bin/uv generate-shell-completion zsh >~/.local/share/zsh/site-functions/_uv' # 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 From 77d2f75d5e9d9a307d8df5d696b6b5d781dbd320 Mon Sep 17 00:00:00 2001 From: Andy Kluger Date: Wed, 11 Dec 2024 13:32:52 -0500 Subject: [PATCH 17/19] Update NEWS --- NEWS.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/NEWS.rst b/NEWS.rst index 0a3e01f..01e8a93 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -12,6 +12,9 @@ Changed - pypc: don't add '.' to any dependency list - Add optional syntax highlighter backend: gat - Ensure to use ``python3`` instead of ``python`` for out-of-venv internal uses +- Add mise auto-venv-activation instructions to docs +- Update demo container base for Alpine +- Install uv completion (which becomes part of zpy completion) in demo containers 0.3.11 ====== From 95114dec06a7205d538f334046f26b1a36004f01 Mon Sep 17 00:00:00 2001 From: Andy Kluger Date: Thu, 12 Dec 2024 10:30:48 -0500 Subject: [PATCH 18/19] Improve mise auto-venv instructions --- doc/src/direnv.md | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/doc/src/direnv.md b/doc/src/direnv.md index b389189..6c7d35d 100644 --- a/doc/src/direnv.md +++ b/doc/src/direnv.md @@ -47,13 +47,20 @@ please open an issue or discussion on GitHub. $ zpy mkbin venvs_path ~/.local/bin/ ``` - Now you can add the following to your project's `mise.toml`: + Now you can add the following to your project's `mise.local.toml`: ```toml [env._.python] venv = "{{exec(command='venvs_path')}}/venv" ``` + This can also be done with commands: + + ```console + $ touch mise.local.toml + $ mise config set -f mise.local.toml env._.python.venv "{{exec(command='venvs_path')}}/venv" + ``` + === "direnv" [direnv](https://github.com/direnv/direnv/) From f2db1e63886b99fc060af9173e7c501c76c64e36 Mon Sep 17 00:00:00 2001 From: Andy Kluger Date: Thu, 12 Dec 2024 11:11:51 -0500 Subject: [PATCH 19/19] Version bump NEWS --- NEWS.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/NEWS.rst b/NEWS.rst index 01e8a93..f4cfde1 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -2,8 +2,8 @@ News ==== -Unreleased -========== +0.3.12 +====== Changed -------