Skip to content

Commit c7236d9

Browse files
authored
Merge branch 'main' into fix-test-regression-instance
2 parents fb7468d + d4dc4c4 commit c7236d9

File tree

92 files changed

+4162
-1580
lines changed

Some content is hidden

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

92 files changed

+4162
-1580
lines changed

.github/dependabot.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,8 @@ updates:
1919
directory: /
2020
schedule:
2121
interval: monthly
22+
23+
- package-ecosystem: pip
24+
directory: /docs
25+
schedule:
26+
interval: monthly

.github/workflows/checks.yml

Lines changed: 9 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
name: Check Commit
1+
name: Tests
2+
3+
permissions:
4+
contents: read
5+
26
on:
37
push:
48
branches:
@@ -7,88 +11,6 @@ on:
711
merge_group:
812

913
jobs:
10-
format:
11-
runs-on: ubuntu-latest
12-
strategy:
13-
matrix:
14-
lib:
15-
- scaleway-core
16-
- scaleway
17-
- scaleway-async
18-
python-version: ['3.10' ,'3.11', '3.12', '3.13']
19-
defaults:
20-
run:
21-
working-directory: ${{ matrix.lib }}
22-
steps:
23-
- uses: actions/checkout@v4
24-
- name: Set up Python
25-
uses: actions/setup-python@v5
26-
with:
27-
python-version: ${{ matrix.python-version }}
28-
- name: Install poetry
29-
run: |
30-
pip install poetry
31-
poetry --version
32-
- name: Install dependencies and library
33-
run: poetry install
34-
- name: Check format
35-
run: poetry run ruff format --check
36-
37-
typing:
38-
runs-on: ubuntu-latest
39-
strategy:
40-
matrix:
41-
lib:
42-
- scaleway-core
43-
- scaleway
44-
- scaleway-async
45-
defaults:
46-
run:
47-
working-directory: ${{ matrix.lib }}
48-
steps:
49-
- uses: actions/checkout@v4
50-
- name: Set up Python
51-
uses: actions/setup-python@v5
52-
with:
53-
python-version: ${{ matrix.python-version }}
54-
- name: Install poetry
55-
run: |
56-
pip install poetry
57-
poetry --version
58-
- name: Install dependencies and library
59-
run: poetry install
60-
- name: Check typing
61-
run: poetry run mypy --install-types --non-interactive --strict --no-warn-unused-ignores $(echo "${{ matrix.lib }}" | tr "-" "_")
62-
63-
linting:
64-
runs-on: ubuntu-latest
65-
strategy:
66-
matrix:
67-
lib:
68-
- scaleway-core
69-
- scaleway
70-
- scaleway-async
71-
defaults:
72-
run:
73-
working-directory: ${{ matrix.lib }}
74-
steps:
75-
- uses: actions/checkout@v4
76-
- name: Set up Python
77-
uses: actions/setup-python@v5
78-
with:
79-
python-version: ${{ matrix.python-version }}
80-
- name: Install poetry
81-
run: |
82-
pip install poetry
83-
poetry --version
84-
- name: Install dependencies and library
85-
run: poetry install
86-
# We ignore the following rules for now:
87-
# E721 (https://docs.astral.sh/ruff/rules/type-comparison)
88-
# F541 (https://docs.astral.sh/ruff/rules/f-string-missing-placeholders)
89-
- name: Check linting
90-
run: poetry run ruff check . --ignore E721 --ignore F541
91-
9214
tests:
9315
runs-on: ubuntu-latest
9416
strategy:
@@ -97,19 +19,19 @@ jobs:
9719
- scaleway-core
9820
- scaleway
9921
- scaleway-async
22+
python-version: [ '3.10' ,'3.11', '3.12', '3.13' ]
10023
defaults:
10124
run:
10225
working-directory: ${{ matrix.lib }}
10326
steps:
10427
- uses: actions/checkout@v4
28+
- name: Install poetry
29+
run: pipx install poetry
10530
- name: Set up Python
10631
uses: actions/setup-python@v5
10732
with:
10833
python-version: ${{ matrix.python-version }}
109-
- name: Install poetry
110-
run: |
111-
pip install poetry
112-
poetry --version
34+
cache: "poetry"
11335
- name: Install dependencies and library
11436
run: poetry install
11537
- name: Run tests

.github/workflows/docs.yml

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ on:
44
push:
55
branches:
66
- main
7-
pull_request:
8-
merge_group:
97
workflow_dispatch:
108

119
jobs:
@@ -16,14 +14,18 @@ jobs:
1614
working-directory: ./docs
1715
steps:
1816
- uses: actions/checkout@v4
17+
- name: Install poetry
18+
run: pipx install poetry
1919
- name: Set up Python
2020
uses: actions/setup-python@v5
2121
with:
22-
python-version: "3.10"
23-
- name: Install poetry
24-
run: |
25-
pip install poetry
26-
poetry --version
22+
python-version: "3.13"
23+
cache: 'poetry'
24+
- name: Set up cache
25+
uses: actions/cache@v4
26+
with:
27+
path: ./source
28+
key: 'sphinx-source-cache'
2729
- name: Install dependencies and library
2830
run: poetry install --no-root
2931
- name: Generate documentation sources
@@ -32,7 +34,7 @@ jobs:
3234
poetry run sphinx-apidoc -f -o ./source ../scaleway
3335
poetry run sphinx-apidoc -f -o ./source ../scaleway-async
3436
- name: Generate documentation
35-
run: poetry run sphinx-build -b html ./ ./_build
37+
run: poetry run sphinx-build -j auto -b html ./ ./_build
3638
- name: Deploy to GitHub Pages
3739
uses: peaceiris/actions-gh-pages@v4
3840
if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}

