From be93d6a52e9947bb431603aa3ad56abc421502f1 Mon Sep 17 00:00:00 2001 From: Min RK Date: Fri, 2 Aug 2024 08:27:36 +0200 Subject: [PATCH 1/3] test on 3.13 --- .github/workflows/test.yml | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b84b02b29..d5093aad9 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -42,18 +42,21 @@ jobs: matrix: include: - os: macos-13 - python: 3.7 + python: "3.7" - os: macos-14 - python: 3.12 + python: "3.12" zmq: bundled + - os: macos-14 + python: "3.13-dev" + - os: macos-13 python: pypy-3.9 zmq: bundled - os: ubuntu-20.04 - python: 3.7 + python: "3.7" zmq: bundled tornado: none @@ -65,7 +68,7 @@ jobs: python: pypy-3.7 - os: ubuntu-22.04 - python: 3.9 + python: "3.9" tornado: head - os: ubuntu-22.04 @@ -81,6 +84,9 @@ jobs: - os: ubuntu-22.04 python: "3.12" + - os: ubuntu-22.04 + python: "3.13-dev" + - os: windows-2022 python: "3.7" arch: x86 @@ -90,7 +96,7 @@ jobs: arch: x64 - os: windows-2022 - python: "3.11" + python: "3.13-dev" arch: x64 steps: From b47bdfc4efee05e26caca2df7941bfa324f582c1 Mon Sep 17 00:00:00 2001 From: Min RK Date: Fri, 2 Aug 2024 08:39:59 +0200 Subject: [PATCH 2/3] fix condition for MSVC 1940 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 62ffa841d..1583c39af 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -199,7 +199,7 @@ if (ZMQ_PREFIX STREQUAL "bundled") if (MSVC) # select vs build solution by msvc version number if (NOT PYZMQ_LIBSODIUM_VS_VERSION) - if(MSVC_VERSION GREATER 1940) + if(MSVC_VERSION GREATER_EQUAL 1940) message(STATUS "Unrecognized MSVC_VERSION=${MSVC_VERSION}") set(MSVC_VERSION 1939) endif() From ca66a6d60b376363fc4f0a93b6514dda1e63e677 Mon Sep 17 00:00:00 2001 From: Min RK Date: Fri, 2 Aug 2024 08:43:26 +0200 Subject: [PATCH 3/3] bundle --- .github/workflows/test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d5093aad9..64d78a588 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -50,6 +50,7 @@ jobs: - os: macos-14 python: "3.13-dev" + zmq: bundled - os: macos-13 python: pypy-3.9