Skip to content

Commit

Permalink
Add support for musllinux_1_2 (#861)
Browse files Browse the repository at this point in the history
# Description
Add support for building wheels for musllinux_1_2.
Note that wheelse for python3.12 cannot be built on musllinux. 

Builds on top of PR #860.

## Type of change
- [ ] Bug fix & code cleanup
- [x] New feature
- [ ] Documentation update
- [ ] Test update

## Checklist for the reviewer
This checklist should be used as a help for the reviewer.

- [ ] Is the change limited to one issue?
- [ ] Does this PR close the issue?
- [ ] Is the code easy to read and understand?
- [ ] Do all new feature have an accompanying new test?
- [ ] Has the documentation been updated as necessary?
  • Loading branch information
francescalb authored Jun 24, 2024
2 parents ce04221 + a7680fe commit 879ee73
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 37 deletions.
53 changes: 18 additions & 35 deletions .github/workflows/ci_build_wheels.yml
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
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

0 comments on commit 879ee73

Please sign in to comment.