.github/workflows/format.yml

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
name: Check formatting
2+
3+
permissions:
4+
contents: read
5+
6+
on:
7+
push:
8+
branches:
9+
- main
10+
pull_request:
11+
merge_group:
12+
13+
jobs:
14+
ruff:
15+
runs-on: ubuntu-latest
16+
strategy:
17+
matrix:
18+
lib:
19+
- scaleway-core
20+
- scaleway
21+
- scaleway-async
22+
defaults:
23+
run:
24+
working-directory: ${{ matrix.lib }}
25+
steps:
26+
- uses: actions/checkout@v4
27+
- name: Install poetry
28+
run: pipx install poetry
29+
- name: Set up Python
30+
uses: actions/setup-python@v5
31+
with:
32+
python-version: '3.13'
33+
cache: "poetry"
34+
- name: Install dependencies and library
35+
run: poetry install
36+
- name: Check format
37+
run: poetry run ruff format --check

.github/workflows/lint.yml

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
name: Check linters
2+
3+
permissions:
4+
contents: read
5+
6+
on:
7+
push:
8+
branches:
9+
- main
10+
pull_request:
11+
merge_group:
12+
13+
jobs:
14+
ruff:
15+
runs-on: ubuntu-latest
16+
strategy:
17+
matrix:
18+
lib:
19+
- scaleway-core
20+
- scaleway
21+
- scaleway-async
22+
python-version: [ '3.10' ,'3.11', '3.12', '3.13' ]
23+
defaults:
24+
run:
25+
working-directory: ${{ matrix.lib }}
26+
steps:
27+
- uses: actions/checkout@v4
28+
- name: Install poetry
29+
run: pipx install poetry
30+
- name: Set up Python
31+
uses: actions/setup-python@v5
32+
with:
33+
python-version: ${{ matrix.python-version }}
34+
cache: "poetry"
35+
- name: Install dependencies and library
36+
run: poetry install
37+
# We ignore the following rules for now:
38+
# E721 (https://docs.astral.sh/ruff/rules/type-comparison)
39+
# F541 (https://docs.astral.sh/ruff/rules/f-string-missing-placeholders)
40+
- name: Check linting
41+
run: poetry run ruff check . --ignore E721 --ignore F541

.github/workflows/release.yml

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,13 @@ jobs:
1212
working-directory: scaleway-core
1313
steps:
1414
- uses: actions/checkout@v4
15+
- name: Install poetry
16+
run: pipx install poetry
1517
- name: Set up Python
1618
uses: actions/setup-python@v5
1719
with:
1820
python-version: "3.10"
19-
- name: Install poetry
20-
run: |
21-
pip install poetry
22-
poetry --version
21+
cache: "poetry"
2322
- name: Update lock file
2423
run: poetry lock
2524
- name: Install dependencies and library
@@ -49,14 +48,13 @@ jobs:
4948
working-directory: ${{ matrix.lib }}
5049
steps:
5150
- uses: actions/checkout@v4
51+
- name: Install poetry
52+
run: pipx install poetry
5253
- name: Set up Python
5354
uses: actions/setup-python@v5
5455
with:
5556
python-version: "3.10"
56-
- name: Install poetry
57-
run: |
58-
pip install poetry
59-
poetry --version
57+
cache: "poetry"
6058
- name: Set local scaleway-core version
6159
run: poetry version $(echo "${{ github.ref }}" | cut -d "/" -f 3)
6260
working-directory: scaleway-core

.github/workflows/typing.yml

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
name: Check type hinting
2+
3+
permissions:
4+
contents: read
5+
6+
on:
7+
push:
8+
branches:
9+
- main
10+
pull_request:
11+
merge_group:
12+
13+
jobs:
14+
mypy:
15+
runs-on: ubuntu-latest
16+
strategy:
17+
matrix:
18+
lib:
19+
- scaleway-core
20+
- scaleway
21+
- scaleway-async
22+
python-version: [ '3.10' ,'3.11', '3.12', '3.13' ]
23+
defaults:
24+
run:
25+
working-directory: ${{ matrix.lib }}
26+
steps:
27+
- uses: actions/checkout@v4
28+
- name: Install poetry
29+
run: pipx install poetry
30+
- name: Set up Python
31+
uses: actions/setup-python@v5
32+
with:
33+
python-version: ${{ matrix.python-version }}
34+
cache: "poetry"
35+
- name: Install dependencies and library
36+
run: poetry install
37+
- name: Check typing
38+
run: poetry run mypy --install-types --non-interactive --strict --no-warn-unused-ignores $(echo "${{ matrix.lib }}" | tr "-" "_")

docs/Makefile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
# You can set these variables from the command line, and also
55
# from the environment for the first two.
6-
SPHINXOPTS ?=
6+
SPHINXOPTS ?= -j auto
77
SPHINXBUILD ?= sphinx-build
88
SOURCEDIR = .
99
BUILDDIR = _build
@@ -17,4 +17,7 @@ help:
1717
# Catch-all target: route all unknown targets to Sphinx using the new
1818
# "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS).
1919
%: Makefile
20+
sphinx-apidoc -f -o ./source ../scaleway-core
21+
sphinx-apidoc -f -o ./source ../scaleway
22+
sphinx-apidoc -f -o ./source ../scaleway-async
2023
@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)

docs/module.rst

Whitespace-only changes.

0 commit comments

Comments
 (0)