Skip to content

Commit ff431b0

Browse files
EnricoMiEnricoMi
authored
Merge branch 'main' into release-v-add-3.13
2 parents b1a50d4 + 18eeb26 commit ff431b0

File tree

166 files changed

+1804
-519
lines changed

Some content is hidden

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

166 files changed

+1804
-519
lines changed

‎.github/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ changelog:
1414
- title: Dependencies
1515
labels: ['dependencies']
1616
- title: Maintenance
17-
labels: ['ci', 'documentation', 'maintenance', 'OpenAPI']
17+
labels: ['ci', 'documentation', 'maintenance', 'OpenAPI', 'github_actions']
1818
- title: Others
1919
labels: ['*']

‎.github/workflows/_build-pkg.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
build-pkg:
1414
runs-on: ubuntu-latest
1515
steps:
16-
- uses: actions/checkout@v4
16+
- uses: actions/checkout@v5
1717
- name: Set up Python
1818
uses: actions/setup-python@v5
1919
with:

‎.github/workflows/auto-fix.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
permissions:
1111
contents: write
1212
steps:
13-
- uses: actions/checkout@v4
13+
- uses: actions/checkout@v5
1414
- uses: ./.github/actions/sort-classes
1515
continue-on-error: true
1616
- name: Commit and push changes
@@ -28,7 +28,7 @@ jobs:
2828
permissions:
2929
contents: write
3030
steps:
31-
- uses: actions/checkout@v4
31+
- uses: actions/checkout@v5
3232
- uses: ./.github/actions/mypy
3333
continue-on-error: true
3434
- name: Commit and push changes
@@ -46,7 +46,7 @@ jobs:
4646
permissions:
4747
contents: write
4848
steps:
49-
- uses: actions/checkout@v4
49+
- uses: actions/checkout@v5
5050
- uses: ./.github/actions/pre-commit
5151
continue-on-error: true
5252
- name: Commit and push changes

