From 5fb876426816091bc92ee6d835aa1ef39658805e Mon Sep 17 00:00:00 2001 From: Jiri Date: Fri, 22 May 2026 15:35:48 +0200 Subject: [PATCH 1/5] Click dependency unlocked --- poetry.lock | 8 ++++---- pyproject.toml | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/poetry.lock b/poetry.lock index f22e5b1c..b5b39945 100644 --- a/poetry.lock +++ b/poetry.lock @@ -533,7 +533,7 @@ version = "8.0.4" description = "Composable command line interface toolkit" optional = false python-versions = ">=3.6" -groups = ["main", "dev", "docs"] +groups = ["dev", "docs"] files = [ {file = "click-8.0.4-py3-none-any.whl", hash = "sha256:6a7a62563bbfabfda3a38f3023a1db4a35978c0abd76f6c9605ecd6554d6d9b1"}, {file = "click-8.0.4.tar.gz", hash = "sha256:8458d7b1287c5fb128c90e23381cf99dcde74beaf6c7ff6384ce84d6fe090adb"}, @@ -548,12 +548,12 @@ version = "0.4.6" description = "Cross-platform colored terminal text." optional = false python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*,>=2.7" -groups = ["main", "dev", "docs", "test"] +groups = ["dev", "docs", "test"] files = [ {file = "colorama-0.4.6-py2.py3-none-any.whl", hash = "sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6"}, {file = "colorama-0.4.6.tar.gz", hash = "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44"}, ] -markers = {main = "platform_system == \"Windows\"", dev = "platform_system == \"Windows\" or os_name == \"nt\" or sys_platform == \"win32\"", test = "sys_platform == \"win32\""} +markers = {dev = "os_name == \"nt\" or platform_system == \"Windows\" or sys_platform == \"win32\"", test = "sys_platform == \"win32\""} [[package]] name = "coverage" @@ -3416,4 +3416,4 @@ type = ["pytest-mypy"] [metadata] lock-version = "2.1" python-versions = "^3.10" -content-hash = "f97a18adfb4c1d4839a04967a1cdd839b4eaca8f59dd27382007aac73bcc493d" +content-hash = "89f6236ac8409fdc24e14578d1f0e67aa55be8e981e2aa8463c36c42f5c60ecc" diff --git a/pyproject.toml b/pyproject.toml index 53a5f7e3..d05a9d8e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -48,7 +48,6 @@ sortedcontainers = "==2.4.0" bcrypt = "==5.0.0" pynacl = "==1.6.0" setuptools = "<82" -click = "<8.1" packaging = ">=23.0" [tool.poetry.group.dev] @@ -77,6 +76,8 @@ pyyaml = "==5.3.1" virtualenv = ">=20.26.6" marshmallow = "<4.0.0" sortedcontainers-stubs = "2.4.3" +click = "*" + [tool.poetry.group.docs] optional = true From e6d0af15bf9ec142afd8920f1077ee3288c20a6d Mon Sep 17 00:00:00 2001 From: Jiri Date: Fri, 22 May 2026 15:37:47 +0200 Subject: [PATCH 2/5] Poetry lock --- poetry.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/poetry.lock b/poetry.lock index b5b39945..4f76717b 100644 --- a/poetry.lock +++ b/poetry.lock @@ -3416,4 +3416,4 @@ type = ["pytest-mypy"] [metadata] lock-version = "2.1" python-versions = "^3.10" -content-hash = "89f6236ac8409fdc24e14578d1f0e67aa55be8e981e2aa8463c36c42f5c60ecc" +content-hash = "5a8d1b8e121cf630610f2d31f057ecdc68be7b13ecf03ce23665f7f0879bdf2d" From bb86569d9f6cbd8650b0ee96c8c6ee311f6b3248 Mon Sep 17 00:00:00 2001 From: Jiri Date: Fri, 22 May 2026 15:46:07 +0200 Subject: [PATCH 3/5] Moved setuptools to dev --- poetry.lock | 4 ++-- pyproject.toml | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/poetry.lock b/poetry.lock index 4f76717b..aae1768f 100644 --- a/poetry.lock +++ b/poetry.lock @@ -2897,7 +2897,7 @@ version = "81.0.0" description = "Easily download, build, install, upgrade, and uninstall Python packages" optional = false python-versions = ">=3.9" -groups = ["main", "dev"] +groups = ["dev"] files = [ {file = "setuptools-81.0.0-py3-none-any.whl", hash = "sha256:fdd925d5c5d9f62e4b74b30d6dd7828ce236fd6ed998a08d81de62ce5a6310d6"}, {file = "setuptools-81.0.0.tar.gz", hash = "sha256:487b53915f52501f0a79ccfd0c02c165ffe06631443a886740b91af4b7a5845a"}, @@ -3416,4 +3416,4 @@ type = ["pytest-mypy"] [metadata] lock-version = "2.1" python-versions = "^3.10" -content-hash = "5a8d1b8e121cf630610f2d31f057ecdc68be7b13ecf03ce23665f7f0879bdf2d" +content-hash = "9f6a01510c4233c569b54433a3b572a1818e32fcad769a025dcd84cd011deda5" diff --git a/pyproject.toml b/pyproject.toml index d05a9d8e..5917b706 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -47,7 +47,6 @@ virtualenv = ">=20.26.6" sortedcontainers = "==2.4.0" bcrypt = "==5.0.0" pynacl = "==1.6.0" -setuptools = "<82" packaging = ">=23.0" [tool.poetry.group.dev] @@ -77,7 +76,7 @@ virtualenv = ">=20.26.6" marshmallow = "<4.0.0" sortedcontainers-stubs = "2.4.3" click = "*" - +setuptools = "<82" [tool.poetry.group.docs] optional = true From 21570f30b1f63d3ebe110e48e52f25ad7d860a6a Mon Sep 17 00:00:00 2001 From: Jiri Date: Fri, 22 May 2026 16:01:06 +0200 Subject: [PATCH 4/5] Liccheck fix --- poetry.lock | 10 +++++----- pyproject.toml | 7 ++++++- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/poetry.lock b/poetry.lock index aae1768f..99d9a2a5 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1468,7 +1468,7 @@ version = "0.9.2" description = "Check python packages from requirement.txt and report issues" optional = false python-versions = ">=3.5" -groups = ["dev"] +groups = ["liccheck"] files = [ {file = "liccheck-0.9.2-py2.py3-none-any.whl", hash = "sha256:15cbedd042515945fe9d58b62e0a5af2f2a7795def216f163bb35b3016a16637"}, {file = "liccheck-0.9.2.tar.gz", hash = "sha256:bdc2190f8e95af3c8f9c19edb784ba7d41ecb2bf9189422eae6112bf84c08cd5"}, @@ -2881,7 +2881,7 @@ version = "2.10.0" description = "A library implementing the 'SemVer' scheme." optional = false python-versions = ">=2.7" -groups = ["dev"] +groups = ["liccheck"] files = [ {file = "semantic_version-2.10.0-py2.py3-none-any.whl", hash = "sha256:de78a3b8e0feda74cabc54aab2da702113e33ac9d9eb9d2389bcf1f58b7d9177"}, {file = "semantic_version-2.10.0.tar.gz", hash = "sha256:bdabb6d336998cbb378d4b9db3a4b56a1e3235701dc05ea2690d9a997ed5041c"}, @@ -2897,7 +2897,7 @@ version = "81.0.0" description = "Easily download, build, install, upgrade, and uninstall Python packages" optional = false python-versions = ">=3.9" -groups = ["dev"] +groups = ["dev", "liccheck"] files = [ {file = "setuptools-81.0.0-py3-none-any.whl", hash = "sha256:fdd925d5c5d9f62e4b74b30d6dd7828ce236fd6ed998a08d81de62ce5a6310d6"}, {file = "setuptools-81.0.0.tar.gz", hash = "sha256:487b53915f52501f0a79ccfd0c02c165ffe06631443a886740b91af4b7a5845a"}, @@ -3037,7 +3037,7 @@ 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 = ["dev"] +groups = ["dev", "liccheck"] files = [ {file = "toml-0.10.2-py2.py3-none-any.whl", hash = "sha256:806143ae5bfb6a3c6e736a764057db0e6a0e05e338b5630894a5f779cabb4f9b"}, {file = "toml-0.10.2.tar.gz", hash = "sha256:b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f"}, @@ -3416,4 +3416,4 @@ type = ["pytest-mypy"] [metadata] lock-version = "2.1" python-versions = "^3.10" -content-hash = "9f6a01510c4233c569b54433a3b572a1818e32fcad769a025dcd84cd011deda5" +content-hash = "1201b319b6590da51c220f34a25f47ed4f0be82953c736e1038f0a7f836bfce1" diff --git a/pyproject.toml b/pyproject.toml index 5917b706..0ff8dafe 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -64,7 +64,6 @@ isort = "==5.10.1" darglint = "==1.8.1" vulture = "==2.6" pylint = "==2.15.5" -liccheck = "==0.9.2" flake8-copyright = "==0.2.3" grpcio-tools = ">=1.66.2" flake8-bugbear = "==22.10.25" @@ -76,6 +75,12 @@ virtualenv = ">=20.26.6" marshmallow = "<4.0.0" sortedcontainers-stubs = "2.4.3" click = "*" + +[tool.poetry.group.liccheck] +optional = true + +[tool.poetry.group.liccheck.dependencies] +liccheck = "==0.9.2" setuptools = "<82" [tool.poetry.group.docs] From 4182565912f7cb15295d6fa84a6248fdeef2bc5d Mon Sep 17 00:00:00 2001 From: Jiri Date: Fri, 22 May 2026 16:03:02 +0200 Subject: [PATCH 5/5] Tox fix --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index f7addf6b..4c0a3fb0 100644 --- a/tox.ini +++ b/tox.ini @@ -128,7 +128,7 @@ whitelist_externals = poetry bash commands = - poetry install --only main + poetry install --only main,liccheck poetry run python ./install_packages.py liccheck poetry run make liccheck