Skip to content

Commit 3541fcc

Browse files
authored
Merge branch 'trunk' into fix_scrape_ec2_prices
2 parents a5a5946 + 425c136 commit 3541fcc

35 files changed

+191
-104
lines changed

.github/workflows/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ jobs:
116116
run: tox -e coverage-ci
117117

118118
- name: Upload Coverage to codecov.io
119-
uses: codecov/codecov-action@18283e04ce6e62d37312384ff67231eb8fd56d24 # v5.4.3
119+
uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.2
120120
with:
121121
# We utilize secret for more realiable builds. Without secret being set, upload step
122122
# fails fairly often.
@@ -229,7 +229,7 @@ jobs:
229229
# Unpack tarball and verify + run the tests
230230
tar -xzvf "${TARBALL_FILENAME}"
231231
232-
cd "apache_libcloud-${VERSION}/"
232+
cd "apache_libcloud-${VERSION}/"
233233
tox -c tox.ini -epy3.10
234234
235235
- name: Verify Wheel Release Artifact

.pre-commit-config.yaml

Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
exclude: |
2+
(?x)^(
3+
docs/(?:.*/)?_supported_.*\.rst$|
4+
libcloud/data/pricing\.json$
5+
)
6+
7+
repos:
8+
- repo: https://github.com/pre-commit/pre-commit-hooks
9+
rev: "v5.0.0"
10+
hooks:
11+
- id: check-case-conflict
12+
- id: check-merge-conflict
13+
- id: check-toml
14+
- id: check-yaml
15+
- id: check-json
16+
exclude: |
17+
(?x)^(
18+
libcloud/test/dns/fixtures/pointdns/not_found\.json|
19+
libcloud/test/dns/fixtures/godaddy/v1_domains_purchase_schema_com\.json|
20+
libcloud/test/dns/fixtures/gandi_live/get_bad_zone\.json
21+
)$
22+
- id: end-of-file-fixer
23+
files: &text_files |
24+
(?x)^(
25+
libcloud/|
26+
docs/|
27+
demos/|
28+
integration/|
29+
scripts/|
30+
contrib/|
31+
pylint_plugins/|
32+
\.github/|
33+
[^/]+\.(py|rst|md|yml|yaml|toml|json|xml|txt|csv|ini|cfg|sh)$
34+
)
35+
exclude: &fixture_exclude |
36+
(?x)^(
37+
libcloud/test/.*/fixtures/|
38+
integration/.*/fixtures/
39+
)
40+
- id: trailing-whitespace
41+
files: *text_files
42+
exclude: *fixture_exclude
43+
44+
- repo: https://github.com/psf/black
45+
rev: "25.1.0"
46+
hooks:
47+
- id: black
48+
args: ["--config=pyproject.toml"]
49+
files: &fmt_py_files |
50+
(?x)^(
51+
libcloud/|
52+
docs/examples/|
53+
docs/|
54+
demos/|
55+
contrib/|
56+
pylint_plugins/|
57+
integration/|
58+
[^/]+\.py$
59+
)
60+
61+
- repo: https://github.com/pycqa/isort
62+
rev: "6.0.1"
63+
hooks:
64+
- id: isort
65+
args: ["--settings-path=pyproject.toml"]
66+
files: *fmt_py_files
67+
68+
- repo: https://github.com/pycqa/flake8
69+
rev: "5.0.4"
70+
hooks:
71+
- id: flake8
72+
args: ["--config=./.flake8"]
73+
files: &lint_py_files |
74+
(?x)^(
75+
libcloud/|
76+
libcloud/test/|
77+
demos/|
78+
integration/|
79+
scripts/|
80+
docs/examples/|
81+
contrib/|
82+
pylint_plugins/
83+
)
84+
85+
- repo: https://github.com/asottile/pyupgrade
86+
rev: "v3.3.1"
87+
hooks:
88+
- id: pyupgrade
89+
args: ["--py310-plus", "--py3-only"]
90+
files: *lint_py_files
91+
92+
- repo: https://github.com/codespell-project/codespell
93+
rev: "v2.4.1"
94+
hooks:
95+
- id: codespell
96+
additional_dependencies: ["tomli"]
97+
args: ["--toml", "pyproject.toml"]
98+
files: ^libcloud/

