From 0df3943f3c20ccb19d5974312ac4ebb8f2cb6361 Mon Sep 17 00:00:00 2001 From: goodboy Date: Tue, 9 Jun 2026 14:00:20 -0400 Subject: [PATCH] Pin `tractor` to git `main`, bump `xonsh` deps Switch the `tractor` dep from the local editable checkout (`../tractor`) back to the upstream git `main` branch so a fresh clone can `uv sync` without a sibling repo. Also, - add `xonsh>=0.23.8` as a core dep - bump `repl` group pins: `xonsh>=0.23.0` and `prompt-toolkit>=3.0.50` (was `==3.0.40`) - relock `uv.lock` accordingly (this commit msg was generated in some part by [`claude-code`][claude-code-gh]) [claude-code-gh]: https://github.com/anthropics/claude-code --- pyproject.toml | 9 ++++--- uv.lock | 73 +++++++++++--------------------------------------- 2 files changed, 21 insertions(+), 61 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index c9d39951..abbc90b7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -77,6 +77,7 @@ dependencies = [ "exchange-calendars>=4.13.1", "ib-async>=2.1.0", "aeventkit>=2.1.0", # XXX, imports as eventkit? + "xonsh>=0.23.8", ] # ------ dependencies ------ # NOTE, by default we ship only a "headless" deps set bc @@ -132,8 +133,8 @@ repl = [ "greenback >=1.1.1, <2.0.0", # @goodboy's preferred console toolz - "xonsh>=0.22.2", - "prompt-toolkit ==3.0.40", + "xonsh>=0.23.0", + "prompt-toolkit>=3.0.50", "pyperclip>=1.9.0", # for @claude's `snippets/claude_debug_helper.py` it uses to do @@ -206,8 +207,8 @@ pyvnc = { git = "https://github.com/regulad/pyvnc.git" } # xonsh = { git = 'https://github.com/xonsh/xonsh.git', branch = 'main' } # XXX since, we're like, always hacking new shite all-the-time. Bp -# tractor = { git = "https://github.com/goodboy/tractor.git", branch ="main" } +tractor = { git = "https://github.com/goodboy/tractor.git", branch ="main" } # tractor = { git = "https://pikers.dev/goodboy/tractor", branch = "piker_pin" } # ------ goodboy ------ # hackin dev-envs, usually there's something new he's hackin in.. -tractor = { path = "../tractor", editable = true } +# tractor = { path = "../tractor", editable = true } diff --git a/uv.lock b/uv.lock index 166c5ffe..c0233eb2 100644 --- a/uv.lock +++ b/uv.lock @@ -1111,6 +1111,7 @@ dependencies = [ { name = "trio-websocket" }, { name = "typer" }, { name = "websockets" }, + { name = "xonsh" }, ] [package.dev-dependencies] @@ -1181,13 +1182,14 @@ requires-dist = [ { name = "tomli", specifier = ">=2.0.1,<3.0.0" }, { name = "tomli-w", specifier = ">=1.0.0,<2.0.0" }, { name = "tomlkit", git = "https://github.com/pikers/tomlkit.git?branch=piker_pin" }, - { name = "tractor", editable = "../tractor" }, + { name = "tractor", git = "https://github.com/goodboy/tractor.git?branch=main" }, { name = "trio", specifier = ">=0.27" }, { name = "trio-typing", specifier = ">=0.10.0" }, { name = "trio-util", specifier = ">=0.7.0,<0.8.0" }, { name = "trio-websocket", specifier = ">=0.10.3,<0.11.0" }, { name = "typer", specifier = ">=0.9.0,<1.0.0" }, { name = "websockets", specifier = "==12.0" }, + { name = "xonsh", specifier = ">=0.23.8" }, ] [package.metadata.requires-dev] @@ -1199,23 +1201,23 @@ dev = [ { name = "i3ipc", specifier = ">=2.2.1" }, { name = "pdbp", specifier = ">=1.8.2,<2.0.0" }, { name = "pexpect", specifier = ">=4.9.0" }, - { name = "prompt-toolkit", specifier = "==3.0.40" }, + { name = "prompt-toolkit", specifier = ">=3.0.50" }, { name = "pyperclip", specifier = ">=1.9.0" }, { name = "pyqt6", specifier = ">=6.7.0,<7.0.0" }, { name = "pyqtgraph", specifier = ">=0.14.0" }, { name = "pytest" }, { name = "qdarkstyle", specifier = ">=3.0.2,<4.0.0" }, { name = "rapidfuzz", specifier = ">=3.2.0,<4.0.0" }, - { name = "xonsh", specifier = ">=0.22.2" }, + { name = "xonsh", specifier = ">=0.23.0" }, ] lint = [{ name = "ruff", specifier = ">=0.9.6" }] repl = [ { name = "greenback", specifier = ">=1.1.1,<2.0.0" }, { name = "pdbp", specifier = ">=1.8.2,<2.0.0" }, { name = "pexpect", specifier = ">=4.9.0" }, - { name = "prompt-toolkit", specifier = "==3.0.40" }, + { name = "prompt-toolkit", specifier = ">=3.0.50" }, { name = "pyperclip", specifier = ">=1.9.0" }, - { name = "xonsh", specifier = ">=0.22.2" }, + { name = "xonsh", specifier = ">=0.23.0" }, ] testing = [{ name = "pytest" }] uis = [ @@ -1287,14 +1289,14 @@ wheels = [ [[package]] name = "prompt-toolkit" -version = "3.0.40" +version = "3.0.52" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "wcwidth" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/99/ce/172e474a87241a69baad1ce46bc8f31eae590a770cb138b9b73812c8234d/prompt_toolkit-3.0.40.tar.gz", hash = "sha256:a371c06bb1d66cd499fecd708e50c0b6ae00acba9822ba33c586e2f16d1b739e", size = 423978, upload-time = "2023-11-10T11:22:24.529Z" } +sdist = { url = "https://files.pythonhosted.org/packages/a1/96/06e01a7b38dce6fe1db213e061a4602dd6032a8a97ef6c1a862537732421/prompt_toolkit-3.0.52.tar.gz", hash = "sha256:28cde192929c8e7321de85de1ddbe736f1375148b02f2e17edd840042b1be855", size = 434198, upload-time = "2025-08-27T15:24:02.057Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/ed/29/cd63ff872dfc213e1cd8131f8060262db184b975868cef33302f44616c3e/prompt_toolkit-3.0.40-py3-none-any.whl", hash = "sha256:99ba3dfb23d5b5af89712f89e60a5f3d9b8b67a9482ca377c5771d0e9047a34b", size = 385150, upload-time = "2023-11-10T11:22:20.72Z" }, + { url = "https://files.pythonhosted.org/packages/84/03/0d3ce49e2505ae70cf43bc5bb3033955d2fc9f932163e84dc0779cc47f48/prompt_toolkit-3.0.52-py3-none-any.whl", hash = "sha256:9aac639a3bbd33284347de5ad8d68ecc044b91a762dc39b7c21095fcd6a19955", size = 391431, upload-time = "2025-08-27T15:23:59.498Z" }, ] [[package]] @@ -1913,7 +1915,7 @@ wheels = [ [[package]] name = "tractor" version = "0.1.0a6.dev0" -source = { editable = "../tractor" } +source = { git = "https://github.com/goodboy/tractor.git?branch=main#5c98ab1fb6e2cb7781aa75845c7f323a52853c46" } dependencies = [ { name = "bidict" }, { name = "cffi" }, @@ -1927,49 +1929,6 @@ dependencies = [ { name = "wrapt" }, ] -[package.metadata] -requires-dist = [ - { name = "bidict", specifier = ">=0.23.1" }, - { name = "cffi", specifier = ">=1.17.1" }, - { name = "colorlog", specifier = ">=6.8.2,<7" }, - { name = "msgspec", specifier = ">=0.19.0" }, - { name = "multiaddr", specifier = ">=0.2.0" }, - { name = "pdbp", specifier = ">=1.8.2,<2" }, - { name = "platformdirs", specifier = ">=4.4.0" }, - { name = "tricycle", specifier = ">=0.4.1,<0.5" }, - { name = "trio", specifier = ">0.27" }, - { name = "wrapt", specifier = ">=1.16.0,<2" }, -] - -[package.metadata.requires-dev] -dev = [ - { name = "greenback", specifier = ">=1.2.1,<2" }, - { name = "pexpect", specifier = ">=4.9.0,<5" }, - { name = "prompt-toolkit", specifier = ">=3.0.50" }, - { name = "psutil", specifier = ">=7.0.0" }, - { name = "pyperclip", specifier = ">=1.9.0" }, - { name = "pytest", specifier = ">=8.3.5" }, - { name = "stackscope", specifier = ">=0.2.2,<0.3" }, - { name = "typing-extensions", specifier = ">=4.14.1" }, - { name = "xonsh", specifier = ">=0.22.2" }, -] -devx = [ - { name = "greenback", specifier = ">=1.2.1,<2" }, - { name = "stackscope", specifier = ">=0.2.2,<0.3" }, - { name = "typing-extensions", specifier = ">=4.14.1" }, -] -lint = [{ name = "ruff", specifier = ">=0.9.6" }] -repl = [ - { name = "prompt-toolkit", specifier = ">=3.0.50" }, - { name = "psutil", specifier = ">=7.0.0" }, - { name = "pyperclip", specifier = ">=1.9.0" }, - { name = "xonsh", specifier = ">=0.22.2" }, -] -testing = [ - { name = "pexpect", specifier = ">=4.9.0,<5" }, - { name = "pytest", specifier = ">=8.3.5" }, -] - [[package]] name = "tricycle" version = "0.4.1" @@ -2183,13 +2142,13 @@ wheels = [ [[package]] name = "xonsh" -version = "0.22.4" +version = "0.23.8" source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/48/df/1fc9ed62b3d7c14612e1713e9eb7bd41d54f6ad1028a8fbb6b7cddebc345/xonsh-0.22.4.tar.gz", hash = "sha256:6be346563fec2db75778ba5d2caee155525e634e99d9cc8cc347626025c0b3fa", size = 826665, upload-time = "2026-02-17T07:53:39.424Z" } +sdist = { url = "https://files.pythonhosted.org/packages/8b/77/0c4c39ad866d4ea1ef553f325d16e804d1bf1eeecc591f0e81b057aa37db/xonsh-0.23.8.tar.gz", hash = "sha256:541bb976c93a81571792644403bae8737145023da5f48d4c493909ab5c04ba0f", size = 1172271, upload-time = "2026-05-30T04:47:22.53Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/2e/00/7cbc0c1fb64365a0a317c54ce3a151c9644eea5a509d9cbaae61c9fd1426/xonsh-0.22.4-py311-none-any.whl", hash = "sha256:38b29b29fa85aa756462d9d9bbcaa1d85478c2108da3de6cc590a69a4bcd1a01", size = 654375, upload-time = "2026-02-17T07:53:37.702Z" }, - { url = "https://files.pythonhosted.org/packages/2e/c2/3dd498dc28d8f89cdd52e39950c5e591499ae423f61694c0bb4d03ed1d82/xonsh-0.22.4-py312-none-any.whl", hash = "sha256:4e538fac9f4c3d866ddbdeca068f0c0515469c997ed58d3bfee963878c6df5a5", size = 654300, upload-time = "2026-02-17T07:53:35.813Z" }, - { url = "https://files.pythonhosted.org/packages/82/7d/1f9c7147518e9f03f6ce081b5bfc4f1aceb6ec5caba849024d005e41d3be/xonsh-0.22.4-py313-none-any.whl", hash = "sha256:cc5fabf0ad0c56a2a11bed1e6a43c4ec6416a5b30f24f126b8e768547c3793e2", size = 654818, upload-time = "2026-02-17T07:53:33.477Z" }, + { url = "https://files.pythonhosted.org/packages/ca/4a/2aab8300ad218dfc7678c34d5f703f09df5681fecc6e66d48c951ef58049/xonsh-0.23.8-py311-none-any.whl", hash = "sha256:4bab3e405643df2cc78ec2cac13241471841796fe710386d2179666aae8a5f9c", size = 799846, upload-time = "2026-05-30T04:47:21.211Z" }, + { url = "https://files.pythonhosted.org/packages/87/ec/aa66ef6046f90769dd8fcb3ddca9d00282d12e3d73645abbf12f190f17cf/xonsh-0.23.8-py312-none-any.whl", hash = "sha256:c7d0f0fba0cafe0bd75bf202820aeffc74b52943fa27d98d3b4346793f6ba493", size = 799868, upload-time = "2026-05-30T04:47:19.158Z" }, + { url = "https://files.pythonhosted.org/packages/12/fe/2d757d82b57332f1c6cd3f8c168fbcf060a275895a763542255ae1c53d75/xonsh-0.23.8-py313-none-any.whl", hash = "sha256:1b7335522a6ecd63f0d84151977a7a9050874d3ecec00cf79919d0770bebb1b4", size = 800388, upload-time = "2026-05-30T04:47:18.47Z" }, ] [[package]]