Skip to content

Commit 5ec85c4

Browse files
AyanSinhaMahapatraAyanSinhaMahapatra
authored
Merge pull request #3232 from nexB/app-archives-all-python
Build app archives for all python versions
2 parents 44ab276 + 6b0105a commit 5ec85c4

File tree

8 files changed

+128
-44
lines changed

8 files changed

+128
-44
lines changed

‎.github/workflows/scancode-release.yml‎

Lines changed: 116 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
strategy:
3535
fail-fast: true
3636
matrix:
37-
pyver: ["3.7", "3.8", "3.9", "3.10"]
37+
pyver: ["3.7", "3.8", "3.9", "3.10", "3.11"]
3838

3939
steps:
4040
- uses: actions/checkout@v2
@@ -99,22 +99,24 @@ jobs:
9999

100100
strategy:
101101
fail-fast: true
102+
matrix:
103+
pyver: ["3.7", "3.8", "3.9", "3.10", "3.11"]
102104

103105
steps:
104106
- uses: actions/checkout@v2
105107

106-
- name: Set up Python
108+
- name: Set up Python on ${{ matrix.pyver }}
107109
uses: actions/setup-python@v1
108110
with:
109-
python-version: "3.8"
111+
python-version: ${{ matrix.pyver }}
110112

111113
- name: Build linux app archive
112-
run: etc/release/scancode-create-release-app-linux.sh
114+
run: etc/release/scancode-create-release-app-linux.sh ${{ matrix.pyver }}
113115

