Skip to content

Commit f18decc

Browse files
AyanSinhaMahapatraAyanSinhaMahapatra
committed
Merge remote-tracking branch 'skeleton/main' into 3656-py312
Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
2 parents cbdfe45 + acf94b3 commit f18decc

File tree

5 files changed

+73
-397
lines changed

5 files changed

+73
-397
lines changed

‎.github/workflows/docs-ci.yml

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

88
jobs:
99
build:
10-
runs-on: ubuntu-20.04
10+
runs-on: ubuntu-22.04
1111

1212
strategy:
1313
max-parallel: 4

‎.github/workflows/scancode-release.yml

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
contents: read # to fetch code (actions/checkout)
2626

2727
name: Build PyPI wheels
28-
runs-on: ubuntu-20.04
28+
runs-on: ubuntu-22.04
2929

3030
defaults:
3131
run:
@@ -34,10 +34,10 @@ jobs:
3434
strategy:
3535
fail-fast: true
3636
matrix:
37-
pyver: ["3.7", "3.8", "3.9", "3.10", "3.11"]
37+
pyver: ["3.8", "3.9", "3.10", "3.11", "3.12"]
3838

3939
steps:
40-
- uses: actions/checkout@v3
40+
- uses: actions/checkout@v4
4141

4242
- name: Set up Python on ${{ matrix.pyver }}
4343
uses: actions/setup-python@v4
@@ -59,7 +59,7 @@ jobs:
5959
contents: read # to fetch code (actions/checkout)
6060

6161
name: Build PyPI sdist archives
62-
runs-on: ubuntu-20.04
62+
runs-on: ubuntu-22.04
6363

6464
defaults:
6565
run:
@@ -69,7 +69,7 @@ jobs:
6969
fail-fast: true
7070

7171
steps:
72-
- uses: actions/checkout@v3
72+
- uses: actions/checkout@v4
7373

7474
- name: Set up Python
7575
uses: actions/setup-python@v4
@@ -91,7 +91,7 @@ jobs:
9191
contents: read # to fetch code (actions/checkout)
9292

9393
name: Build app Release for linux
94-
runs-on: ubuntu-20.04
94+
runs-on: ubuntu-22.04
9595

9696
defaults:
9797
run:
@@ -100,10 +100,10 @@ jobs:
100100
strategy:
101101
fail-fast: true
102102
matrix:
103-
pyver: ["3.7", "3.8", "3.9", "3.10", "3.11"]
103+
pyver: ["3.8", "3.9", "3.10", "3.11", "3.12"]
104104

105105
steps:
106-
- uses: actions/checkout@v3
106+
- uses: actions/checkout@v4
107107

108108
- name: Set up Python on ${{ matrix.pyver }}
109109
uses: actions/setup-python@v4
@@ -125,7 +125,7 @@ jobs:
125125
contents: read # to fetch code (actions/checkout)
126126

127127
name: Build app Release for mac
128-
runs-on: ubuntu-20.04
128+
runs-on: ubuntu-22.04
129129

130130
defaults:
131131
run:
@@ -134,10 +134,10 @@ jobs:
134134
strategy:
135135
fail-fast: true
136136
matrix:
137-
pyver: ["3.7", "3.8", "3.9", "3.10", "3.11"]
137+
pyver: ["3.8", "3.9", "3.10", "3.11", "3.12"]
138138

139139
steps:
140-
- uses: actions/checkout@v3
140+
- uses: actions/checkout@v4
141141

142142
- name: Set up Python on ${{ matrix.pyver }}
143143
uses: actions/setup-python@v4
@@ -159,7 +159,7 @@ jobs:
159159
contents: read # to fetch code (actions/checkout)
160160

161161
name: Build app Release for windows
162-
runs-on: ubuntu-20.04
162+
runs-on: ubuntu-22.04
163163