‎.github/workflows/ci.yml‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
- {python-version: "3.9", os: "windows-latest", os-label: "Windows"}
3232
- {python-version: "3.9", os: "macos-latest", os-label: "macOS"}
3333
steps:
34-
- uses: actions/checkout@v4
34+
- uses: actions/checkout@v5
3535
- name: Set up Python
3636
uses: actions/setup-python@v5
3737
with:
@@ -74,10 +74,10 @@ jobs:
7474
if: github.event_name == 'pull_request'
7575
runs-on: ubuntu-latest
7676
steps:
77-
- uses: actions/checkout@v3
77+
- uses: actions/checkout@v5
7878
with:
7979
path: head
80-
- uses: actions/checkout@v3
80+
- uses: actions/checkout@v5
8181
with:
8282
ref: ${{ github.event.pull_request.base.sha }}
8383
path: base
@@ -95,14 +95,14 @@ jobs:
9595
set -euo pipefail
9696
9797
echo "::group::Head verb checking:"
98-
python head/scripts/openapi.py index --check-verbs head/github openapi.head.index | tee verbs.head.txt
98+
python head/scripts/openapi.py --verbose index --check-verbs head/github openapi.head.index | tee verbs.head.txt
9999
echo "::endgroup::"
100100
101101
echo "::group::Base verb checking:"
102-
python head/scripts/openapi.py index --check-verbs base/github openapi.base.index | tee verbs.base.txt
102+
python head/scripts/openapi.py --verbose index --check-verbs base/github openapi.base.index | tee verbs.base.txt
103103
echo "::endgroup::"
104104
105-
if ! (diff verbs.base.txt verbs.head.txt > diff.txt)
105+
if ! (diff <(grep -v -E -e "^Index(ing|ed) " verbs.base.txt) <(grep -v -E -e "^Index(ing|ed) " verbs.head.txt) > diff.txt)
106106
then
107107
echo ""
108108
echo "Difference:"
@@ -124,10 +124,10 @@ jobs:
124124
if: github.event_name == 'pull_request'
125125
runs-on: ubuntu-latest
126126
steps:
127-
- uses: actions/checkout@v3
127+
- uses: actions/checkout@v5
128128
with:
129129
path: head
130-
- uses: actions/checkout@v3
130+
- uses: actions/checkout@v5
131131
with:
132132
ref: ${{ github.event.pull_request.base.sha }}
133133
path: base
@@ -144,19 +144,19 @@ jobs:
144144
# Add schemas
145145
set -euo pipefail
146146
147-
python head/scripts/openapi.py fetch ${{ env.openapi_api }} ${{ env.openapi_version }} openapi.json
147+
python head/scripts/openapi.py --verbose fetch ${{ env.openapi_api }} ${{ env.openapi_version }} openapi.json
148148
149149
echo "::group::Head schema suggestions:"
150-
python head/scripts/openapi.py index head/github openapi.json openapi.head.index
151-
python head/scripts/openapi.py suggest schemas openapi.json openapi.head.index | tee schemas.head.txt
150+
python head/scripts/openapi.py --verbose index head/github openapi.json openapi.head.index
151+
python head/scripts/openapi.py --verbose suggest schemas openapi.json openapi.head.index | tee schemas.head.txt
152152
echo "::endgroup::"
153153
154154
echo "::group::Base schema suggestions:"
155-
python head/scripts/openapi.py index base/github openapi.json openapi.base.index
156-
python head/scripts/openapi.py suggest schemas openapi.json openapi.base.index | tee schemas.base.txt
155+
python head/scripts/openapi.py --verbose index base/github openapi.json openapi.base.index
156+
python head/scripts/openapi.py --verbose suggest schemas openapi.json openapi.base.index | tee schemas.base.txt
157157
echo "::endgroup::"
158158
159-
if ! (diff schemas.base.txt schemas.head.txt > diff.txt)
159+
if ! (diff <(grep -v -E -e "^Index(ing|ed) " schemas.base.txt) <(grep -v -E -e "^Index(ing|ed) " schemas.head.txt) > diff.txt)
160160
then
161161
echo ""
162162
echo "Difference:"
@@ -165,7 +165,7 @@ jobs:
165165
(grep -E -e "^> Class \w+:$" diff.txt | sed -E -e "s/^> Class (\w+):$/\1/" || true) | while read class
166166
do
167167
echo "::group::Add schema to $class:"
168-
python head/scripts/openapi.py suggest schemas --add openapi.json openapi.head.index "$class" > /dev/null
168+
python head/scripts/openapi.py --verbose suggest schemas --add openapi.json openapi.head.index "$class" > /dev/null
169169
(cd head; git diff; git reset --hard --quiet HEAD)
170170
echo "::endgroup::"
171171
done
@@ -186,10 +186,10 @@ jobs:
186186
if: github.event_name == 'pull_request'
187187
runs-on: ubuntu-latest
188188
steps:
189-
- uses: actions/checkout@v3
189+
- uses: actions/checkout@v5
190190
with:
191191
path: head
192-
- uses: actions/checkout@v3
192+
- uses: actions/checkout@v5
193193
with:
194194
ref: ${{ github.event.pull_request.base.sha }}
195195
path: base
@@ -206,16 +206,16 @@ jobs:
206206
# Add implementations
207207
set -euo pipefail
208208
209-
python head/scripts/openapi.py fetch ${{ env.openapi_api }} ${{ env.openapi_version }} openapi.json
209+
python head/scripts/openapi.py --verbose fetch ${{ env.openapi_api }} ${{ env.openapi_version }} openapi.json
210210
211211
echo "::group::Head implementations:"
212-
python head/scripts/openapi.py index head/github openapi.json openapi.head.index
213-
python head/scripts/openapi.py --dry-run apply --tests head/github openapi.json openapi.head.index | tee implementation.head.txt
212+
python head/scripts/openapi.py --verbose index head/github openapi.json openapi.head.index
213+
python head/scripts/openapi.py --verbose --dry-run apply --tests head/github openapi.json openapi.head.index | tee implementation.head.txt
214214
echo "::endgroup::"
215215
216216
echo "::group::Base implementations:"
217-
python head/scripts/openapi.py index base/github openapi.json openapi.base.index
218-
python head/scripts/openapi.py --dry-run apply --tests base/github openapi.json openapi.base.index | tee implementation.base.txt
217+
python head/scripts/openapi.py --verbose index base/github openapi.json openapi.base.index
218+
python head/scripts/openapi.py --verbose --dry-run apply --tests base/github openapi.json openapi.base.index | tee implementation.base.txt
219219
echo "::endgroup::"
220220
221221
if ! (diff <(sed -E -e "s/^[@]{2} .+ [@]{2}$/…/" -e "s%[(]base/github/%(github/%" -e "s%Test base/%Test %" implementation.base.txt) <(sed -E -e "s/^[@]{2} .+ [@]{2}$/…/" -e "s%[(]head/github/%(github/%" -e "s%Test head/%Test %" implementation.head.txt) > diff.txt)
@@ -227,7 +227,7 @@ jobs:
227227
(grep -E -e "^> Class \w+ changed$" diff.txt | sed -E -e "s/^> Class (\w+) changed$/\1/" || true) | while read class
228228
do
229229
echo "::group::Apply schema to $class:"
230-
python head/scripts/openapi.py apply --tests --new-schemas create-class head/github openapi.json openapi.head.index "$class" > /dev/null
230+
python head/scripts/openapi.py --verbose apply --tests --new-schemas create-class head/github openapi.json openapi.head.index "$class" > /dev/null
231231
(cd head; git diff; git reset --hard --quiet HEAD)
232232
echo "::endgroup::"
233233
done
@@ -258,7 +258,7 @@ jobs:
258258
needs: "test_success"
259259
runs-on: ubuntu-latest
260260
steps:
261-
- uses: actions/checkout@v3
261+
- uses: actions/checkout@v5
262262
- uses: ./.github/actions/sort-classes
263263
- name: changes
264264
run: |

