Skip to content
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

Jump to bottom

Add support for musllinux_1_2 #861

Merged
merged 5 commits into from
Jun 24, 2024
Merged

Add support for musllinux_1_2 #861

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b0b4c05
Test build wheels on musllinux_1_2
jesper-friis Jun 22, 2024
6deee8e
Don't build Python 3.12 for musllinux - cibuildwheel still depends on…
jesper-friis Jun 23, 2024
23d9098
Merge branch 'replace-distutils' into musllinux_1_2
jesper-friis Jun 23, 2024
bcda8b9
Updated version table with musllinux installation
jesper-friis Jun 23, 2024
a7680fe
Merge branch 'master' into musllinux_1_2
francescalb Jun 24, 2024
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
53 changes: 18 additions & 35 deletions .github/workflows/ci_build_wheels.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,18 @@ jobs:
system_type: ["manylinux", "2014"]
arch: i686
py_minors: 8,12
# Python 3.12 fails since cibuildwheel still depends on distutils
# for musllinux
- os: ubuntu-20.04
system_type: ["musllinux", "_1_1"]
arch: i686
py_minors: 8,11 # Python 3.12 fails
# Fails with cannot import distutils
#- os: ubuntu-20.04
# system_type: ["musllinux", "_1_2"]
# arch: i686
# py_minors: 10,11
py_minors: 8,11
# Python 3.12 fails since cibuildwheel still depends on distutils
# for musllinux
- os: ubuntu-20.04
system_type: ["musllinux", "_1_2"]
arch: i686
py_minors: 8,11

# 64-bit linux
- os: ubuntu-20.04
Expand All @@ -49,38 +52,18 @@ jobs:
system_type: ["manylinux", "_2_28"]
arch: x86_64
py_minors: 8,12
# See issue #225: https://github.com/SINTEF/dlite/issues/225
# - os: ubuntu-20.04
# system_type: ["musllinux", "_1_1"]
# arch: x86_64
# py_minors: 8,10
# Python 3.12 fails since cibuildwheel still depends on distutils
# for musllinux
- os: ubuntu-20.04
system_type: ["musllinux", "_1_1"]
arch: x86_64
py_minors: 8,11 # Fails for Python-3.12
# Fails with cannot import distutils
#- os: ubuntu-20.04
# system_type: ["musllinux", "_1_2"]
# arch: x86_64
# py_minors: 8,12

# May work after weekly container build...
#- os: ubuntu-20.04
# system_type: ["musllinux", "_1_2"]
# arch: x86_64
# py_minors: 8
#- os: ubuntu-20.04
# system_type: ["musllinux", "_1_2"]
# arch: x86_64
# py_minors: 10
#- os: ubuntu-20.04
# system_type: ["musllinux", "_1_2"]
# arch: x86_64
# py_minors: 11
#- os: ubuntu-20.04
# system_type: ["musllinux", "_1_2"]
# arch: x86_64
# py_minors: 12
py_minors: 8,11
# Python 3.12 fails since cibuildwheel still depends on distutils
# for musllinux
- os: ubuntu-20.04
system_type: ["musllinux", "_1_2"]
arch: x86_64
py_minors: 8,11

# See issue #220: https://github.com/SINTEF/dlite/issues/220
# # 32-bit Windows
Expand Down
4 changes: 2 additions & 2 deletions doc/getting_started/installation.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ wheels are shown in the following two tables.
| Python version | 3.8 | 3.9 | 3.10 | 3.11 | 3.12 |
| ---------------- | --- | --- | ---- | ---- | ---- |
| [musllinux_1_1] | x | x | x | x | |
| [musllinux_1_2] | | | | | |
| [musllinux_1_2] | x | x | x | x | |
| [manylinux2010] | x | x | | | |
| [manylinux2014] | x | x | x | x | x |
| [manylinux_2_28] | | | | | |
Expand All @@ -49,7 +49,7 @@ wheels are shown in the following two tables.
| Python version | 3.8 | 3.9 | 3.10 | 3.11 | 3.12 |
| ---------------- | --- | --- | ---- | ---- | ---- |
| [musllinux_1_1] | x | x | x | x | |
| [musllinux_1_2] | | | | | |
| [musllinux_1_2] | x | x | x | x | |
| [manylinux2010] | x | x | | | |
| [manylinux2014] | x | x | x | x | x |
| [manylinux_2_28] | x | x | x | x | x |
Expand Down