114-
- name: Collect built linux app
116+
- name: Collect built linux app for python ${{ matrix.pyver }}
115117
uses: actions/upload-artifact@v3
116118
with:
117-
name: linux_app
119+
name: linux_app_py_${{ matrix.pyver }}
118120
path: release/*
119121

120122

@@ -131,22 +133,24 @@ jobs:
131133

132134
strategy:
133135
fail-fast: true
136+
matrix:
137+
pyver: ["3.7", "3.8", "3.9", "3.10", "3.11"]
134138

135139
steps:
136140
- uses: actions/checkout@v2
137141

138-
- name: Set up Python
142+
- name: Set up Python on ${{ matrix.pyver }}
139143
uses: actions/setup-python@v1
140144
with:
141-
python-version: "3.8"
145+
python-version: ${{ matrix.pyver }}
142146

143147
- name: Build mac app archive
144-
run: etc/release/scancode-create-release-app-macos.sh
148+
run: etc/release/scancode-create-release-app-macos.sh ${{ matrix.pyver }}
145149

146-
- name: Collect built mac app
150+
- name: Collect built mac app for python ${{ matrix.pyver }}
147151
uses: actions/upload-artifact@v3
148152
with:
149-
name: macos_app
153+
name: macos_app_py_${{ matrix.pyver }}
150154
path: release/*
151155

152156

@@ -160,24 +164,27 @@ jobs:
160164
defaults:
161165
run:
162166
shell: bash
167+
163168
strategy:
164169
fail-fast: true
170+
matrix:
171+
pyver: ["3.7", "3.8", "3.9", "3.10", "3.11"]
165172

166173
steps:
167174
- uses: actions/checkout@v2
168175

169-
- name: Set up Python
176+
- name: Set up Python on ${{ matrix.pyver }}
170177
uses: actions/setup-python@v1
171178
with:
172-
python-version: "3.8"
179+
python-version: ${{ matrix.pyver }}
173180

174181
- name: Build windows app archive
175-
run: etc/release/scancode-create-release-app-windows.sh
182+
run: etc/release/scancode-create-release-app-windows.sh ${{ matrix.pyver }}
176183

177-
- name: Collect built windows app
184+
- name: Collect built windows app for python ${{ matrix.pyver }}
178185
uses: actions/upload-artifact@v3
179186
with:
180-
name: windows_app
187+
name: windows_app_py_${{ matrix.pyver }}
181188
path: release/*
182189

183190

@@ -229,7 +236,7 @@ jobs:
229236
fail-fast: true
230237
matrix:
231238
os: [ubuntu-20.04, ubuntu-22.04, macos-11, macos-12]
232-
pyver: ["3.7", "3.8", "3.9", "3.10"]
239+
pyver: ["3.7", "3.8", "3.9", "3.10", "3.11"]
233240

234241
steps:
235242
- uses: actions/checkout@v2
@@ -275,7 +282,7 @@ jobs:
275282
fail-fast: true
276283
matrix:
277284
os: [windows-2019, windows-2022]
278-
pyver: ["3.7", "3.8", "3.9", "3.10"]
285+
pyver: ["3.7", "3.8", "3.9", "3.10", "3.11"]
279286

280287
steps:
281288
- uses: actions/checkout@v2
@@ -320,7 +327,7 @@ jobs:
320327
fail-fast: true
321328
matrix:
322329
os: [ubuntu-18.04, ubuntu-20.04, ubuntu-22.04]
323-
pyver: [3.8]
330+
pyver: ["3.7", "3.8", "3.9", "3.10", "3.11"]
324331

325332
steps:
326333
- uses: actions/checkout@v2
@@ -330,10 +337,10 @@ jobs:
330337
with:
331338
python-version: ${{ matrix.pyver }}
332339

333-
- name: Download a single artifact linux_app
340+
- name: Download a single artifact linux_app_py_${{ matrix.pyver }}
334341
uses: actions/download-artifact@v3
335342
with:
336-
name: linux_app
343+
name: linux_app_py_${{ matrix.pyver }}
337344
path: dist
338345

339346
- name: test install app archive
@@ -361,7 +368,7 @@ jobs:
361368
fail-fast: true
362369
matrix:
363370
os: [macos-11, macos-12]
364-
pyver: [3.8]
371+
pyver: ["3.7", "3.8", "3.9", "3.10", "3.11"]
365372

366373
steps:
367374
- uses: actions/checkout@v2
@@ -371,10 +378,10 @@ jobs:
371378
with:
372379
python-version: ${{ matrix.pyver }}
373380

374-
- name: Download a single artifact macos_app
381+
- name: Download a single artifact macos_app_py_${{ matrix.pyver }}
375382
uses: actions/download-artifact@v3
376383
with:
377-
name: macos_app
384+
name: macos_app_py_${{ matrix.pyver }}
378385
path: dist
379386

380387
- name: test install app archive
@@ -402,7 +409,7 @@ jobs:
402409
fail-fast: true
403410
matrix:
404411
os: [windows-2019, windows-2022]
405-
pyver: [3.8]
412+
pyver: ["3.7", "3.8", "3.9", "3.10", "3.11"]
406413

407414
steps:
408415
- uses: actions/checkout@v2
@@ -412,10 +419,10 @@ jobs:
412419
with:
413420
python-version: ${{ matrix.pyver }}
414421

415-
- name: Download a single artifact windows_app
422+
- name: Download a single artifact windows_app_py_${{ matrix.pyver }}
416423
uses: actions/download-artifact@v3
417424
with:
418-
name: windows_app
425+
name: windows_app_py_${{ matrix.pyver }}
419426
path: dist
420427

421428
- name: test install app archive
@@ -432,6 +439,9 @@ jobs:
432439
- smoke_test_install_and_run_app_archives_on_windows
433440
- smoke_test_install_and_run_app_archives_on_macos
434441
- build_scancode_for_release_source
442+
- build_scancode_for_release_windows
443+
- build_scancode_for_release_linux
444+
- build_scancode_for_release_macos
435445

436446
runs-on: ubuntu-20.04
437447
defaults:
@@ -447,22 +457,94 @@ jobs:
447457
name: source_app
448458
path: dist
449459

450-
- name: Download a single artifact macos_app
460+
- name: Download a single artifact macos_app for python 3.7
461+
uses: actions/download-artifact@v3
462+
with:
463+
name: macos_app_py_3.7
464+
path: dist
465+
466+
- name: Download a single artifact macos_app for python 3.8
467+
uses: actions/download-artifact@v3
468+
with:
469+
name: macos_app_py_3.8
470+
path: dist
471+
472+
- name: Download a single artifact macos_app for python 3.9
473+
uses: actions/download-artifact@v3
474+
with:
475+
name: macos_app_py_3.9
476+
path: dist
477+
478+
- name: Download a single artifact macos_app for python 3.10
479+
uses: actions/download-artifact@v3
480+
with:
481+
name: macos_app_py_3.10
482+
path: dist
483+
484+
- name: Download a single artifact macos_app for python 3.11
485+
uses: actions/download-artifact@v3
486+
with:
487+
name: macos_app_py_3.11
488+
path: dist
489+
490+
- name: Download a single artifact linux_app for python 3.7
491+
uses: actions/download-artifact@v3
492+
with:
493+
name: linux_app_py_3.7
494+
path: dist
495+
496+
- name: Download a single artifact linux_app for python 3.8
497+
uses: actions/download-artifact@v3
498+
with:
499+
name: linux_app_py_3.8
500+
path: dist
501+
502+
- name: Download a single artifact linux_app for python 3.9
503+
uses: actions/download-artifact@v3
504+
with:
505+
name: linux_app_py_3.9
506+
path: dist
507+
508+
- name: Download a single artifact linux_app for python 3.10
509+
uses: actions/download-artifact@v3
510+
with:
511+
name: linux_app_py_3.10
512+
path: dist
513+
514+
- name: Download a single artifact linux_app for python 3.11
515+
uses: actions/download-artifact@v3
516+
with:
517+
name: linux_app_py_3.11
518+
path: dist
519+
520+
- name: Download a single artifact windows_app for python 3.7
521+
uses: actions/download-artifact@v3
522+
with:
523+
name: windows_app_py_3.7
524+
path: dist
525+
526+
- name: Download a single artifact windows_app for python 3.8
527+
uses: actions/download-artifact@v3
528+
with:
529+
name: windows_app_py_3.8
530+
path: dist
531+
532+
- name: Download a single artifact windows_app for python 3.9
451533
uses: actions/download-artifact@v3
452534
with:
453-
name: macos_app
535+
name: windows_app_py_3.9
454536
path: dist
455537

456-
- name: Download a single artifact linux_app
538+
- name: Download a single artifact windows_app for python 3.10
457539
uses: actions/download-artifact@v3
458540
with:
459-
name: linux_app
541+
name: windows_app_py_3.10
460542
path: dist
461543

462-
- name: Download a single artifact windows_app
544+
- name: Download a single artifact windows_app for python 3.11
463545
uses: actions/download-artifact@v3
464546
with:
465-
name: windows_app
547+
name: windows_app_py_3.11
466548
path: dist
467549

468550
- name: Mock GH release
@@ -491,7 +573,7 @@ jobs:
491573
strategy:
492574
fail-fast: true
493575
matrix:
494-
dist_names: ["wheels-3.7", "wheels-3.8", "wheels-3.9", "wheels-3.10", sdists]
576+
dist_names: ["wheels-3.7", "wheels-3.8", "wheels-3.9", "wheels-3.10", "wheels-3.11", sdists]
495577

496578
steps:
497579
- name: Set up Python

‎etc/release/scancode-create-release-app-linux.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ set -e
1818

1919

2020
operating_system=linux
21-
python_dot_version=3.8
22-
python_version=38
21+
python_dot_version=$1
22+
python_version=${python_dot_version//.}
2323
python_exe="python$python_dot_version"
2424
release_dir=scancode-toolkit-$(git describe --tags)
2525

‎etc/release/scancode-create-release-app-macos.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ set -e
1818

1919

2020
operating_system=macos
21-
python_dot_version=3.8
22-
python_version=38
21+
python_dot_version=$1
22+
python_version=${python_dot_version//.}
2323
python_exe="python3"
2424
release_dir=scancode-toolkit-$(git describe --tags)
2525

‎etc/release/scancode-create-release-app-windows.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ set -e
1717
#set -x
1818

1919
operating_system=windows
20-
python_dot_version=3.8
21-
python_version=38
20+
python_dot_version=$1
21+
python_version=${python_dot_version//.}
2222
python_exe="py -$python_dot_version"
2323
release_dir=scancode-toolkit-$(git describe --tags)
2424

‎etc/scripts/utils_thirdparty.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,13 +115,14 @@
115115
TRACE_ULTRA_DEEP = False
116116

117117
# Supported environments
118-
PYTHON_VERSIONS = "37", "38", "39", "310"
118+
PYTHON_VERSIONS = "37", "38", "39", "310", "311"
119119

120120
PYTHON_DOT_VERSIONS_BY_VER = {
121121
"37": "3.7",
122122
"38": "3.8",
123123
"39": "3.9",
124124
"310": "3.10",
125+
"311": "3.11",
125126
}
126127

127128

@@ -137,6 +138,7 @@ def get_python_dot_version(version):
137138
"38": ["cp38", "cp38m", "abi3"],
138139
"39": ["cp39", "cp39m", "abi3"],
139140
"310": ["cp310", "cp310m", "abi3"],
141+
"311": ["cp311", "cp311m", "abi3"],
140142
}
141143

142144
PLATFORMS_BY_OS = {

‎requirements.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Jinja2==3.1.2
3636
jsonstreams==0.6.0
3737
license-expression==30.0.0
3838
lxml==4.9.2
39-
MarkupSafe==2.1.1
39+
MarkupSafe==2.1.2
4040
more-itertools==8.13.0
4141
normality==2.3.3
4242
packageurl-python==0.10.0

‎setup-mini.cfg‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ install_requires =
8787
jsonstreams >= 0.5.0
8888
license_expression >= 30.0.0
8989
lxml >= 4.9.2
90-
MarkupSafe >= 1.0
90+
MarkupSafe >= 2.1.2
9191
packageurl_python >= 0.9.0
9292
packvers >= 21.0.0
9393
# use temp advanced patched release

‎setup.cfg‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ install_requires =
8787
jsonstreams >= 0.5.0
8888
license_expression >= 30.0.0
8989
lxml >= 4.9.2
90-
MarkupSafe >= 1.0
90+
MarkupSafe >= 2.1.2
9191
packageurl_python >= 0.9.0
9292
packvers >= 21.0.0
9393
# use temp advanced patched release

0 commit comments

Comments
 (0)