Skip to content

Commit f04b797

Browse files
authored
Add verify_ssl option (#2128)
* Add verify_ssl option * Pin version of setup-uv action * Pin version of setup-uv action * Pin version of setup-uv action * Pin version of setup-uv action * Pin version of setup-uv action * Update vulnerable deps * Fix style using new black version * Increase cumulative import time limit to 800ms * Fix pyupgrade
1 parent 3fb37a2 commit f04b797

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+183
-139
lines changed

.github/workflows/integration-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
with:
4040
python-version: ${{ matrix.python_version }}
4141
- name: Install uv
42-
uses: astral-sh/setup-uv@v7
42+
uses: astral-sh/setup-uv@681c641aba71e4a1c380be3ab5e12ad51f415867
4343

4444
- name: Install OS / deb dependencies
4545
run: |

.github/workflows/main.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
with:
5050
python-version: ${{ matrix.python_version }}
5151
- name: Install uv
52-
uses: astral-sh/setup-uv@v7
52+
uses: astral-sh/setup-uv@681c641aba71e4a1c380be3ab5e12ad51f415867
5353

5454
- name: Install OS / deb dependencies
5555
run: |
@@ -92,7 +92,7 @@ jobs:
9292
with:
9393
python-version: ${{ matrix.python_version }}
9494
- name: Install uv
95-
uses: astral-sh/setup-uv@v7
95+
uses: astral-sh/setup-uv@681c641aba71e4a1c380be3ab5e12ad51f415867
9696

9797
- name: Install OS / deb dependencies
9898
run: |
@@ -140,7 +140,7 @@ jobs:
140140
with:
141141
python-version: ${{ matrix.python_version }}
142142
- name: Install uv
143-
uses: astral-sh/setup-uv@v7
143+
uses: astral-sh/setup-uv@681c641aba71e4a1c380be3ab5e12ad51f415867
144144

145145
- name: Install OS / deb dependencies
146146
run: |
@@ -188,7 +188,7 @@ jobs:
188188
with:
189189
python-version: ${{ matrix.python_version }}
190190
- name: Install uv
191-
uses: astral-sh/setup-uv@v7
191+
uses: astral-sh/setup-uv@681c641aba71e4a1c380be3ab5e12ad51f415867
192192
- name: Install OS / deb dependencies
193193
run: |
194194
sudo DEBIAN_FRONTEND=noninteractive apt-get update
@@ -287,7 +287,7 @@ jobs:
287287
with:
288288
python-version: ${{ matrix.python_version }}
289289
- name: Install uv
290-
uses: astral-sh/setup-uv@v7
290+
uses: astral-sh/setup-uv@681c641aba71e4a1c380be3ab5e12ad51f415867
291291

292292
- name: Install OS / deb dependencies
293293
run: |
@@ -360,7 +360,7 @@ jobs:
360360
with:
361361
python-version: ${{ matrix.python_version }}
362362
- name: Install uv
363-
uses: astral-sh/setup-uv@v7
363+
uses: astral-sh/setup-uv@681c641aba71e4a1c380be3ab5e12ad51f415867
364364

365365
- name: Install OS / deb dependencies
366366
run: |
@@ -399,7 +399,7 @@ jobs:
399399
with:
400400
python-version: ${{ matrix.python_version }}
401401
- name: Install uv
402-
uses: astral-sh/setup-uv@v7
402+
uses: astral-sh/setup-uv@681c641aba71e4a1c380be3ab5e12ad51f415867
403403

404404
- name: Print Environment Info
405405
run: printenv | sort

.github/workflows/publish_dev_artifact.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
with:
3030
python-version: "3.10"
3131
- name: Install uv
32-
uses: astral-sh/setup-uv@v7
32+
uses: astral-sh/setup-uv@681c641aba71e4a1c380be3ab5e12ad51f415867
3333

3434
- name: Print Environment Info
3535
run: printenv | sort

.github/workflows/publish_pricing_to_s3.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
with:
2727
python-version: ${{ matrix.python_version }}
2828
- name: Install uv
29-
uses: astral-sh/setup-uv@v7
29+
uses: astral-sh/setup-uv@681c641aba71e4a1c380be3ab5e12ad51f415867
3030

3131
- name: Print Environment Info
3232
run: printenv | sort

libcloud/common/abiquo.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
1818
Common utilities needed by the :class:`AbiquoNodeDriver`.
1919
"""
20+
2021
import base64
2122

2223
from libcloud.utils.py3 import b, httplib, urlparse

libcloud/common/base.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ class Connection:
327327
port = 443
328328
timeout = None # type: Optional[Union[int, float]]
329329
secure = 1
330-
driver = None # type: Type[BaseDriver]
330+
driver = None # type: Type[BaseDriver]
331331
action = None
332332
cache_busting = False
333333
backoff = None
@@ -410,7 +410,7 @@ def reset_context(self):
410410
def _tuple_from_url(self, url):
411411
secure = 1
412412
port = None
413-
(scheme, netloc, request_path, param, query, fragment) = urlparse.urlparse(url)
413+
scheme, netloc, request_path, param, query, fragment = urlparse.urlparse(url)
414414

415415
if scheme not in ["http", "https"]:
416416
raise LibcloudError("Invalid scheme: {} in url {}".format(scheme, url))
@@ -450,9 +450,9 @@ def connect(self, host=None, port=None, base_url=None, **kwargs):
450450
secure = self.secure
451451

452452
if getattr(self, "base_url", None) and base_url is None:
453-
(host, port, secure, request_path) = self._tuple_from_url(getattr(self, "base_url"))
453+
host, port, secure, request_path = self._tuple_from_url(getattr(self, "base_url"))
454454
elif base_url is not None:
455-
(host, port, secure, request_path) = self._tuple_from_url(base_url)
455+
host, port, secure, request_path = self._tuple_from_url(base_url)
456456
else:
457457
host = host or self.host
458458
port = port or self.port

libcloud/common/dimensiondata.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
"""
1616
Dimension Data Common Components
1717
"""
18+
1819
from time import sleep
1920
from base64 import b64encode
2021

libcloud/common/google.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@
6565
Please remember to secure your keys and access tokens.
6666
"""
6767

68-
6968
import os
7069
import sys
7170
import time
@@ -262,7 +261,7 @@ def parse_body(self):
262261
if json_error:
263262
raise JsonParseError(body, self.status, None)
264263
elif "error" in body:
265-
(code, message) = self._get_error(body)
264+
code, message = self._get_error(body)
266265
if code == "QUOTA_EXCEEDED":
267266
raise QuotaExceededError(message, self.status, code)
268267
elif code == "RESOURCE_ALREADY_EXISTS":
@@ -278,23 +277,23 @@ def parse_body(self):
278277

279278
elif self.status == httplib.NOT_FOUND:
280279
if (not json_error) and ("error" in body):
281-
(code, message) = self._get_error(body)
280+
code, message = self._get_error(body)
282281
else:
283282
message = body
284283
code = None
285284
raise ResourceNotFoundError(message, self.status, code)
286285

287286
elif self.status == httplib.BAD_REQUEST:
288287
if (not json_error) and ("error" in body):
289-
(code, message) = self._get_error(body)
288+
code, message = self._get_error(body)
290289
else:
291290
message = body
292291
code = None
293292
raise InvalidRequestError(message, self.status, code)
294293

295294
else:
296295
if (not json_error) and ("error" in body):
297-
(code, message) = self._get_error(body)
296+
code, message = self._get_error(body)
298297
else:
299298
message = body
300299
code = None

libcloud/common/openstack.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@ def morph_action_hook(self, action):
358358
def _set_up_connection_info(self, url):
359359
prev_conn = (self.host, self.port, self.secure)
360360
result = self._tuple_from_url(url)
361-
(self.host, self.port, self.secure, self.request_path) = result
361+
self.host, self.port, self.secure, self.request_path = result
362362
new_conn = (self.host, self.port, self.secure)
363363
if new_conn != prev_conn:
364364
# We only call connect in case connection details have changed - this way we correctly

libcloud/common/openstack_identity.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -758,7 +758,7 @@ def authenticated_request(
758758
return response
759759

760760
def morph_action_hook(self, action):
761-
(_, _, _, request_path) = self._tuple_from_url(self.auth_url)
761+
_, _, _, request_path = self._tuple_from_url(self.auth_url)
762762

763763
if request_path == "":
764764
# No path is provided in the auth_url, use action passed to this

0 commit comments

Comments
 (0)