CHANGES.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -894,8 +894,8 @@ Compute
894894
(#1615)
895895
[Miguel Caballer - @micafer]
896896

897-
- [CloudSigma] Various updates, improvements and new functionality in the
898-
driver (support for new regions, instance types, additional standard API an
897+
- [CloudSigma] Various updates, improvements and new functionality in the
898+
driver (support for new regions, instance types, additional standard API an
899899
extension methods, etc.).
900900

901901
(#1558)
@@ -1060,7 +1060,7 @@ Compute
10601060
(#1492)
10611061
[Miguel Caballer - @micafer]
10621062

1063-
- [EC2] Update supported EC2 regions and instance sizes and add support
1063+
- [EC2] Update supported EC2 regions and instance sizes and add support
10641064
for eu-north-1 region.
10651065
(#1486)
10661066
[Arturo Noha - @r2ronoha]

contrib/pre-commit.sh

Lines changed: 0 additions & 32 deletions
This file was deleted.

docs/_static/images/provider_logos/scaleway.svg

Lines changed: 1 addition & 1 deletion
Loading

docs/backup/api.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ Backup Base API
1919
:members:
2020

2121
.. autoclass:: libcloud.backup.types.BackupTargetJobStatusType
22-
:members:
22+
:members:

docs/compute/drivers/cloudscale.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ Most of the `cloudscale.ch` API is covered by the simple commands:
3333
- ``driver.destroy_node(node)``
3434
- ``driver.create_node(name, size, image, ex_create_attr={})``
3535

36-
In our :ref:`example <cloudscale-examples>` below you can see how you use
37-
``ex_create_attr`` when creating servers. Possible dictionary entries in
36+
In our :ref:`example <cloudscale-examples>` below you can see how you use
37+
``ex_create_attr`` when creating servers. Possible dictionary entries in
3838
``ex_create_attr`` are:
3939

4040
- ``ssh_keys`` (``list`` of ``str``) - A list of SSH public keys.
@@ -65,10 +65,10 @@ API Docs
6565
--------
6666

6767
.. autoclass:: libcloud.compute.drivers.cloudscale.CloudscaleNodeDriver
68-
:members: create_node, list_images, list_nodes, list_sizes,
68+
:members: create_node, list_images, list_nodes, list_sizes,
6969
wait_until_running, reboot_node, ex_start_node, ex_stop_node,
7070
ex_node_by_uuid, destroy_node
71-
:undoc-members:
71+
:undoc-members:
7272

7373
.. _`cloudscale.ch`: https://www.cloudscale.ch
7474
.. _`cloudscale.ch API`: https://www.cloudscale.ch/en/api/v1

docs/compute/drivers/digital_ocean.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,4 @@ API v2.0
4141

4242

4343
.. _`DigitalOcean`: https://www.digitalocean.com/
44-
.. _`reached end of life on November 9, 2015`: https://developers.digitalocean.com/documentation/changelog/api-v1/sunsetting-api-v1/
44+
.. _`reached end of life on November 9, 2015`: https://developers.digitalocean.com/documentation/changelog/api-v1/sunsetting-api-v1/

docs/compute/drivers/dimensiondata.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,4 +87,4 @@ Debugging Tips
8787
ValueError: Invalid attribute name u'xmlns:xsi'
8888

8989
*Solution*:
90-
- Upgrade to python version 2.7.12 and above
90+
- Upgrade to python version 2.7.12 and above

docs/compute/drivers/nttcis.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,4 +86,4 @@ Debugging Tips
8686
ValueError: Invalid attribute name u'xmlns:xsi'
8787

8888
*Solution*:
89-
- Upgrade to python version 2.7.12 and above
89+
- Upgrade to python version 2.7.12 and above

0 commit comments

Comments
 (0)