From 156b6ba5a3783919f971962768c4dfc55b043240 Mon Sep 17 00:00:00 2001 From: Orfeas Kourkakis Date: Fri, 6 Dec 2024 10:26:29 +0200 Subject: [PATCH 1/2] chore: update python dependencies + pin pip --- requirements-fmt.txt | 16 ++-- requirements-integration.txt | 97 ++++++++++--------- requirements-lint.txt | 30 +++--- requirements-unit.txt | 176 +++++++++++++++++++++++++++-------- requirements.txt | 162 +++++++++++++++++++++++++------- tox.ini | 2 + 6 files changed, 340 insertions(+), 143 deletions(-) diff --git a/requirements-fmt.txt b/requirements-fmt.txt index a0318fe..9aa22f9 100644 --- a/requirements-fmt.txt +++ b/requirements-fmt.txt @@ -4,21 +4,21 @@ # # pip-compile requirements-fmt.in # -black==23.7.0 +black==24.8.0 # via -r requirements-fmt.in -click==8.1.6 +click==8.1.7 # via black -isort==5.12.0 +isort==5.13.2 # via -r requirements-fmt.in mypy-extensions==1.0.0 # via black -packaging==23.1 +packaging==24.2 # via black -pathspec==0.11.2 +pathspec==0.12.1 # via black -platformdirs==3.10.0 +platformdirs==4.3.6 # via black -tomli==2.0.1 +tomli==2.2.1 # via black -typing-extensions==4.7.1 +typing-extensions==4.12.2 # via black diff --git a/requirements-integration.txt b/requirements-integration.txt index f6823be..411a134 100644 --- a/requirements-integration.txt +++ b/requirements-integration.txt @@ -4,41 +4,45 @@ # # pip-compile requirements-integration.in # -aiohttp==3.9.5 +aiohappyeyeballs==2.4.4 + # via aiohttp +aiohttp==3.10.11 # via -r requirements-integration.in aiosignal==1.3.1 # via aiohttp -anyio==4.4.0 +anyio==4.5.2 # via httpx -asttokens==2.4.1 +asttokens==3.0.0 # via stack-data -async-timeout==4.0.3 +async-timeout==5.0.1 # via aiohttp -attrs==23.2.0 +attrs==24.2.0 # via # aiohttp # jsonschema backcall==0.2.0 # via ipython -bcrypt==4.1.3 +backports-strenum==1.3.1 + # via juju +bcrypt==4.2.1 # via paramiko -cachetools==5.3.3 +cachetools==5.5.0 # via google-auth -certifi==2024.7.4 +certifi==2024.8.30 # via # httpcore # httpx # kubernetes # requests -cffi==1.16.0 +cffi==1.17.1 # via # cryptography # pynacl -charmed-kubeflow-chisme==0.4.1 +charmed-kubeflow-chisme==0.4.3 # via -r requirements-integration.in -charset-normalizer==3.3.2 +charset-normalizer==3.4.0 # via requests -cryptography==42.0.8 +cryptography==44.0.0 # via paramiko decorator==5.1.1 # via @@ -46,33 +50,33 @@ decorator==5.1.1 # ipython deepdiff==6.2.1 # via charmed-kubeflow-chisme -exceptiongroup==1.2.1 +exceptiongroup==1.2.2 # via # anyio # pytest -executing==2.0.1 +executing==2.1.0 # via stack-data -frozenlist==1.4.1 +frozenlist==1.5.0 # via # aiohttp # aiosignal -google-auth==2.31.0 +google-auth==2.36.0 # via kubernetes h11==0.14.0 # via httpcore -httpcore==1.0.5 +httpcore==1.0.7 # via httpx -httpx==0.27.0 +httpx==0.27.2 # via lightkube hvac==2.3.0 # via juju -idna==3.7 +idna==3.10 # via # anyio # httpx # requests # yarl -importlib-resources==6.4.0 +importlib-resources==6.4.5 # via jsonschema iniconfig==2.0.0 # via pytest @@ -80,7 +84,7 @@ ipdb==0.13.13 # via pytest-operator ipython==8.12.3 # via ipdb -jedi==0.19.1 +jedi==0.19.2 # via ipython jinja2==3.1.4 # via @@ -89,16 +93,16 @@ jinja2==3.1.4 # pytest-operator jsonschema==4.17.3 # via serialized-data-interface -juju==3.5.0.0 +juju==3.6.0.0 # via # -r requirements-integration.in # charmed-kubeflow-chisme # pytest-operator kubernetes==30.1.0 # via juju -lightkube==0.15.3 +lightkube==0.15.6 # via charmed-kubeflow-chisme -lightkube-models==1.30.0.8 +lightkube-models==1.31.1.8 # via lightkube macaroonbakery==1.3.4 # via juju @@ -106,7 +110,7 @@ markupsafe==2.1.5 # via jinja2 matplotlib-inline==0.1.7 # via ipython -multidict==6.0.5 +multidict==6.1.0 # via # aiohttp # yarl @@ -116,17 +120,17 @@ oauthlib==3.2.2 # via # kubernetes # requests-oauthlib -ops==2.14.1 +ops==2.17.1 # via # charmed-kubeflow-chisme # serialized-data-interface ordered-set==4.1.0 # via deepdiff -packaging==24.1 +packaging==24.2 # via # juju # pytest -paramiko==3.4.0 +paramiko==3.5.0 # via juju parso==0.8.4 # via jedi @@ -138,20 +142,22 @@ pkgutil-resolve-name==1.3.10 # via jsonschema pluggy==1.5.0 # via pytest -prompt-toolkit==3.0.47 +prompt-toolkit==3.0.48 # via ipython -protobuf==5.27.2 +propcache==0.2.0 + # via yarl +protobuf==5.29.1 # via macaroonbakery ptyprocess==0.7.0 # via pexpect -pure-eval==0.2.2 +pure-eval==0.2.3 # via stack-data -pyasn1==0.6.0 +pyasn1==0.6.1 # via # juju # pyasn1-modules # rsa -pyasn1-modules==0.4.0 +pyasn1-modules==0.4.1 # via google-auth pycparser==2.22 # via cffi @@ -170,7 +176,7 @@ pyrfc3339==1.1 # macaroonbakery pyrsistent==0.20.0 # via jsonschema -pytest==8.2.2 +pytest==8.3.4 # via # -r requirements-integration.in # pytest-asyncio @@ -178,15 +184,15 @@ pytest==8.2.2 # pytest-timeout pytest-asyncio==0.21.2 # via pytest-operator -pytest-operator==0.35.0 +pytest-operator==0.38.0 # via -r requirements-integration.in pytest-timeout==2.3.1 # via -r requirements-integration.in python-dateutil==2.9.0.post0 # via kubernetes -pytz==2024.1 +pytz==2024.2 # via pyrfc3339 -pyyaml==6.0.1 +pyyaml==6.0.2 # via # -r requirements-integration.in # juju @@ -213,9 +219,8 @@ ruamel-yaml-clib==0.2.8 # via ruamel-yaml serialized-data-interface==0.7.0 # via charmed-kubeflow-chisme -six==1.16.0 +six==1.17.0 # via - # asttokens # kubernetes # macaroonbakery # pymacaroons @@ -226,9 +231,9 @@ sniffio==1.3.1 # httpx stack-data==0.6.3 # via ipython -tenacity==8.4.2 +tenacity==9.0.0 # via charmed-kubeflow-chisme -tomli==2.0.1 +tomli==2.2.1 # via # ipdb # pytest @@ -242,10 +247,12 @@ typing-extensions==4.12.2 # via # anyio # ipython + # juju + # multidict # typing-inspect typing-inspect==0.9.0 # via juju -urllib3==2.2.2 +urllib3==2.2.3 # via # kubernetes # requests @@ -255,9 +262,9 @@ websocket-client==1.8.0 # via # kubernetes # ops -websockets==12.0 +websockets==13.1 # via juju -yarl==1.9.4 +yarl==1.15.2 # via aiohttp -zipp==3.19.2 +zipp==3.20.2 # via importlib-resources diff --git a/requirements-lint.txt b/requirements-lint.txt index 1edc2e8..36e0798 100644 --- a/requirements-lint.txt +++ b/requirements-lint.txt @@ -4,47 +4,47 @@ # # pip-compile requirements-lint.in # -black==23.7.0 +black==24.8.0 # via -r requirements-lint.in -click==8.1.6 +click==8.1.7 # via black -codespell==2.2.5 +codespell==2.3.0 # via -r requirements-lint.in -flake8==6.0.0 +flake8==7.0.0 # via # -r requirements-lint.in # flake8-builtins # pep8-naming # pyproject-flake8 -flake8-builtins==2.1.0 +flake8-builtins==2.5.0 # via -r requirements-lint.in flake8-copyright==0.2.4 # via -r requirements-lint.in -isort==5.12.0 +isort==5.13.2 # via -r requirements-lint.in mccabe==0.7.0 # via flake8 mypy-extensions==1.0.0 # via black -packaging==23.1 +packaging==24.2 # via black -pathspec==0.11.2 +pathspec==0.12.1 # via black -pep8-naming==0.13.3 +pep8-naming==0.14.1 # via -r requirements-lint.in -platformdirs==3.10.0 +platformdirs==4.3.6 # via black -pycodestyle==2.10.0 +pycodestyle==2.11.1 # via flake8 -pyflakes==3.0.1 +pyflakes==3.2.0 # via flake8 -pyproject-flake8==6.0.0.post1 +pyproject-flake8==7.0.0 # via -r requirements-lint.in -tomli==2.0.1 +tomli==2.2.1 # via # black # pyproject-flake8 -typing-extensions==4.7.1 +typing-extensions==4.12.2 # via black # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements-unit.txt b/requirements-unit.txt index 3bcce9a..07a8ecf 100644 --- a/requirements-unit.txt +++ b/requirements-unit.txt @@ -6,41 +6,58 @@ # annotated-types==0.7.0 # via pydantic -anyio==3.7.1 - # via httpcore -attrs==23.1.0 +anyio==4.5.2 + # via httpx +attrs==24.2.0 # via jsonschema -certifi==2023.7.22 +backports-strenum==1.3.1 + # via juju +bcrypt==4.2.1 + # via paramiko +cachetools==5.5.0 + # via google-auth +certifi==2024.8.30 # via # httpcore # httpx + # kubernetes # requests -charmed-kubeflow-chisme==0.2.0 +cffi==1.17.1 + # via + # cryptography + # pynacl +charmed-kubeflow-chisme==0.4.3 # via -r requirements.in -charset-normalizer==3.2.0 +charset-normalizer==3.4.0 # via requests -cosl==0.0.12 +cosl==0.0.45 # via -r requirements.in -coverage==7.3.0 +coverage==7.6.1 # via -r requirements-unit.in +cryptography==44.0.0 + # via paramiko deepdiff==6.2.1 # via charmed-kubeflow-chisme -exceptiongroup==1.1.2 +exceptiongroup==1.2.2 # via # anyio # pytest +google-auth==2.36.0 + # via kubernetes h11==0.14.0 # via httpcore -httpcore==0.17.3 +httpcore==1.0.7 # via httpx -httpx==0.24.1 +httpx==0.27.2 # via lightkube -idna==3.4 +hvac==2.3.0 + # via juju +idna==3.10 # via # anyio # httpx # requests -importlib-resources==6.0.1 +importlib-resources==6.4.5 # via jsonschema iniconfig==2.0.0 # via pytest @@ -48,15 +65,29 @@ jinja2==3.1.4 # via charmed-kubeflow-chisme jsonschema==4.17.3 # via serialized-data-interface -lightkube==0.14.0 +juju==3.6.0.0 # via charmed-kubeflow-chisme -lightkube-models==1.27.1.4 +kubernetes==30.1.0 + # via juju +lightkube==0.15.6 + # via + # charmed-kubeflow-chisme + # cosl +lightkube-models==1.31.1.8 # via lightkube -markupsafe==2.1.3 +macaroonbakery==1.3.4 + # via juju +markupsafe==2.1.5 # via jinja2 +mypy-extensions==1.0.0 + # via typing-inspect +oauthlib==3.2.2 + # via + # kubernetes + # requests-oauthlib oci-image==1.0.0 # via -r requirements.in -ops==2.14.1 +ops==2.17.1 # via # -r requirements-unit.in # -r requirements.in @@ -65,62 +96,125 @@ ops==2.14.1 # serialized-data-interface ordered-set==4.1.0 # via deepdiff -packaging==23.1 - # via pytest +packaging==24.2 + # via + # juju + # pytest +paramiko==3.5.0 + # via juju pkgutil-resolve-name==1.3.10 # via jsonschema -pluggy==1.2.0 +pluggy==1.5.0 # via pytest -pydantic==2.8.2 - # via -r requirements.in -pydantic-core==2.20.1 +protobuf==5.29.1 + # via macaroonbakery +pyasn1==0.6.1 + # via + # juju + # pyasn1-modules + # rsa +pyasn1-modules==0.4.1 + # via google-auth +pycparser==2.22 + # via cffi +pydantic==2.10.3 + # via + # -r requirements.in + # cosl +pydantic-core==2.27.1 # via pydantic -pyrsistent==0.19.3 +pymacaroons==0.13.0 + # via macaroonbakery +pynacl==1.5.0 + # via + # macaroonbakery + # paramiko + # pymacaroons +pyrfc3339==1.1 + # via + # juju + # macaroonbakery +pyrsistent==0.20.0 # via jsonschema -pytest==7.4.0 +pytest==8.3.4 # via # -r requirements-unit.in # pytest-lazy-fixture # pytest-mock pytest-lazy-fixture==0.6.3 # via -r requirements-unit.in -pytest-mock==3.11.1 +pytest-mock==3.14.0 # via -r requirements-unit.in -pyyaml==6.0.1 +python-dateutil==2.9.0.post0 + # via kubernetes +pytz==2024.2 + # via pyrfc3339 +pyyaml==6.0.2 # via # -r requirements-unit.in # cosl + # juju + # kubernetes # lightkube # ops # serialized-data-interface -requests==2.31.0 - # via serialized-data-interface -ruamel-yaml==0.17.32 +requests==2.32.3 + # via + # hvac + # kubernetes + # macaroonbakery + # requests-oauthlib + # serialized-data-interface +requests-oauthlib==2.0.0 + # via kubernetes +rsa==4.9 + # via google-auth +ruamel-yaml==0.18.6 # via charmed-kubeflow-chisme -ruamel-yaml-clib==0.2.7 +ruamel-yaml-clib==0.2.8 # via ruamel-yaml serialized-data-interface==0.3.6 # via # -r requirements.in # charmed-kubeflow-chisme -sniffio==1.3.0 +six==1.17.0 + # via + # kubernetes + # macaroonbakery + # pymacaroons + # python-dateutil +sniffio==1.3.1 # via # anyio - # httpcore # httpx -tenacity==8.2.2 - # via charmed-kubeflow-chisme -tomli==2.0.1 +tenacity==9.0.0 + # via + # charmed-kubeflow-chisme + # cosl +tomli==2.2.1 # via pytest +toposort==1.10 + # via juju typing-extensions==4.12.2 # via # annotated-types + # anyio # cosl + # juju # pydantic # pydantic-core -urllib3==2.0.4 - # via requests -websocket-client==1.6.1 - # via ops -zipp==3.16.2 + # typing-inspect +typing-inspect==0.9.0 + # via juju +urllib3==2.2.3 + # via + # kubernetes + # requests +websocket-client==1.8.0 + # via + # kubernetes + # ops +websockets==13.1 + # via juju +zipp==3.20.2 # via importlib-resources diff --git a/requirements.txt b/requirements.txt index 2604ce3..ac2ae16 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,51 +6,82 @@ # annotated-types==0.7.0 # via pydantic -anyio==3.7.1 - # via httpcore -attrs==23.1.0 +anyio==4.5.2 + # via httpx +attrs==24.2.0 # via jsonschema -certifi==2023.7.22 +backports-strenum==1.3.1 + # via juju +bcrypt==4.2.1 + # via paramiko +cachetools==5.5.0 + # via google-auth +certifi==2024.8.30 # via # httpcore # httpx + # kubernetes # requests -charmed-kubeflow-chisme==0.2.0 +cffi==1.17.1 + # via + # cryptography + # pynacl +charmed-kubeflow-chisme==0.4.3 # via -r requirements.in -charset-normalizer==3.2.0 +charset-normalizer==3.4.0 # via requests -cosl==0.0.12 +cosl==0.0.45 # via -r requirements.in +cryptography==44.0.0 + # via paramiko deepdiff==6.2.1 # via charmed-kubeflow-chisme -exceptiongroup==1.1.2 +exceptiongroup==1.2.2 # via anyio +google-auth==2.36.0 + # via kubernetes h11==0.14.0 # via httpcore -httpcore==0.17.3 +httpcore==1.0.7 # via httpx -httpx==0.24.1 +httpx==0.27.2 # via lightkube -idna==3.4 +hvac==2.3.0 + # via juju +idna==3.10 # via # anyio # httpx # requests -importlib-resources==6.0.1 +importlib-resources==6.4.5 # via jsonschema jinja2==3.1.4 # via charmed-kubeflow-chisme jsonschema==4.17.3 # via serialized-data-interface -lightkube==0.14.0 +juju==3.6.0.0 # via charmed-kubeflow-chisme -lightkube-models==1.27.1.4 +kubernetes==30.1.0 + # via juju +lightkube==0.15.6 + # via + # charmed-kubeflow-chisme + # cosl +lightkube-models==1.31.1.8 # via lightkube -markupsafe==2.1.3 +macaroonbakery==1.3.4 + # via juju +markupsafe==2.1.5 # via jinja2 +mypy-extensions==1.0.0 + # via typing-inspect +oauthlib==3.2.2 + # via + # kubernetes + # requests-oauthlib oci-image==1.0.0 # via -r requirements.in -ops==2.14.1 +ops==2.17.1 # via # -r requirements.in # charmed-kubeflow-chisme @@ -58,46 +89,109 @@ ops==2.14.1 # serialized-data-interface ordered-set==4.1.0 # via deepdiff +packaging==24.2 + # via juju +paramiko==3.5.0 + # via juju pkgutil-resolve-name==1.3.10 # via jsonschema -pydantic==2.8.2 - # via -r requirements.in -pydantic-core==2.20.1 +protobuf==5.29.1 + # via macaroonbakery +pyasn1==0.6.1 + # via + # juju + # pyasn1-modules + # rsa +pyasn1-modules==0.4.1 + # via google-auth +pycparser==2.22 + # via cffi +pydantic==2.10.3 + # via + # -r requirements.in + # cosl +pydantic-core==2.27.1 # via pydantic -pyrsistent==0.19.3 +pymacaroons==0.13.0 + # via macaroonbakery +pynacl==1.5.0 + # via + # macaroonbakery + # paramiko + # pymacaroons +pyrfc3339==1.1 + # via + # juju + # macaroonbakery +pyrsistent==0.20.0 # via jsonschema -pyyaml==6.0.1 +python-dateutil==2.9.0.post0 + # via kubernetes +pytz==2024.2 + # via pyrfc3339 +pyyaml==6.0.2 # via # cosl + # juju + # kubernetes # lightkube # ops # serialized-data-interface -requests==2.31.0 - # via serialized-data-interface -ruamel-yaml==0.17.32 +requests==2.32.3 + # via + # hvac + # kubernetes + # macaroonbakery + # requests-oauthlib + # serialized-data-interface +requests-oauthlib==2.0.0 + # via kubernetes +rsa==4.9 + # via google-auth +ruamel-yaml==0.18.6 # via charmed-kubeflow-chisme -ruamel-yaml-clib==0.2.7 +ruamel-yaml-clib==0.2.8 # via ruamel-yaml serialized-data-interface==0.3.6 # via # -r requirements.in # charmed-kubeflow-chisme -sniffio==1.3.0 +six==1.17.0 + # via + # kubernetes + # macaroonbakery + # pymacaroons + # python-dateutil +sniffio==1.3.1 # via # anyio - # httpcore # httpx -tenacity==8.2.2 - # via charmed-kubeflow-chisme +tenacity==9.0.0 + # via + # charmed-kubeflow-chisme + # cosl +toposort==1.10 + # via juju typing-extensions==4.12.2 # via # annotated-types + # anyio # cosl + # juju # pydantic # pydantic-core -urllib3==2.0.4 - # via requests -websocket-client==1.6.1 - # via ops -zipp==3.16.2 + # typing-inspect +typing-inspect==0.9.0 + # via juju +urllib3==2.2.3 + # via + # kubernetes + # requests +websocket-client==1.8.0 + # via + # kubernetes + # ops +websockets==13.1 + # via juju +zipp==3.20.2 # via importlib-resources diff --git a/tox.ini b/tox.ini index 7d22269..2e24461 100644 --- a/tox.ini +++ b/tox.ini @@ -37,6 +37,8 @@ commands = bash -c 'for pattern in "requirements.in" "requirements-fmt.in" "requirements*.in"; do find . -type f -name "$pattern" -exec bash -c "cd \$(dirname "{}") && pip-compile --resolver=backtracking \$(basename "{}")" \;; done' deps = pip-tools + # Pin due to https://github.com/jazzband/pip-tools/issues/2131 + pip==24.2 description = Update requirements files by executing pip-compile on all requirements*.in files, including those in subdirs. [testenv:fmt] From cfef791ffd9b89655ce0c19994acd9f29b900333 Mon Sep 17 00:00:00 2001 From: Orfeas Kourkakis Date: Mon, 9 Dec 2024 17:41:27 +0200 Subject: [PATCH 2/2] fix: remove unused pytest-lazy-fixture package --- requirements-unit.in | 1 - requirements-unit.txt | 3 --- 2 files changed, 4 deletions(-) diff --git a/requirements-unit.in b/requirements-unit.in index 421af66..82a8e55 100644 --- a/requirements-unit.in +++ b/requirements-unit.in @@ -17,6 +17,5 @@ coverage ops pytest pytest-mock -pytest-lazy-fixture pyyaml -r requirements.in diff --git a/requirements-unit.txt b/requirements-unit.txt index 07a8ecf..c8aaa70 100644 --- a/requirements-unit.txt +++ b/requirements-unit.txt @@ -139,10 +139,7 @@ pyrsistent==0.20.0 pytest==8.3.4 # via # -r requirements-unit.in - # pytest-lazy-fixture # pytest-mock -pytest-lazy-fixture==0.6.3 - # via -r requirements-unit.in pytest-mock==3.14.0 # via -r requirements-unit.in python-dateutil==2.9.0.post0