164164
defaults:
165165
run:
@@ -168,10 +168,10 @@ jobs:
168168
strategy:
169169
fail-fast: true
170170
matrix:
171-
pyver: ["3.7", "3.8", "3.9", "3.10", "3.11"]
171+
pyver: ["3.8", "3.9", "3.10", "3.11", "3.12"]
172172

173173
steps:
174-
- uses: actions/checkout@v3
174+
- uses: actions/checkout@v4
175175

176176
- name: Set up Python on ${{ matrix.pyver }}
177177
uses: actions/setup-python@v4
@@ -193,7 +193,7 @@ jobs:
193193
contents: read # to fetch code (actions/checkout)
194194

195195
name: Build app source
196-
runs-on: ubuntu-20.04
196+
runs-on: ubuntu-22.04
197197

198198
defaults:
199199
run:
@@ -202,7 +202,7 @@ jobs:
202202
fail-fast: true
203203

204204
steps:
205-
- uses: actions/checkout@v3
205+
- uses: actions/checkout@v4
206206

207207
- name: Set up Python
208208
uses: actions/setup-python@v4
@@ -235,11 +235,11 @@ jobs:
235235
strategy:
236236
fail-fast: true
237237
matrix:
238-
os: [ubuntu-20.04, ubuntu-22.04, macos-11, macos-12]
239-
pyver: ["3.7", "3.8", "3.9", "3.10", "3.11"]
238+
os: [ubuntu-22.04, ubuntu-22.04, macos-11, macos-12]
239+
pyver: ["3.8", "3.9", "3.10", "3.11", "3.12"]
240240

241241
steps:
242-
- uses: actions/checkout@v3
242+
- uses: actions/checkout@v4
243243

244244
- name: Set up Python ${{ matrix.pyver }} on ${{ matrix.os }}
245245
uses: actions/setup-python@v4
@@ -282,10 +282,10 @@ jobs:
282282
fail-fast: true
283283
matrix:
284284
os: [windows-2019, windows-2022]
285-
pyver: ["3.7", "3.8", "3.9", "3.10", "3.11"]
285+
pyver: ["3.8", "3.9", "3.10", "3.11", "3.12"]
286286

287287
steps:
288-
- uses: actions/checkout@v3
288+
- uses: actions/checkout@v4
289289

290290
- name: Set up Python ${{ matrix.pyver }} on ${{ matrix.os }}
291291
uses: actions/setup-python@v4
@@ -326,11 +326,11 @@ jobs:
326326
strategy:
327327
fail-fast: true
328328
matrix:
329-
os: [ubuntu-20.04, ubuntu-22.04]
330-
pyver: ["3.7", "3.8", "3.9", "3.10", "3.11"]
329+
os: [ubuntu-22.04, ubuntu-22.04]
330+
pyver: ["3.8", "3.9", "3.10", "3.11", "3.12"]
331331

332332
steps:
333-
- uses: actions/checkout@v3
333+
- uses: actions/checkout@v4
334334

335335
- name: Set up Python ${{ matrix.pyver }} on ${{ matrix.os }}
336336
uses: actions/setup-python@v4
@@ -368,10 +368,10 @@ jobs:
368368
fail-fast: true
369369
matrix:
370370
os: [macos-11, macos-12]
371-
pyver: ["3.7", "3.8", "3.9", "3.10", "3.11"]
371+
pyver: ["3.8", "3.9", "3.10", "3.11", "3.12"]
372372

373373
steps:
374-
- uses: actions/checkout@v3
374+
- uses: actions/checkout@v4
375375

376376
- name: Set up Python ${{ matrix.pyver }} on ${{ matrix.os }}
377377
uses: actions/setup-python@v4
@@ -409,10 +409,10 @@ jobs:
409409
fail-fast: true
410410
matrix:
411411
os: [windows-2019, windows-2022]
412-
pyver: ["3.7", "3.8", "3.9", "3.10", "3.11"]
412+
pyver: ["3.8", "3.9", "3.10", "3.11", "3.12"]
413413