‎.github/workflows/codeql.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
# your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages
5858
steps:
5959
- name: Checkout repository
60-
uses: actions/checkout@v4
60+
uses: actions/checkout@v5
6161

6262
# Add any setup steps before running the `github/codeql-action/init` action.
6363
# This includes steps like installing compilers or runtimes (`actions/setup-node`

‎.github/workflows/lint.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,19 @@ jobs:
1212
mypy:
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@v4
15+
- uses: actions/checkout@v5
1616
- uses: ./.github/actions/mypy
1717

1818
pre-commit:
1919
runs-on: ubuntu-latest
2020
steps:
21-
- uses: actions/checkout@v4
21+
- uses: actions/checkout@v5
2222
- uses: ./.github/actions/pre-commit
2323

2424
docs:
2525
runs-on: ubuntu-latest
2626
steps:
27-
- uses: actions/checkout@v4
27+
- uses: actions/checkout@v5
2828
- uses: actions/setup-python@v5
2929
with:
3030
python-version: "3.x"

‎.github/workflows/openapi.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
steps:
1717
- name: Checkout Git
1818
id: checkout
19-
uses: actions/checkout@v3
19+
uses: actions/checkout@v5
2020
with:
2121
ref: openapi/autosync
2222
continue-on-error: true
@@ -30,7 +30,7 @@ jobs:
3030
contents: write
3131
steps:
3232
- name: Checkout Git
33-
uses: actions/checkout@v3
33+
uses: actions/checkout@v5
3434
with:
3535
fetch-depth: 0
3636
- name: Set up Git

‎.pre-commit-config.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ repos:
3535
additional_dependencies: [tomli]
3636

3737
- repo: https://github.com/PyCQA/docformatter
38-
rev: v1.7.5
38+
rev: v1.7.7
3939
hooks:
4040
- id: docformatter
4141
additional_dependencies: [tomli]

0 commit comments

Comments
 (0)