Skip to content

Commit 8dac6fe

Browse files
authored
Merge branch 'trunk' into feature/ovh-vps-support
2 parents fe4f9d7 + 52794f8 commit 8dac6fe

60 files changed

Lines changed: 296 additions & 229 deletions

Some content is hidden

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

.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

CHANGES.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@ Changes in Apache Libcloud 3.9.1
77
Compute
88
~~~~~~~
99

10+
- [VSphere] Add verify_ssl option
11+
12+
Add verify_ssl option, to enable the user to avoid SSL verification explicitly.
13+
(#2128)
14+
[Miguel Caballer - @micafer]
15+
1016
- [OpenStack] Initial Blazar support
1117

1218
This is an initial implementation of Blazar support in Libcloud. It currently

doap_libcloud.rdf

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -546,6 +546,13 @@
546546
<revision>v3.9.0</revision>
547547
</Version>
548548
</release>
549+
<release>
550+
<Version>
551+
<name>3.9.1</name>
552+
<created>2026-04-16</created>
553+
<revision>v3.9.1</revision>
554+
</Version>
555+
</release>
549556

550557
<repository>
551558
<SVNRepository>

libcloud/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939

4040
__all__ = ["__version__", "enable_debug"]
4141

42-
__version__ = "3.9.1.dev0"
42+
__version__ = "3.9.2.dev0"
4343

4444

4545
def enable_debug(fo):

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

0 commit comments

Comments
 (0)