Skip to content

Build app archives for all python versions #3232

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Feb 17, 2023
Merged

Build app archives for all python versions #3232

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2f85a2c
Build app archives for all python versions
AyanSinhaMahapatra Jan 27, 2023
ac6b311
Update utils_thirdparty.py with python 3.11 support
AyanSinhaMahapatra Jan 30, 2023
589ce82
Bump MarkupSafe version
AyanSinhaMahapatra Jan 30, 2023
aef205d
Update github artifact download action
AyanSinhaMahapatra Jan 30, 2023
6b0105a
Add missing $ on release script for captions
AyanSinhaMahapatra Feb 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 35 additions & 28 deletions .github/workflows/scancode-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
strategy:
fail-fast: true
matrix:
pyver: ["3.7", "3.8", "3.9", "3.10"]
pyver: ["3.7", "3.8", "3.9", "3.10", "3.11"]

steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -99,22 +99,24 @@ jobs:

strategy:
fail-fast: true
matrix:
pyver: ["3.7", "3.8", "3.9", "3.10", "3.11"]

steps:
- uses: actions/checkout@v2

- name: Set up Python
- name: Set up Python on ${{ matrix.pyver }}
uses: actions/setup-python@v1
with:
python-version: "3.8"
python-version: ${{ matrix.pyver }}

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

