Skip to content

Commit 609bef5

Browse files
idavisidavis
authored
Move to Python 3.9 as min ver and Ubuntu 22.04 min compat ver (microsoft#2061)
Fixes microsoft#1946 - Cross build image is now set to CBL Mariner with glibc 2.35 and Python 3.9 - Manylinux tag is now `manylinux_2_35_x86_64` - A docker image is no longer built, we directly use the Mariner Python base image.
1 parent b43d102 commit 609bef5

File tree

9 files changed

+17
-54
lines changed

9 files changed

+17
-54
lines changed

‎.ado/publish.yml‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,13 @@ parameters:
3434
default:
3535
- name: linux_x86_64
3636
poolName: 'Azure-Pipelines-DevTools-EO'
37-
imageName: 'ubuntu-20.04'
37+
imageName: 'ubuntu-22.04'
3838
os: linux
3939
arch: x86_64
4040
additionalTargets: wasm32-unknown-unknown
4141
- name: linux_aarch64
4242
poolName: 'Azure-Pipelines-DevTools-EO'
43-
imageName: 'ubuntu-20.04'
43+
imageName: 'ubuntu-22.04'
4444
os: linux
4545
arch: aarch64
4646
additionalRustTargets: aarch64-unknown-linux-gnu wasm32-unknown-unknown
@@ -299,7 +299,7 @@ extends:
299299
python -m pip install auditwheel patchelf
300300
ls target/wheels
301301
ls target/wheels/*.whl | xargs auditwheel show
302-
ls target/wheels/*.whl | xargs auditwheel repair --wheel-dir ./target/wheels/ --plat manylinux_2_31_x86_64
302+
ls target/wheels/*.whl | xargs auditwheel repair --wheel-dir ./target/wheels/ --plat manylinux_2_35_x86_64
303303
rm target/wheels/*-linux_x86_64.whl
304304
ls target/wheels
305305
displayName: Run auditwheel for Linux Wheels
@@ -313,10 +313,8 @@ extends:
313313
condition: and(eq(variables['Agent.OS'], 'Linux'), eq(variables['arch'], 'aarch64'))
314314
315315
- script: |
316-
chmod +x ./docker/linux-aarch64/build.sh
317316
chmod +x ./docker/linux-aarch64/run.sh
318317
319-
./docker/linux-aarch64/build.sh
320318
./docker/linux-aarch64/run.sh
321319
displayName: Run auditwheel and python tests for Linux aarch64 Wheels
322320
condition: and(eq(variables['Agent.OS'], 'Linux'), eq(variables['arch'], 'aarch64'))

‎docker/linux-aarch64/Dockerfile‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎docker/linux-aarch64/build.sh‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎docker/linux-aarch64/entrypoint.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ echo "SCRIPT_DIR: ${SCRIPT_DIR}"
1111
WHEEL_ARCH="${WHEEL_ARCH:-aarch64}"
1212
echo "WHEEL_ARCH: ${WHEEL_ARCH}"
1313

14-
WHEEL_PLATFORM="${WHEEL_PLATFORM:-manylinux_2_31_${WHEEL_ARCH}}"
14+
WHEEL_PLATFORM="${WHEEL_PLATFORM:-manylinux_2_35_${WHEEL_ARCH}}"
1515
echo "WHEEL_PLATFORM: ${WHEEL_PLATFORM}"
1616

1717
PIP_DIR="${PIP_DIR:-${SCRIPT_DIR}/../../pip}"

‎docker/linux-aarch64/run.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ set -e
88
SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
99
echo "SCRIPT_DIR: ${SCRIPT_DIR}"
1010

11-
TAG="${TAG:-qsharp-linux-aarch64-runner}"
12-
echo "TAG: ${TAG}"
11+
BASE_IMAGE="${BASE_IMAGE:-mcr.microsoft.com/cbl-mariner/base/python:3.9}"
12+
echo "BASE_IMAGE: ${BASE_IMAGE}"
1313

1414
VOLUME_ROOT=$(realpath ${SCRIPT_DIR}/../..)
1515
echo "VOLUME_ROOT: ${VOLUME_ROOT}"
1616

17-
echo "docker run --platform linux/arm64/v8 -v ${VOLUME_ROOT}:/qsharp -e WHEEL_DIR='/qsharp/target/wheels' ${TAG} bash /qsharp/docker/linux-aarch64/entrypoint.sh"
18-
docker run --platform linux/arm64/v8 -v ${VOLUME_ROOT}:/qsharp -e WHEEL_DIR='/qsharp/target/wheels' ${TAG} bash /qsharp/docker/linux-aarch64/entrypoint.sh
17+
echo "docker run --platform linux/arm64/v8 -v ${VOLUME_ROOT}:/qsharp -e WHEEL_DIR='/qsharp/target/wheels' ${BASE_IMAGE} bash /qsharp/docker/linux-aarch64/entrypoint.sh"
18+
docker run --platform linux/arm64/v8 -v ${VOLUME_ROOT}:/qsharp -e WHEEL_DIR='/qsharp/target/wheels' ${BASE_IMAGE} bash /qsharp/docker/linux-aarch64/entrypoint.sh

‎fuzz/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Based on [Fuzzing with cargo-fuzz](https://rust-fuzz.github.io/book/cargo-fuzz.h
44

55
For running locally you need the following steps.
66

7-
(**On Windows use [WSL](https://learn.microsoft.com/windows/wsl/).** Tested in WSL Ubuntu 20.04)
7+
(**On Windows use [WSL](https://learn.microsoft.com/windows/wsl/).** Tested in WSL Ubuntu 22.04)
88

99
## Prerequisites
1010

@@ -329,7 +329,7 @@ See more in [LibFuzzer Corpus](https://llvm.org/docs/LibFuzzer.html#corpus).
329329

330330
Based on [Code Coverage](https://rust-fuzz.github.io/book/cargo-fuzz/coverage.html#code-coverage).
331331

332-
Tested in WSL Ubuntu 20.04.
332+
Tested in WSL Ubuntu 22.04.
333333

334334
### Code Coverage Prerequisites
335335

‎jupyterlab/pyproject.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ build-backend = "hatchling.build"
66
name = "qsharp-jupyterlab"
77
version = "0.0.0"
88
readme = "README.md"
9-
requires-python = ">=3.8"
9+
requires-python = ">=3.9"
1010
classifiers = [
1111
"Framework :: Jupyter",
1212
"Framework :: Jupyter :: JupyterLab",
@@ -16,10 +16,10 @@ classifiers = [
1616
"License :: OSI Approved :: MIT License",
1717
"Programming Language :: Python",
1818
"Programming Language :: Python :: 3",
19-
"Programming Language :: Python :: 3.8",
2019
"Programming Language :: Python :: 3.9",
2120
"Programming Language :: Python :: 3.10",
2221
"Programming Language :: Python :: 3.11",
22+
"Programming Language :: Python :: 3.12",
2323
]
2424
dependencies = [
2525
]

‎pip/Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ workspace = true
2727
allocator = { path = "../allocator" }
2828

2929
[target.'cfg(not(any(target_os = "windows")))'.dependencies]
30-
pyo3 = { workspace = true, features = ["abi3-py38", "extension-module", "num-bigint", "num-complex"] }
30+
pyo3 = { workspace = true, features = ["abi3-py39", "extension-module", "num-bigint", "num-complex"] }
3131

3232
[target.'cfg(any(target_os = "windows"))'.dependencies]
3333
# generate-import-lib: skip requiring Python 3 distribution
3434
# files to be present on the (cross-)compile host system.
35-
pyo3 = { workspace = true, features = ["abi3-py38", "extension-module", "generate-import-lib", "num-bigint", "num-complex"] }
35+
pyo3 = { workspace = true, features = ["abi3-py39", "extension-module", "generate-import-lib", "num-bigint", "num-complex"] }
3636

3737
[lib]
3838
crate-type = ["cdylib"]

‎pip/pyproject.toml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
[project]
22
name = "qsharp"
33
version = "0.0.0"
4-
requires-python = ">= 3.8"
4+
requires-python = ">= 3.9"
55
classifiers = [
66
"License :: OSI Approved :: MIT License",
77
"Development Status :: 5 - Production/Stable",
88
"Intended Audience :: Developers",
9-
"Programming Language :: Python :: 3.8",
9+
"Programming Language :: Python :: 3",
1010
"Programming Language :: Python :: 3.9",
1111
"Programming Language :: Python :: 3.10",
1212
"Programming Language :: Python :: 3.11",
13+
"Programming Language :: Python :: 3.12",
1314
"Programming Language :: Python",
1415
"Programming Language :: Rust",
1516
"Operating System :: MacOS",

0 commit comments

Comments
 (0)