Skip to content

Commit d5b8885

Browse files
authored
Merge branch 'trunk' into dependabot/github_actions/actions/dependency-review-action-5
2 parents fb16130 + 2954c0a commit d5b8885

5 files changed

Lines changed: 49 additions & 27 deletions

File tree

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ jobs:
117117
run: tox -e coverage-ci
118118

119119
- name: Upload Coverage to codecov.io
120-
uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.2
120+
uses: codecov/codecov-action@e53489f4d376d79066609109e7a95a29eb3740b1 # v7.0.0
121121
with:
122122
# We utilize secret for more realiable builds. Without secret being set, upload step
123123
# fails fairly often.

integration/storage/test_azure_blobs.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ def setUpClass(cls):
119119
client_secret=config["AZURE_CLIENT_SECRET"],
120120
)
121121

122-
resource_client = resource.ResourceManagementClient(
122+
resource_client = resource.resources.ResourceManagementClient(
123123
credentials,
124124
config["AZURE_SUBSCRIPTION_ID"],
125125
)
@@ -205,7 +205,7 @@ def setUpClass(cls):
205205
)
206206

207207
cls.account = account.name
208-
cls.secret = keys.keys[0].value
208+
cls.secret = keys["keys"][0]["value"]
209209

210210

211211
class StorageV2Test(StorageTest):

libcloud/compute/ssh.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -668,7 +668,9 @@ def _get_pkey_object(self, key, password=None):
668668

669669
if paramiko_version < (4, 0, 0):
670670
# DSSKey removed in paramiko 4.0.0
671-
key_types.insert(1, (paramiko.DSSKey, "DSA"))
671+
dss_key_cls = getattr(paramiko, "DSSKey", None)
672+
if dss_key_cls:
673+
key_types.insert(1, (dss_key_cls, "DSA"))
672674
if paramiko_version >= (2, 2, 0):
673675
# Ed25519 is only supported in paramiko >= 2.2.0
674676
key_types.append((paramiko.ed25519key.Ed25519Key, "Ed25519"))

pyproject.toml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,10 @@ test = [
8989
"cryptography==46.0.7",
9090
"pyopenssl==26.0.0",
9191
"fasteners",
92-
"paramiko==3.5.1; platform_python_implementation != 'PyPy'",
92+
"paramiko==5.0.0; platform_python_implementation != 'PyPy'",
9393
"libvirt-python==12.0.0",
94+
"urllib3>=2.7.0", # to avoid security issues with older versions of urllib3
95+
"idna>=3.15", # to avoid security issues with older versions of idna
9496
]
9597
lint = [
9698
"pep8==1.7.1",
@@ -105,7 +107,7 @@ lint = [
105107
"codespell==2.4.1",
106108
"prek>=0.2.17",
107109
"requests>=2.27.1",
108-
"paramiko==3.5.1; platform_python_implementation != 'PyPy'",
110+
"paramiko==5.0.0; platform_python_implementation != 'PyPy'",
109111
]
110112
docs = [
111113
"rstcheck==6.2.5; python_version >= '3.10'",

uv.lock

Lines changed: 39 additions & 21 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)