- name: Collect built linux app
- name: Collect built linux app for python {{ matrix.pyver }}
uses: actions/upload-artifact@v3
with:
name: linux_app
name: linux_app_py_${{ matrix.pyver }}
path: release/*


Expand All @@ -131,22 +133,24 @@ jobs:

strategy:
fail-fast: true
matrix:
pyver: ["3.7", "3.8", "3.9", "3.10", "3.11"]

steps:
- uses: actions/checkout@v2

- name: Set up Python
- name: Set up Python on ${{ matrix.pyver }}
uses: actions/setup-python@v1
with:
python-version: "3.8"
python-version: ${{ matrix.pyver }}

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

- name: Collect built mac app
- name: Collect built mac app for python {{ matrix.pyver }}
uses: actions/upload-artifact@v3
with:
name: macos_app
name: macos_app_py_${{ matrix.pyver }}
path: release/*


Expand All @@ -160,24 +164,27 @@ jobs:
defaults:
run:
shell: bash

strategy:
fail-fast: true
matrix:
pyver: ["3.7", "3.8", "3.9", "3.10", "3.11"]

steps:
- uses: actions/checkout@v2

- name: Set up Python
- name: Set up Python on ${{ matrix.pyver }}
uses: actions/setup-python@v1
with:
python-version: "3.8"
python-version: ${{ matrix.pyver }}

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

- name: Collect built windows app
- name: Collect built windows app for python {{ matrix.pyver }}
uses: actions/upload-artifact@v3
with:
name: windows_app
name: windows_app_py_${{ matrix.pyver }}
path: release/*


Expand Down Expand Up @@ -229,7 +236,7 @@ jobs:
fail-fast: true
matrix:
os: [ubuntu-20.04, ubuntu-22.04, macos-11, macos-12]
pyver: ["3.7", "3.8", "3.9", "3.10"]
pyver: ["3.7", "3.8", "3.9", "3.10", "3.11"]

steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -275,7 +282,7 @@ jobs:
fail-fast: true
matrix:
os: [windows-2019, windows-2022]
pyver: ["3.7", "3.8", "3.9", "3.10"]
pyver: ["3.7", "3.8", "3.9", "3.10", "3.11"]

steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -320,7 +327,7 @@ jobs:
fail-fast: true
matrix:
os: [ubuntu-18.04, ubuntu-20.04, ubuntu-22.04]
pyver: [3.8]
pyver: ["3.7", "3.8", "3.9", "3.10", "3.11"]

steps:
- uses: actions/checkout@v2
Expand All @@ -330,10 +337,10 @@ jobs:
with:
python-version: ${{ matrix.pyver }}

- name: Download a single artifact linux_app
- name: Download a single artifact linux_app_py_${{ matrix.pyver }}
uses: actions/download-artifact@v3
with:
name: linux_app
name: linux_app_py_${{ matrix.pyver }}
path: dist

- name: test install app archive
Expand Down Expand Up @@ -361,7 +368,7 @@ jobs:
fail-fast: true
matrix:
os: [macos-11, macos-12]
pyver: [3.8]
pyver: ["3.7", "3.8", "3.9", "3.10", "3.11"]

steps:
- uses: actions/checkout@v2
Expand All @@ -371,10 +378,10 @@ jobs:
with:
python-version: ${{ matrix.pyver }}

- name: Download a single artifact macos_app
- name: Download a single artifact macos_app_py_${{ matrix.pyver }}
uses: actions/download-artifact@v3
with:
name: macos_app
name: macos_app_py_${{ matrix.pyver }}
path: dist

- name: test install app archive
Expand Down Expand Up @@ -402,7 +409,7 @@ jobs:
fail-fast: true
matrix:
os: [windows-2019, windows-2022]
pyver: [3.8]
pyver: ["3.7", "3.8", "3.9", "3.10", "3.11"]

steps:
- uses: actions/checkout@v2
Expand All @@ -412,10 +419,10 @@ jobs:
with:
python-version: ${{ matrix.pyver }}

- name: Download a single artifact windows_app
- name: Download a single artifact windows_app_py_${{ matrix.pyver }}
uses: actions/download-artifact@v3
with:
name: windows_app
name: windows_app_py_${{ matrix.pyver }}
path: dist

- name: test install app archive
Expand Down Expand Up @@ -491,7 +498,7 @@ jobs:
strategy:
fail-fast: true
matrix:
dist_names: ["wheels-3.7", "wheels-3.8", "wheels-3.9", "wheels-3.10", sdists]
dist_names: ["wheels-3.7", "wheels-3.8", "wheels-3.9", "wheels-3.10", "wheels-3.11", sdists]

steps:
- name: Set up Python
Expand Down
4 changes: 2 additions & 2 deletions etc/release/scancode-create-release-app-linux.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ set -e


operating_system=linux
python_dot_version=3.8
python_version=38
python_dot_version=$1
python_version=${python_dot_version//.}
python_exe="python$python_dot_version"
release_dir=scancode-toolkit-$(git describe --tags)

Expand Down
4 changes: 2 additions & 2 deletions etc/release/scancode-create-release-app-macos.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ set -e


operating_system=macos
python_dot_version=3.8
python_version=38
python_dot_version=$1
python_version=${python_dot_version//.}
python_exe="python3"
release_dir=scancode-toolkit-$(git describe --tags)

Expand Down
4 changes: 2 additions & 2 deletions etc/release/scancode-create-release-app-windows.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ set -e
#set -x

operating_system=windows
python_dot_version=3.8
python_version=38
python_dot_version=$1
python_version=${python_dot_version//.}
python_exe="py -$python_dot_version"
release_dir=scancode-toolkit-$(git describe --tags)

Expand Down
4 changes: 3 additions & 1 deletion etc/scripts/utils_thirdparty.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,13 +115,14 @@
TRACE_ULTRA_DEEP = False

# Supported environments
PYTHON_VERSIONS = "37", "38", "39", "310"
PYTHON_VERSIONS = "37", "38", "39", "310", "311"

PYTHON_DOT_VERSIONS_BY_VER = {
"37": "3.7",
"38": "3.8",
"39": "3.9",
"310": "3.10",
"311": "3.11",
}


Expand All @@ -137,6 +138,7 @@ def get_python_dot_version(version):
"38": ["cp38", "cp38m", "abi3"],
"39": ["cp39", "cp39m", "abi3"],
"310": ["cp310", "cp310m", "abi3"],
"311": ["cp311", "cp311m", "abi3"],
}

PLATFORMS_BY_OS = {
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ Jinja2==3.1.2
jsonstreams==0.6.0
license-expression==30.0.0
lxml==4.9.2
MarkupSafe==2.1.1
MarkupSafe==2.1.2
more-itertools==8.13.0
normality==2.3.3
packageurl-python==0.10.0
Expand Down
2 changes: 1 addition & 1 deletion setup-mini.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ install_requires =
jsonstreams >= 0.5.0
license_expression >= 30.0.0
lxml >= 4.9.2
MarkupSafe >= 1.0
MarkupSafe >= 2.1.2
packageurl_python >= 0.9.0
packvers >= 21.0.0
# use temp advanced patched release
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ install_requires =
jsonstreams >= 0.5.0
license_expression >= 30.0.0
lxml >= 4.9.2
MarkupSafe >= 1.0
MarkupSafe >= 2.1.2
packageurl_python >= 0.9.0
packvers >= 21.0.0
# use temp advanced patched release
Expand Down