From fca8563cb7ac50b769a4131448e634ad1cabd078 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=AB=E5=BE=80?= Date: Wed, 29 May 2024 20:48:09 +0800 Subject: [PATCH 1/3] support py3.11 and py3.12 --- .azure/publish-release-nightly.yml | 4 ++-- .azure/publish-release.yml | 4 ++-- azure-pipelines.yml | 23 +++++++++++++++++++++++ pyproject.toml | 6 +++--- setup.py | 2 ++ 5 files changed, 32 insertions(+), 7 deletions(-) diff --git a/.azure/publish-release-nightly.yml b/.azure/publish-release-nightly.yml index aac40fe3..53a929b6 100644 --- a/.azure/publish-release-nightly.yml +++ b/.azure/publish-release-nightly.yml @@ -27,8 +27,8 @@ schedules: variables: # ---- COMMON ---- - CIBW_VERSION: "2.8.*" - PY_VERSION: "3.10" + CIBW_VERSION: "2.18.*" + PY_VERSION: "3.11" jobs: - job: Build_Wheels diff --git a/.azure/publish-release.yml b/.azure/publish-release.yml index b2074a09..207e1fed 100644 --- a/.azure/publish-release.yml +++ b/.azure/publish-release.yml @@ -27,8 +27,8 @@ pr: none variables: # ---- COMMON ---- - CIBW_VERSION: "2.8.*" - PY_VERSION: "3.10" + CIBW_VERSION: "2.18.*" + PY_VERSION: "3.11" jobs: - job: Build_Wheels diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 022d3edc..a0c6f390 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -53,15 +53,30 @@ jobs: 'Ubuntu 22.04 LTS with Python 3.11': image: ubuntu-22.04 python-version: "3.11" + 'Ubuntu 22.04 LTS with Python 3.12': + image: ubuntu-22.04 + python-version: "3.12" 'macOS 11 with Python 3.10': image: macOS-11 python-version: "3.10" + 'macOS 11 with Python 3.11': + image: macOS-11 + python-version: "3.11" + 'macOS 11 with Python 3.12': + image: macOS-11 + python-version: "3.12" 'Windows Server with Python 3.7': image: windows-latest python-version: "3.7" 'Windows Server with Python 3.10': image: windows-latest python-version: "3.10" + 'Windows Server with Python 3.11': + image: windows-latest + python-version: "3.11" + 'Windows Server with Python 3.12': + image: windows-latest + python-version: "3.12" 'Fuzzer on Ubuntu 22.04 LTS with Python 3.7': image: ubuntu-22.04 python-version: "3.7" @@ -78,6 +93,14 @@ jobs: image: ubuntu-22.04 python-version: "3.10" run-fuzzing: true + 'Fuzzer on Ubuntu 22.04 LTS with Python 3.11': + image: ubuntu-22.04 + python-version: "3.11" + run-fuzzing: true + 'Fuzzer on Ubuntu 22.04 LTS with Python 3.12': + image: ubuntu-22.04 + python-version: "3.12" + run-fuzzing: true steps: - download: current artifact: cyclone-$(Agent.OS)-Release diff --git a/pyproject.toml b/pyproject.toml index ec8e78b2..b3c80231 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -17,7 +17,7 @@ markers = ["fuzzing: run the fuzzing testsuite."] [tool.cibuildwheel] # Skip PyPy (C API incompatible), Skip 32bit systems, Skip universal binaries macOS (we build specific intel/arm ones) -skip = "pp* *-win32 *_i686 *-macosx_universal2:arm64" +skip = "cp3{6..10}-* pp* *-win32 *_i686 *-macosx_universal2:arm64" # Don't test arm64 macos wheels (we cannot do this on ci: crossbuild) test-skip = "*-macosx_arm64" @@ -26,7 +26,7 @@ test-command = "pytest -s --verbose {package}/tests" test-extras = ["dev"] before-all = [ - "git clone --branch master --depth 1 https://github.com/eclipse-cyclonedds/cyclonedds.git main", + "git clone --branch releases/0.10.x --depth 1 https://github.com/eclipse-cyclonedds/cyclonedds.git", "mkdir cyclonedds-build", "mkdir build" ] @@ -50,7 +50,7 @@ before-build = [ # By default there is no repair command on windows set, use delvewheel repair-wheel-command = [ - "pip install delvewheel==0.0.18", + "pip install delvewheel==1.6.0", "delvewheel repair -w {dest_dir} --no-mangle-all {wheel}" ] diff --git a/setup.py b/setup.py index a2c8280b..ebf947e5 100644 --- a/setup.py +++ b/setup.py @@ -119,6 +119,8 @@ "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", "Operating System :: OS Independent" ], packages=find_packages(".", include=("cyclonedds", "cyclonedds.*")), From a10330e84210a7f665b3a2c231cd23121222597c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B9=85=E4=BC=B4?= <942101897@qq.com> Date: Thu, 30 May 2024 17:23:52 +0800 Subject: [PATCH 2/3] Fallback to modify the version number of cyclones(C language) --- pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index b3c80231..4eabb4f7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -26,7 +26,7 @@ test-command = "pytest -s --verbose {package}/tests" test-extras = ["dev"] before-all = [ - "git clone --branch releases/0.10.x --depth 1 https://github.com/eclipse-cyclonedds/cyclonedds.git", + "git clone --branch master --depth 1 https://github.com/eclipse-cyclonedds/cyclonedds.git main", "mkdir cyclonedds-build", "mkdir build" ] @@ -97,4 +97,4 @@ before-build = [ "cd .." ] -# -- End of cibuildwheel configuration -- # \ No newline at end of file +# -- End of cibuildwheel configuration -- # From 4835567fe4cfe53e4aee1edc28900a5d45aa41c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=AB=E5=BE=80?= Date: Thu, 30 May 2024 17:51:00 +0800 Subject: [PATCH 3/3] still supports old Python versions --- pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 4eabb4f7..a0aec306 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -17,7 +17,7 @@ markers = ["fuzzing: run the fuzzing testsuite."] [tool.cibuildwheel] # Skip PyPy (C API incompatible), Skip 32bit systems, Skip universal binaries macOS (we build specific intel/arm ones) -skip = "cp3{6..10}-* pp* *-win32 *_i686 *-macosx_universal2:arm64" +skip = "pp* *-win32 *_i686 *-macosx_universal2:arm64" # Don't test arm64 macos wheels (we cannot do this on ci: crossbuild) test-skip = "*-macosx_arm64" @@ -97,4 +97,4 @@ before-build = [ "cd .." ] -# -- End of cibuildwheel configuration -- # +# -- End of cibuildwheel configuration -- # \ No newline at end of file