From 1b7441768864d901107a3e66ceb53629e654e2b4 Mon Sep 17 00:00:00 2001 From: Tyler Goodlet Date: Tue, 10 Jun 2025 14:25:21 -0400 Subject: [PATCH] Flip to non-git`msgspec`, update `bidict`, link to "sdof" `tractor` dev branch --- pyproject.toml | 9 ++++---- uv.lock | 60 +++++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 56 insertions(+), 13 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index f6bce611..817cd6ea 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -49,7 +49,7 @@ classifiers = [ dependencies = [ "async-generator >=1.10, <2.0.0", "attrs >=23.1.0, <24.0.0", - "bidict >=0.22.1, <0.23.0", + "bidict >=0.23.1", "colorama >=0.4.6, <0.5.0", "colorlog >=6.7.0, <7.0.0", "ib-insync >=0.9.86, <0.10.0", @@ -71,7 +71,7 @@ dependencies = [ "cryptofeed >=2.4.0, <3.0.0", "pyarrow>=18.0.0", "websockets ==12.0", - "msgspec", + "msgspec>=0.19.0,<0.20", "tractor", "asyncvnc", "tomlkit", @@ -138,8 +138,7 @@ python-downloads = 'manual' pyqtgraph = { git = "https://github.com/pikers/pyqtgraph.git" } asyncvnc = { git = "https://github.com/pikers/asyncvnc.git", branch = "main" } tomlkit = { git = "https://github.com/pikers/tomlkit.git", branch ="piker_pin" } -msgspec = { git = "https://github.com/jcrist/msgspec.git" } -tractor = { git = "https://pikers.dev/goodboy/tractor", branch = "main" } +# tractor = { git = "https://pikers.dev/goodboy/tractor", branch = "main" } # XXX, since i'm hacking 3.13 support atm.. -# tractor = { path = "../tractor", editable = true } +tractor = { path = "../tractor", editable = true } diff --git a/uv.lock b/uv.lock index 11c2fc69..eadaea9d 100644 --- a/uv.lock +++ b/uv.lock @@ -118,11 +118,11 @@ wheels = [ [[package]] name = "bidict" -version = "0.22.1" +version = "0.23.1" source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/f2/be/b31e6ea9c94096a323e7a0e2c61480db01f07610bb7e7ea72a06fd1a23a8/bidict-0.22.1.tar.gz", hash = "sha256:1e0f7f74e4860e6d0943a05d4134c63a2fad86f3d4732fb265bd79e4e856d81d", size = 31660, upload-time = "2023-01-01T01:54:15.241Z" } +sdist = { url = "https://files.pythonhosted.org/packages/9a/6e/026678aa5a830e07cd9498a05d3e7e650a4f56a42f267a53d22bcda1bdc9/bidict-0.23.1.tar.gz", hash = "sha256:03069d763bc387bbd20e7d49914e75fc4132a41937fa3405417e1a5a2d006d71", size = 29093, upload-time = "2024-02-18T19:09:05.748Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/b5/82/ce0b6380f35f49d3fe687979a324c342cfa3588380232f3801db9dd62f9e/bidict-0.22.1-py3-none-any.whl", hash = "sha256:6ef212238eb884b664f28da76f33f1d28b260f665fc737b413b287d5487d1e7b", size = 35978, upload-time = "2023-01-01T01:54:13.937Z" }, + { url = "https://files.pythonhosted.org/packages/99/37/e8730c3587a65eb5645d4aba2d27aae48e8003614d6aaf15dda67f702f1f/bidict-0.23.1-py3-none-any.whl", hash = "sha256:5dae8d4d79b552a71cbabc7deb25dfe8ce710b17ff41711e13010ead2abfc3e5", size = 32764, upload-time = "2024-02-18T19:09:04.156Z" }, ] [[package]] @@ -585,7 +585,24 @@ wheels = [ [[package]] name = "msgspec" version = "0.19.0" -source = { git = "https://github.com/jcrist/msgspec.git#dd965dce22e5278d4935bea923441ecde31b5325" } +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/cf/9b/95d8ce458462b8b71b8a70fa94563b2498b89933689f3a7b8911edfae3d7/msgspec-0.19.0.tar.gz", hash = "sha256:604037e7cd475345848116e89c553aa9a233259733ab51986ac924ab1b976f8e", size = 216934, upload-time = "2024-12-27T17:40:28.597Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/b2/5f/a70c24f075e3e7af2fae5414c7048b0e11389685b7f717bb55ba282a34a7/msgspec-0.19.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:f98bd8962ad549c27d63845b50af3f53ec468b6318400c9f1adfe8b092d7b62f", size = 190485, upload-time = "2024-12-27T17:39:44.974Z" }, + { url = "https://files.pythonhosted.org/packages/89/b0/1b9763938cfae12acf14b682fcf05c92855974d921a5a985ecc197d1c672/msgspec-0.19.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:43bbb237feab761b815ed9df43b266114203f53596f9b6e6f00ebd79d178cdf2", size = 183910, upload-time = "2024-12-27T17:39:46.401Z" }, + { url = "https://files.pythonhosted.org/packages/87/81/0c8c93f0b92c97e326b279795f9c5b956c5a97af28ca0fbb9fd86c83737a/msgspec-0.19.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4cfc033c02c3e0aec52b71710d7f84cb3ca5eb407ab2ad23d75631153fdb1f12", size = 210633, upload-time = "2024-12-27T17:39:49.099Z" }, + { url = "https://files.pythonhosted.org/packages/d0/ef/c5422ce8af73928d194a6606f8ae36e93a52fd5e8df5abd366903a5ca8da/msgspec-0.19.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d911c442571605e17658ca2b416fd8579c5050ac9adc5e00c2cb3126c97f73bc", size = 213594, upload-time = "2024-12-27T17:39:51.204Z" }, + { url = "https://files.pythonhosted.org/packages/19/2b/4137bc2ed45660444842d042be2cf5b18aa06efd2cda107cff18253b9653/msgspec-0.19.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:757b501fa57e24896cf40a831442b19a864f56d253679f34f260dcb002524a6c", size = 214053, upload-time = "2024-12-27T17:39:52.866Z" }, + { url = "https://files.pythonhosted.org/packages/9d/e6/8ad51bdc806aac1dc501e8fe43f759f9ed7284043d722b53323ea421c360/msgspec-0.19.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:5f0f65f29b45e2816d8bded36e6b837a4bf5fb60ec4bc3c625fa2c6da4124537", size = 219081, upload-time = "2024-12-27T17:39:55.142Z" }, + { url = "https://files.pythonhosted.org/packages/b1/ef/27dd35a7049c9a4f4211c6cd6a8c9db0a50647546f003a5867827ec45391/msgspec-0.19.0-cp312-cp312-win_amd64.whl", hash = "sha256:067f0de1c33cfa0b6a8206562efdf6be5985b988b53dd244a8e06f993f27c8c0", size = 187467, upload-time = "2024-12-27T17:39:56.531Z" }, + { url = "https://files.pythonhosted.org/packages/3c/cb/2842c312bbe618d8fefc8b9cedce37f773cdc8fa453306546dba2c21fd98/msgspec-0.19.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:f12d30dd6266557aaaf0aa0f9580a9a8fbeadfa83699c487713e355ec5f0bd86", size = 190498, upload-time = "2024-12-27T17:40:00.427Z" }, + { url = "https://files.pythonhosted.org/packages/58/95/c40b01b93465e1a5f3b6c7d91b10fb574818163740cc3acbe722d1e0e7e4/msgspec-0.19.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:82b2c42c1b9ebc89e822e7e13bbe9d17ede0c23c187469fdd9505afd5a481314", size = 183950, upload-time = "2024-12-27T17:40:04.219Z" }, + { url = "https://files.pythonhosted.org/packages/e8/f0/5b764e066ce9aba4b70d1db8b087ea66098c7c27d59b9dd8a3532774d48f/msgspec-0.19.0-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:19746b50be214a54239aab822964f2ac81e38b0055cca94808359d779338c10e", size = 210647, upload-time = "2024-12-27T17:40:05.606Z" }, + { url = "https://files.pythonhosted.org/packages/9d/87/bc14f49bc95c4cb0dd0a8c56028a67c014ee7e6818ccdce74a4862af259b/msgspec-0.19.0-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:60ef4bdb0ec8e4ad62e5a1f95230c08efb1f64f32e6e8dd2ced685bcc73858b5", size = 213563, upload-time = "2024-12-27T17:40:10.516Z" }, + { url = "https://files.pythonhosted.org/packages/53/2f/2b1c2b056894fbaa975f68f81e3014bb447516a8b010f1bed3fb0e016ed7/msgspec-0.19.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:ac7f7c377c122b649f7545810c6cd1b47586e3aa3059126ce3516ac7ccc6a6a9", size = 213996, upload-time = "2024-12-27T17:40:12.244Z" }, + { url = "https://files.pythonhosted.org/packages/aa/5a/4cd408d90d1417e8d2ce6a22b98a6853c1b4d7cb7669153e4424d60087f6/msgspec-0.19.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:a5bc1472223a643f5ffb5bf46ccdede7f9795078194f14edd69e3aab7020d327", size = 219087, upload-time = "2024-12-27T17:40:14.881Z" }, + { url = "https://files.pythonhosted.org/packages/23/d8/f15b40611c2d5753d1abb0ca0da0c75348daf1252220e5dda2867bd81062/msgspec-0.19.0-cp313-cp313-win_amd64.whl", hash = "sha256:317050bc0f7739cb30d257ff09152ca309bf5a369854bbf1e57dffc310c1f20f", size = 187432, upload-time = "2024-12-27T17:40:16.256Z" }, +] [[package]] name = "multidict" @@ -833,13 +850,13 @@ requires-dist = [ { name = "async-generator", specifier = ">=1.10,<2.0.0" }, { name = "asyncvnc", git = "https://github.com/pikers/asyncvnc.git?branch=main" }, { name = "attrs", specifier = ">=23.1.0,<24.0.0" }, - { name = "bidict", specifier = ">=0.22.1,<0.23.0" }, + { name = "bidict", specifier = ">=0.23.1" }, { name = "colorama", specifier = ">=0.4.6,<0.5.0" }, { name = "colorlog", specifier = ">=6.7.0,<7.0.0" }, { name = "cryptofeed", specifier = ">=2.4.0,<3.0.0" }, { name = "httpx", specifier = ">=0.27.0,<0.28.0" }, { name = "ib-insync", specifier = ">=0.9.86,<0.10.0" }, - { name = "msgspec", git = "https://github.com/jcrist/msgspec.git" }, + { name = "msgspec", specifier = ">=0.19.0,<0.20" }, { name = "numba", specifier = ">=0.61.0" }, { name = "numpy", specifier = ">=2.0" }, { name = "pdbp", specifier = ">=1.5.0,<2.0.0" }, @@ -857,7 +874,7 @@ 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", git = "https://pikers.dev/goodboy/tractor?branch=main" }, + { name = "tractor", editable = "../tractor" }, { name = "trio", specifier = ">=0.27" }, { name = "trio-typing", specifier = ">=0.10.0" }, { name = "trio-util", specifier = ">=0.7.0,<0.8.0" }, @@ -1448,8 +1465,10 @@ source = { git = "https://github.com/pikers/tomlkit.git?branch=piker_pin#8e0239a [[package]] name = "tractor" version = "0.1.0a6.dev0" -source = { git = "https://pikers.dev/goodboy/tractor?branch=main#fde681fa193d2ea76d65a223027eff18fae4f57f" } +source = { editable = "../tractor" } dependencies = [ + { name = "bidict" }, + { name = "cffi" }, { name = "colorlog" }, { name = "msgspec" }, { name = "pdbp" }, @@ -1458,6 +1477,31 @@ 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 = "pdbp", specifier = ">=1.6,<2" }, + { 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.13.2" }, + { name = "xonsh", specifier = ">=0.19.2" }, +] + [[package]] name = "tricycle" version = "0.4.1"