From 1f3da3ebd9c85b5e94da7a21e1a5261d270c2a1e Mon Sep 17 00:00:00 2001 From: Adrien Vannson Date: Mon, 27 Jan 2025 10:50:45 +0100 Subject: [PATCH 1/2] Update betterproto --- poetry.lock | 26 +++++++++++++++----------- pyproject.toml | 3 ++- 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/poetry.lock b/poetry.lock index a61da6dd..5d4b8618 100644 --- a/poetry.lock +++ b/poetry.lock @@ -78,23 +78,27 @@ dev = ["freezegun (>=1.0,<2.0)", "pytest (>=6.0)", "pytest-cov"] [[package]] name = "betterproto2" -version = "0.2.1" +version = "0.2.2" description = "A better Protobuf / gRPC generator & library" optional = false -python-versions = "<4.0,>=3.8" +python-versions = ">=3.10,<4.0" groups = ["main"] -files = [ - {file = "betterproto2-0.2.1-py3-none-any.whl", hash = "sha256:d0da619a87a8b39a3322aa510abb817c8d72ef641a9438cadbd79df029edd802"}, - {file = "betterproto2-0.2.1.tar.gz", hash = "sha256:fc278c54e74d590a023e30f1e31ec3a9868c6ea84256c70e956557febf43eca9"}, -] +files = [] +develop = false [package.dependencies] -grpclib = ">=0.4.1,<0.5.0" -python-dateutil = ">=2.8,<3.0" -typing-extensions = ">=4.7.1,<5.0.0" +grpclib = "^0.4.1" +python-dateutil = "^2.8" +typing-extensions = "^4.7.1" [package.extras] -rust-codec = ["betterproto-rust-codec (==0.1.1)"] +rust-codec = ["betterproto2-rust-codec"] + +[package.source] +type = "git" +url = "https://github.com/betterproto/python-betterproto2" +reference = "HEAD" +resolved_reference = "668a2a16bb315deb8e8ef9226c5f938f5e3bb213" [[package]] name = "certifi" @@ -2279,4 +2283,4 @@ files = [ [metadata] lock-version = "2.1" python-versions = "^3.10" -content-hash = "a51497f0489c02786f8f53aca2c529f9fbeb803e8f470b6c21fe9c0d9f59f3ec" +content-hash = "594fbb0562dcf22ee6b96fdc06819814c00f698017f901978604ff0fb1394191" diff --git a/pyproject.toml b/pyproject.toml index 8d77141d..9130f0a2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -26,7 +26,8 @@ packages = [ [tool.poetry.dependencies] python = "^3.10" -betterproto2 = "^0.2.1" +# betterproto2 = "^0.2.1" +betterproto2 = { git="https://github.com/betterproto/python-betterproto2" } # The Ruff version is pinned. To update it, also update it in .pre-commit-config.yaml ruff = "~0.9.3" grpclib = "^0.4.1" From 338dd66039421a70b43604ca5dd8fe473398a531 Mon Sep 17 00:00:00 2001 From: Adrien Vannson Date: Mon, 27 Jan 2025 10:58:12 +0100 Subject: [PATCH 2/2] Update other dependencies --- poetry.lock | 90 +++++++++----------------------------------------- pyproject.toml | 8 ++--- 2 files changed, 20 insertions(+), 78 deletions(-) diff --git a/poetry.lock b/poetry.lock index 5d4b8618..f313bb1c 100644 --- a/poetry.lock +++ b/poetry.lock @@ -29,38 +29,6 @@ files = [ astroid = ["astroid (>=2,<4)"] test = ["astroid (>=2,<4)", "pytest", "pytest-cov", "pytest-xdist"] -[[package]] -name = "atomicwrites" -version = "1.4.1" -description = "Atomic file writes." -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" -groups = ["test"] -markers = "sys_platform == \"win32\"" -files = [ - {file = "atomicwrites-1.4.1.tar.gz", hash = "sha256:81b2c9071a49367a7f770170e5eec8cb66567cfbbc8c73d20ce5ca4a8d71cf11"}, -] - -[[package]] -name = "attrs" -version = "24.3.0" -description = "Classes Without Boilerplate" -optional = false -python-versions = ">=3.8" -groups = ["test"] -files = [ - {file = "attrs-24.3.0-py3-none-any.whl", hash = "sha256:ac96cd038792094f438ad1f6ff80837353805ac950cd2aa0e0625ef19850c308"}, - {file = "attrs-24.3.0.tar.gz", hash = "sha256:8f5c07333d543103541ba7be0e2ce16eeee8130cb0b3f9238ab904ce1e85baff"}, -] - -[package.extras] -benchmark = ["cloudpickle", "hypothesis", "mypy (>=1.11.1)", "pympler", "pytest (>=4.3.0)", "pytest-codspeed", "pytest-mypy-plugins", "pytest-xdist[psutil]"] -cov = ["cloudpickle", "coverage[toml] (>=5.3)", "hypothesis", "mypy (>=1.11.1)", "pympler", "pytest (>=4.3.0)", "pytest-mypy-plugins", "pytest-xdist[psutil]"] -dev = ["cloudpickle", "hypothesis", "mypy (>=1.11.1)", "pre-commit-uv", "pympler", "pytest (>=4.3.0)", "pytest-mypy-plugins", "pytest-xdist[psutil]"] -docs = ["cogapp", "furo", "myst-parser", "sphinx", "sphinx-notfound-page", "sphinxcontrib-towncrier", "towncrier (<24.7)"] -tests = ["cloudpickle", "hypothesis", "mypy (>=1.11.1)", "pympler", "pytest (>=4.3.0)", "pytest-mypy-plugins", "pytest-xdist[psutil]"] -tests-mypy = ["mypy (>=1.11.1)", "pytest-mypy-plugins"] - [[package]] name = "babel" version = "2.16.0" @@ -419,7 +387,7 @@ version = "1.2.2" description = "Backport of PEP 654 (exception groups)" optional = false python-versions = ">=3.7" -groups = ["dev"] +groups = ["dev", "test"] markers = "python_version < \"3.11\"" files = [ {file = "exceptiongroup-1.2.2-py3-none-any.whl", hash = "sha256:3111b9d131c238bec2f8f516e123e14ba243563fb135d3fe885990585aa7795b"}, @@ -1394,23 +1362,23 @@ testing = ["pytest", "pytest-benchmark"] [[package]] name = "poethepoet" -version = "0.32.1" +version = "0.32.2" description = "A task runner that works well with poetry." optional = false python-versions = ">=3.9" groups = ["dev"] files = [ - {file = "poethepoet-0.32.1-py3-none-any.whl", hash = "sha256:d1e0a52a2f677870fac17dfb26bfe4910242756ac821443ef31f90ad26227c2d"}, - {file = "poethepoet-0.32.1.tar.gz", hash = "sha256:471e1a025812dcd3d2997e30989681be5ab0a49232ee5fba94859629671c9584"}, + {file = "poethepoet-0.32.2-py3-none-any.whl", hash = "sha256:97e165de8e00b07d33fd8d72896fad8b20ccafcd327b1118bb6a3da26af38d33"}, + {file = "poethepoet-0.32.2.tar.gz", hash = "sha256:1d68871dac1b191e27bd68fea57d0e01e9afbba3fcd01dbe6f6bc3fcb071fe4c"}, ] [package.dependencies] pastel = ">=0.2.1,<0.3.0" -pyyaml = ">=6.0.2,<7.0.0" +pyyaml = ">=6.0.2,<7.0" tomli = {version = ">=1.2.2", markers = "python_version < \"3.11\""} [package.extras] -poetry-plugin = ["poetry (>=1.0,<3.0)"] +poetry-plugin = ["poetry (>=1.2.0,<3.0.0)"] [[package]] name = "pre-commit" @@ -1526,18 +1494,6 @@ files = [ [package.extras] tests = ["pytest"] -[[package]] -name = "py" -version = "1.11.0" -description = "library with cross-python path, ini-parsing, io, code, log facilities" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" -groups = ["test"] -files = [ - {file = "py-1.11.0-py2.py3-none-any.whl", hash = "sha256:607c53218732647dff4acdfcd50cb62615cedf612e72d1724fb1a0cc6405b378"}, - {file = "py-1.11.0.tar.gz", hash = "sha256:51c75c4126074b472f746a24399ad32f6053d1b34b68d2fa41e558e6f4a98719"}, -] - [[package]] name = "pycparser" version = "2.22" @@ -1608,28 +1564,26 @@ nodejs = ["nodejs-wheel-binaries"] [[package]] name = "pytest" -version = "6.2.5" +version = "8.3.4" description = "pytest: simple powerful testing with Python" optional = false -python-versions = ">=3.6" +python-versions = ">=3.8" groups = ["test"] files = [ - {file = "pytest-6.2.5-py3-none-any.whl", hash = "sha256:7310f8d27bc79ced999e760ca304d69f6ba6c6649c0b60fb0e04a4a77cacc134"}, - {file = "pytest-6.2.5.tar.gz", hash = "sha256:131b36680866a76e6781d13f101efb86cf674ebb9762eb70d3082b6f29889e89"}, + {file = "pytest-8.3.4-py3-none-any.whl", hash = "sha256:50e16d954148559c9a74109af1eaf0c945ba2d8f30f0a3d3335edde19788b6f6"}, + {file = "pytest-8.3.4.tar.gz", hash = "sha256:965370d062bce11e73868e0335abac31b4d3de0e82f4007408d242b4f8610761"}, ] [package.dependencies] -atomicwrites = {version = ">=1.0", markers = "sys_platform == \"win32\""} -attrs = ">=19.2.0" colorama = {version = "*", markers = "sys_platform == \"win32\""} +exceptiongroup = {version = ">=1.0.0rc8", markers = "python_version < \"3.11\""} iniconfig = "*" packaging = "*" -pluggy = ">=0.12,<2.0" -py = ">=1.8.2" -toml = "*" +pluggy = ">=1.5,<2" +tomli = {version = ">=1", markers = "python_version < \"3.11\""} [package.extras] -testing = ["argcomplete", "hypothesis (>=3.56)", "mock", "nose", "requests", "xmlschema"] +dev = ["argcomplete", "attrs (>=19.2)", "hypothesis (>=3.56)", "mock", "pygments (>=2.7.2)", "requests", "setuptools", "xmlschema"] [[package]] name = "python-dateutil" @@ -2082,25 +2036,13 @@ pure-eval = "*" [package.extras] tests = ["cython", "littleutils", "pygments", "pytest", "typeguard"] -[[package]] -name = "toml" -version = "0.10.2" -description = "Python Library for Tom's Obvious, Minimal Language" -optional = false -python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*" -groups = ["test"] -files = [ - {file = "toml-0.10.2-py2.py3-none-any.whl", hash = "sha256:806143ae5bfb6a3c6e736a764057db0e6a0e05e338b5630894a5f779cabb4f9b"}, - {file = "toml-0.10.2.tar.gz", hash = "sha256:b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f"}, -] - [[package]] name = "tomli" version = "2.2.1" description = "A lil' TOML parser" optional = false python-versions = ">=3.8" -groups = ["dev"] +groups = ["dev", "test"] markers = "python_version < \"3.11\"" files = [ {file = "tomli-2.2.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:678e4fa69e4575eb77d103de3df8a895e1591b48e740211bd1067378c69e8249"}, @@ -2283,4 +2225,4 @@ files = [ [metadata] lock-version = "2.1" python-versions = "^3.10" -content-hash = "594fbb0562dcf22ee6b96fdc06819814c00f698017f901978604ff0fb1394191" +content-hash = "82fe92cf46411a2c6b5eb2ec9691a80653a829fa603e3ef8dae8348afd5dd09d" diff --git a/pyproject.toml b/pyproject.toml index 9130f0a2..dda0efb3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -37,14 +37,14 @@ typing-extensions = "^4.7.1" [tool.poetry.group.dev.dependencies] pre-commit = "^2.17.0" grpcio-tools = "^1.54.2" -mkdocs-material = {version = "^9.5.49", python = ">=3.10"} -mkdocstrings = {version = "^0.27.0", python = ">=3.10", extras = ["python"]} -poethepoet = ">=0.9.0" +mkdocs-material = {version = "^9.5.49"} +mkdocstrings = {version = "^0.27.0", extras = ["python"]} +poethepoet = "^0.32.2" pyright = "^1.1.391" ipykernel = "^6.29.5" [tool.poetry.group.test.dependencies] -pytest = "^6.2.5" +pytest = "^8.3.4" protobuf = "^4" [tool.ruff]