Merge pull request #2002 from minrk/3.13

test on 3.13
zeromq · Aug 2, 2024 · 5c0fbfc · 5c0fbfc
2 parents 7186883 + ca66a6d
commit 5c0fbfc
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -42,18 +42,22 @@ jobs:
       matrix:
         include:
           - os: macos-13
-            python: 3.7
+            python: "3.7"
+
+          - os: macos-14
+            python: "3.12"
+            zmq: bundled
 
           - os: macos-14
-            python: 3.12
+            python: "3.13-dev"
             zmq: bundled
 
           - 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 +69,7 @@ jobs:
             python: pypy-3.7
 
           - os: ubuntu-22.04
-            python: 3.9
+            python: "3.9"
             tornado: head
 
           - os: ubuntu-22.04
@@ -81,6 +85,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 +97,7 @@ jobs:
             arch: x64
 
           - os: windows-2022
-            python: "3.11"
+            python: "3.13-dev"
             arch: x64
 
     steps:

diff --git 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()