From 1164253132d4ddd470c16089c1d1bca489465f08 Mon Sep 17 00:00:00 2001 From: Alex Lowe Date: Wed, 29 Jan 2025 16:53:10 -0500 Subject: [PATCH] build(deps): update patch dependencies for Charmcraft 2.7 (#2122) This updates the patch versions of dependencies for Charmcraft 2.7 to fix things like the jinja2 issue. - Docs test failure expected as Charmcraft 2 doesn't have RTD docs - MacOS tests skipped because GitHub has pulled macos 12 --- requirements-dev.txt | 57 +++++++++++++++++++++--------------------- requirements-jammy.txt | 2 +- requirements.txt | 26 +++++++++---------- 3 files changed, 43 insertions(+), 42 deletions(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index ea544edfa..98a8963bd 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,37 +1,37 @@ attrs==23.1.0 black==23.12.1 -cachetools==5.3.2 +cachetools==5.3.3 certifi==2023.7.22 cffi==1.16.0 chardet==5.2.0 charset-normalizer==3.3.2 -click==8.1.7 +click==8.1.8 codespell==2.2.6 colorama==0.4.6 -coverage==7.4.1 +coverage==7.4.4 craft-cli==2.4.0 craft-parts==1.25.3 craft-providers==1.20.4 craft-store==2.5.0 -cryptography==43.0.1 -Deprecated==1.2.14 -distlib==0.3.8 +cryptography==43.0.3 +deprecated==1.2.18 +distlib==0.3.9 distro==1.8.0 -filelock==3.13.1 +filelock==3.13.4 flake8==7.0.0 humanize==4.8.0 idna==3.4 importlib-metadata==6.8.0 iniconfig==2.0.0 -jaraco.classes==3.3.0 +jaraco-classes==3.3.1 jeepney==0.8.0 -Jinja2==3.1.4 +jinja2==3.1.5 jsonschema==4.19.2 jsonschema-specifications==2023.7.1 keyring==24.2.0 -lxml==5.1.0 +lxml==5.1.1 macaroonbakery==1.3.4 -MarkupSafe==2.1.5 +markupsafe==2.1.5 mccabe==0.7.0 more-itertools==10.1.0 mypy==1.8.0 @@ -44,26 +44,26 @@ platformdirs==3.11.0 pluggy==1.4.0 protobuf==3.20.3 pycodestyle==2.11.1 -pycparser==2.21 -pydantic==1.10.19 +pycparser==2.22 +pydantic==1.10.21 pydantic-yaml==0.11.2 pydocstyle==6.3.0 -pyfakefs==5.3.4 +pyfakefs==5.3.5 pyflakes==3.2.0 pymacaroons==0.13.0 -PyNaCl==1.5.0 +pynacl==1.5.0 pyproject-api==1.6.1 -pyRFC3339==1.1 +pyrfc3339==1.1 pyright==1.1.377 -pytest==8.0.0 +pytest==8.0.2 pytest-check==2.3.1 pytest-cov==4.1.0 pytest-mock==3.12.0 -pytest-subprocess==1.5.2 +pytest-subprocess==1.5.3 python-dateutil==2.8.2 -pytz==2023.3.post1 +pytz==2023.4 pyxdg==0.28 -PyYAML==6.0.2 +pyyaml==6.0.2 referencing==0.30.2 requests==2.32.3 requests-toolbelt==1.0.0 @@ -71,22 +71,23 @@ requests-unixsocket2==0.4.2 responses==0.24.1 rpds-py==0.10.6 ruff==0.1.15 -SecretStorage==3.3.3 +secretstorage==3.3.3 +setuptools==75.3.0 six==1.16.0 snap-helpers==0.4.2 snowballstemmer==2.2.0 tabulate==0.9.0 tox==4.11.4 -types-Deprecated==1.2.9.20240311 -types-python-dateutil==2.8.19.20240106 -types-PyYAML==6.0.12.20240808 -types-requests==2.31.0.6 +types-deprecated==1.2.9.20240311 +types-python-dateutil==2.8.19.20240311 +types-pyyaml==6.0.12.20241230 +types-requests==2.31.0.20240406 types-setuptools==69.0.0.20240125 -types-tabulate==0.9.0.20240106 +types-tabulate==0.9.0.20241207 types-urllib3==1.26.25.14 -typing_extensions==4.8.0 +typing-extensions==4.8.0 urllib3==2.2.3 -virtualenv==20.25.0 +virtualenv==20.25.3 wrapt==1.15.0 yamllint==1.32.0 zipp==3.17.0 diff --git a/requirements-jammy.txt b/requirements-jammy.txt index d980580e3..7d0d0f1aa 100644 --- a/requirements-jammy.txt +++ b/requirements-jammy.txt @@ -1 +1 @@ -python-apt@https://launchpad.net/ubuntu/+archive/primary/+sourcefiles/python-apt/2.4.0ubuntu2/python-apt_2.4.0ubuntu2.tar.xz +python-apt@https://launchpad.net/ubuntu/+archive/primary/+sourcefiles/python-apt/2.4.0ubuntu4/python-apt_2.4.0ubuntu4.tar.xz diff --git a/requirements.txt b/requirements.txt index f317e1bcf..dc4bc8ea5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,47 +6,47 @@ craft-cli==2.4.0 craft-parts==1.25.3 craft-providers==1.20.4 craft-store==2.5.0 -cryptography==43.0.1 -Deprecated==1.2.14 +cryptography==43.0.3 +deprecated==1.2.18 distro==1.8.0 humanize==4.8.0 idna==3.4 importlib-metadata==6.8.0 -jaraco.classes==3.3.0 +jaraco-classes==3.3.1 jeepney==0.8.0 -Jinja2==3.1.4 +jinja2==3.1.5 jsonschema==4.19.2 jsonschema-specifications==2023.7.1 keyring==24.2.0 macaroonbakery==1.3.4 -MarkupSafe==2.1.5 +markupsafe==2.1.5 more-itertools==10.1.0 overrides==7.4.0 packaging==23.2 platformdirs==3.11.0 protobuf==3.20.3 pycparser==2.21 -pydantic==1.10.19 +pydantic==1.10.21 pydantic-yaml==0.11.2 pymacaroons==0.13.0 -PyNaCl==1.5.0 -pyRFC3339==1.1 +pynacl==1.5.0 +pyrfc3339==1.1 python-dateutil==2.8.2 pytz==2023.4 pyxdg==0.28 -PyYAML==6.0.2 +pyyaml==6.0.2 referencing==0.30.2 requests==2.32.3 requests-toolbelt==1.0.0 requests-unixsocket2==0.4.2 rpds-py==0.10.6 -SecretStorage==3.3.3 +secretstorage==3.3.3 six==1.16.0 snap-helpers==0.4.2 tabulate==0.9.0 -types-Deprecated==1.2.9.20240311 -types-PyYAML==6.0.12.20240808 -typing_extensions==4.8.0 +types-deprecated==1.2.9.20240311 +types-pyyaml==6.0.12.20241230 +typing-extensions==4.8.0 urllib3==2.2.3 wrapt==1.15.0 zipp==3.17.0