414414
steps:
415-
- uses: actions/checkout@v3
415+
- uses: actions/checkout@v4
416416

417417
- name: Set up Python ${{ matrix.pyver }} on ${{ matrix.os }}
418418
uses: actions/setup-python@v4
@@ -443,7 +443,7 @@ jobs:
443443
- build_scancode_for_release_linux
444444
- build_scancode_for_release_macos
445445

446-
runs-on: ubuntu-20.04
446+
runs-on: ubuntu-22.04
447447
defaults:
448448
run:
449449
shell: bash
@@ -566,7 +566,7 @@ jobs:
566566
- smoke_test_install_and_run_pypi_wheels_on_windows
567567
- smoke_test_install_and_run_pypi_wheels_on_posix
568568
- publish_to_gh_release
569-
runs-on: ubuntu-20.04
569+
runs-on: ubuntu-22.04
570570
defaults:
571571
run:
572572
shell: bash

‎azure-pipelines.yml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -95,34 +95,34 @@ jobs:
9595
parameters:
9696
job_name: ubuntu20_cpython
9797
image_name: ubuntu-20.04
98-
python_versions: ['3.8', '3.9', '3.10', '3.11']
9998
python_architecture: x64
99+
python_versions: ['3.8', '3.9', '3.10', '3.11', '3.12']
100100
test_suites:
101101
all: venv/bin/pytest -n 2 -vvs tests/scancode/test_cli.py --reruns 2
102102

103103
- template: etc/ci/azure-posix.yml
104104
parameters:
105105
job_name: ubuntu22_cpython
106106
image_name: ubuntu-22.04
107-
python_versions: ['3.8', '3.9', '3.10', '3.11']
108107
python_architecture: x64
108+
python_versions: ['3.8', '3.9', '3.10', '3.11', '3.12']
109109
test_suites:
110110
all: venv/bin/pytest -n 2 -vvs tests/scancode/test_cli.py --reruns 2
111111

112112
- template: etc/ci/azure-posix.yml
113113
parameters:
114114
job_name: macos11_cpython
115-
image_name: macos-11
116-
python_versions: ['3.8', '3.9', '3.10', '3.11']
117115
python_architecture: x64
116+
image_name: macOS-11
117+
python_versions: ['3.8', '3.9', '3.10', '3.11', '3.12']
118118
test_suites:
119119
all: venv/bin/pytest -n 2 -vvs tests/scancode/test_cli.py --reruns 2
120120

121121
- template: etc/ci/azure-posix.yml
122122
parameters:
123123
job_name: macos12_cpython
124-
image_name: macos-12
125-
python_versions: ['3.8', '3.9', '3.10', '3.11']
124+
image_name: macOS-12
125+
python_versions: ['3.8', '3.9', '3.10', '3.11', '3.12']
126126
python_architecture: x64
127127
test_suites:
128128
all: venv/bin/pytest -n 2 -vvs tests/scancode/test_cli.py --reruns 2
@@ -140,8 +140,8 @@ jobs:
140140
parameters:
141141
job_name: win2022_cpython
142142
image_name: windows-2022
143-
python_versions: ['3.8', '3.9', '3.10', '3.11']
144143
python_architecture: x64
144+
python_versions: ['3.8', '3.9', '3.10', '3.11', '3.12']
145145
test_suites:
146146
all: venv\Scripts\pytest -n 2 -vvs tests\scancode\test_cli.py --reruns 2
147147

