Skip to content

Commit

Permalink
fix: Manages all requirements files in one dependabot PR (#487)
Browse files Browse the repository at this point in the history
  • Loading branch information
saltiyazan authored Sep 11, 2024
1 parent 49af4d5 commit 075929f
Show file tree
Hide file tree
Showing 9 changed files with 115 additions and 83 deletions.
16 changes: 3 additions & 13 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,9 @@ updates:
- "*"

- package-ecosystem: "pip"
directory: "/"
schedule:
interval: "weekly"
commit-message:
prefix: "chore: "
groups:
pip_dependencies:
patterns:
- "*"


- package-ecosystem: "pip"
directory: "/tests/integration/vault_kv_requirer_operator/"
directories:
- "/"
- "tests/integration/vault_kv_requirer_operator"
schedule:
interval: "weekly"
commit-message:
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4

- name: Setup LXD
uses: canonical/setup-lxd@main
with:
channel: 5.20/stable
channel: 5.20/stable

- name: Install charmcraft
run: sudo snap install charmcraft --classic

Expand All @@ -31,12 +31,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4

- name: Setup LXD
uses: canonical/setup-lxd@main
with:
channel: 5.20/stable

- name: Install charmcraft
run: sudo snap install charmcraft --classic

Expand Down
2 changes: 2 additions & 0 deletions requirements.in
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,5 @@ jsonschema
cryptography
boto3
boto3-stubs[s3] # required by vault_s3
ops-scenario==6.1.6
rpds-py==0.18.0
49 changes: 26 additions & 23 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,48 +4,48 @@
#
# pip-compile requirements.in
#
annotated-types==0.6.0
annotated-types==0.7.0
# via pydantic
anyio==4.3.0
anyio==4.4.0
# via httpx
attrs==23.2.0
attrs==24.2.0
# via
# jsonschema
# referencing
boto3==1.35.10
boto3==1.35.15
# via -r requirements.in
boto3-stubs[s3]==1.35.10
boto3-stubs[s3]==1.35.15
# via -r requirements.in
botocore==1.35.10
botocore==1.35.15
# via
# boto3
# s3transfer
botocore-stubs==1.34.89
botocore-stubs==1.35.15
# via boto3-stubs
certifi==2024.2.2
certifi==2024.8.30
# via
# httpcore
# httpx
# requests
cffi==1.16.0
cffi==1.17.1
# via cryptography
charset-normalizer==3.3.2
# via requests
click==8.1.7
# via typer
cosl==0.0.26
cosl==0.0.32
# via -r requirements.in
cryptography==43.0.1
# via -r requirements.in
h11==0.14.0
# via httpcore
httpcore==1.0.5
# via httpx
httpx==0.27.0
httpx==0.27.2
# via lightkube
hvac==2.3.0
# via -r requirements.in
idna==3.7
idna==3.8
# via
# anyio
# httpx
Expand Down Expand Up @@ -74,14 +74,16 @@ markupsafe==2.1.5
# via jinja2
mypy-boto3-s3==1.35.2
# via boto3-stubs
ops==2.16.0
ops==2.16.1
# via
# -r requirements.in
# cosl
# ops-scenario
ops-scenario==6.1.6
# via pytest-interface-tester
packaging==24.0
# via
# -r requirements.in
# pytest-interface-tester
packaging==24.1
# via pytest
pluggy==1.5.0
# via pytest
Expand All @@ -96,19 +98,19 @@ pydantic-core==2.20.1
# via pydantic
pyhcl==0.4.5
# via -r requirements.in
pytest==8.3.2
pytest==8.3.3
# via pytest-interface-tester
pytest-interface-tester==3.1.0
# via -r requirements.in
python-dateutil==2.9.0.post0
# via botocore
pyyaml==6.0.1
pyyaml==6.0.2
# via
# cosl
# lightkube
# ops
# ops-scenario
referencing==0.34.0
referencing==0.35.1
# via
# jsonschema
# jsonschema-specifications
Expand All @@ -118,9 +120,10 @@ requests==2.32.3
# hvac
rpds-py==0.18.0
# via
# -r requirements.in
# jsonschema
# referencing
s3transfer==0.10.1
s3transfer==0.10.2
# via boto3
six==1.16.0
# via python-dateutil
Expand All @@ -132,11 +135,11 @@ tenacity==9.0.0
# via cosl
typer==0.7.0
# via pytest-interface-tester
types-awscrt==0.20.9
types-awscrt==0.21.5
# via botocore-stubs
types-s3transfer==0.10.1
types-s3transfer==0.10.2
# via boto3-stubs
typing-extensions==4.11.0
typing-extensions==4.12.2
# via
# boto3-stubs
# cosl
Expand All @@ -147,5 +150,5 @@ urllib3==2.2.2
# via
# botocore
# requests
websocket-client==1.7.0
websocket-client==1.8.0
# via ops
4 changes: 2 additions & 2 deletions src/charm.py
Original file line number Diff line number Diff line change
Expand Up @@ -754,7 +754,7 @@ def _on_create_backup_action(self, event: ActionEvent) -> None:

response = vault.create_snapshot()
content_uploaded = s3.upload_content(
content=response.raw,
content=response.raw, # type: ignore[reportArgumentType]
bucket_name=s3_parameters["bucket"],
key=backup_key,
)
Expand Down Expand Up @@ -1323,7 +1323,7 @@ def _create_raft_snapshot(self) -> IO[bytes] | None:
logger.error("Failed to get Vault client, cannot create snapshot.")
return None
response = vault.create_snapshot()
return response.raw
return response.raw # type: ignore[reportReturnType]

def _restore_vault(self, snapshot: StreamingBody) -> bool:
"""Restore vault using a raft snapshot.
Expand Down
2 changes: 1 addition & 1 deletion test-requirements.in
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ pytest-operator
pytest-asyncio==0.21.2
ruff
types-hvac
ops-scenario
ops-scenario==6.1.6
Loading

0 comments on commit 075929f

Please sign in to comment.