Skip to content

Commit

Permalink
Merge branch 'main' into hotfix-merge/3.2
Browse files Browse the repository at this point in the history
  • Loading branch information
lengau authored Oct 8, 2024
2 parents e79d2c6 + e346ca0 commit e0003db
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 5 deletions.
11 changes: 11 additions & 0 deletions docs/reference/changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,13 @@ than the minimum version, guaranteeing that pip gets updated correctly.

For a complete list of commits, see the `3.2.1`_ release on GitHub.

2.7.4 (2024-10-07)
------------------

This release bumps some dependencies to fix a security issue with requests.

For a complete list of commits, see the `2.7.4`_ release on GitHub.

2.7.3 (2024-09-16)
------------------

Expand All @@ -120,6 +127,8 @@ Charmcraft has the cache directory locked will run without a shared cache.
The charm plugin now force-reinstalls pip when necessary, guaranteeing a correct
version of pip.

For a complete list of commits, see the `2.7.3`_ release on GitHub.

2.7.2 (2024-09-09)
------------------

Expand Down Expand Up @@ -351,6 +360,8 @@ page.
.. _2.7.0: https://github.com/canonical/charmcraft/releases/tag/2.7.0
.. _2.7.1: https://github.com/canonical/charmcraft/releases/tag/2.7.1
.. _2.7.2: https://github.com/canonical/charmcraft/releases/tag/2.7.2
.. _2.7.3: https://github.com/canonical/charmcraft/releases/tag/2.7.3
.. _2.7.4: https://github.com/canonical/charmcraft/releases/tag/2.7.4
.. _3.0.0: https://github.com/canonical/charmcraft/releases/tag/3.0.0
.. _3.1.0: https://github.com/canonical/charmcraft/releases/tag/3.1.0
.. _3.1.1: https://github.com/canonical/charmcraft/releases/tag/3.1.1
Expand Down
6 changes: 3 additions & 3 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ httplib2==0.22.0
humanize==4.10.0
hypothesis==6.112.2
idna==3.10
importlib-metadata==8.2.0
importlib-metadata==8.5.0
iniconfig==2.0.0
isort==5.13.2
jaraco-classes==3.4.0
Expand All @@ -44,7 +44,7 @@ more-itertools==10.5.0
oauthlib==3.2.2
overrides==7.7.0
packaging==24.1
platformdirs==4.2.2
platformdirs==4.3.6
pluggy==1.5.0
protobuf==5.27.3
pycodestyle==2.12.1
Expand All @@ -62,7 +62,7 @@ pynacl==1.5.0
pyparsing==3.1.4
pyrfc3339==1.1
pytest==8.3.3
pytest-check==2.3.1
pytest-check==2.4.1
pytest-cov==5.0.0
pytest-mock==3.14.0
pytest-subprocess==1.5.2
Expand Down
4 changes: 2 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ docker==7.1.0
httplib2==0.22.0
humanize==4.10.0
idna==3.10
importlib-metadata==8.2.0
importlib-metadata==8.5.0
jaraco-classes==3.4.0
jeepney==0.8.0
jinja2==3.1.4
Expand All @@ -35,7 +35,7 @@ more-itertools==10.5.0
oauthlib==3.2.2
overrides==7.7.0
packaging==24.1
platformdirs==4.2.2
platformdirs==4.3.6
protobuf==5.27.3
pycparser==2.22
pydantic==2.8.2
Expand Down

0 comments on commit e0003db

Please sign in to comment.