@@ -158,7 +158,7 @@ jobs:
158158
parameters:
159159
job_name: win2022_cpython_2
160160
image_name: windows-2022
161-
python_versions: ['3.9', '3.10', '3.11']
161+
python_versions: ['3.8', '3.9', '3.10', '3.11', '3.12']
162162
python_architecture: x64
163163
test_suites:
164164
all: venv\Scripts\pytest -n 2 -vvs tests\scancode\test_cli.py --reruns 2
@@ -173,7 +173,7 @@ jobs:
173173
parameters:
174174
job_name: ubuntu20_test_all_supported_click_versions
175175
image_name: ubuntu-20.04
176-
python_versions: ['3.8', '3.9', '3.10', '3.11']
176+
python_versions: ['3.8', '3.9', '3.10', '3.11', '3.12']
177177
python_architecture: x64
178178
test_suites:
179179
click_versions: |
@@ -193,47 +193,47 @@ jobs:
193193
parameters:
194194
job_name: ubuntu22_cpython_latest_from_pip
195195
image_name: ubuntu-22.04
196-
python_versions: ['3.8', '3.9', '3.10', '3.11']
196+
python_versions: ['3.8', '3.9', '3.10', '3.11', '3.12']
197197
test_suites:
198198
all: venv/bin/pip install --upgrade-strategy eager --force-reinstall --upgrade -e .[testing] && venv/bin/pytest -n 2 -vvs tests/scancode/test_cli.py
199199

200200
- template: etc/ci/azure-posix.yml
201201
parameters:
202202
job_name: ubuntu20_cpython_latest_from_pip
203203
image_name: ubuntu-20.04
204-
python_versions: ['3.8', '3.9', '3.10', '3.11']
204+
python_versions: ['3.8', '3.9', '3.10', '3.11', '3.12']
205205
test_suites:
206206
all: venv/bin/pip install --upgrade-strategy eager --force-reinstall --upgrade -e .[testing] && venv/bin/pytest -n 2 -vvs tests/scancode/test_cli.py
207207

208208
- template: etc/ci/azure-posix.yml
209209
parameters:
210210
job_name: macos11_cpython_latest_from_pip
211211
image_name: macos-11
212-
python_versions: ['3.8', '3.9', '3.10', '3.11']
212+
python_versions: ['3.8', '3.9', '3.10', '3.11', '3.12']
213213
test_suites:
214214
all: venv/bin/pip install --upgrade-strategy eager --force-reinstall --upgrade -e .[testing] && venv/bin/pytest -n 2 -vvs tests/scancode/test_cli.py
215215

216216
- template: etc/ci/azure-posix.yml
217217
parameters:
218218
job_name: macos12_cpython_latest_from_pip
219219
image_name: macos-12
220-
python_versions: ['3.8', '3.9', '3.10', '3.11']
220+
python_versions: ['3.8', '3.9', '3.10', '3.11', '3.12']
221221
test_suites:
222222
all: venv/bin/pip install --upgrade-strategy eager --force-reinstall --upgrade -e .[testing] && venv/bin/pytest -n 2 -vvs tests/scancode/test_cli.py
223223

224224
- template: etc/ci/azure-win.yml
225225
parameters:
226226
job_name: win2019_cpython_latest_from_pip
227227
image_name: windows-2019
228-
python_versions: ['3.8', '3.9', '3.10', '3.11']
228+
python_versions: ['3.8', '3.9', '3.10', '3.11', '3.12']
229229
test_suites:
230230
all: venv\Scripts\pip install --upgrade-strategy eager --force-reinstall --upgrade -e .[testing] && venv\Scripts\pytest -n 2 -vvs tests\scancode\test_cli.py
231231

232232
- template: etc/ci/azure-win.yml
233233
parameters:
234234
job_name: win2022_cpython_latest_from_pip
235235
image_name: windows-2022
236-
python_versions: ['3.8', '3.9', '3.10', '3.11']
236+
python_versions: ['3.8', '3.9', '3.10', '3.11', '3.12']
237237
test_suites:
238238
all: venv\Scripts\pip install --upgrade-strategy eager --force-reinstall --upgrade -e .[testing] && venv\Scripts\pytest -n 2 -vvs tests\scancode\test_cli.py
239239

0 commit comments

Comments
 (0)