Merge pull request #2061 from minrk/rm-37-intel

minrk · web-flow · commit 5209041a6641 · 2025-02-04T12:44:53.000+01:00
drop Python 3.7, stop building intel-only mac wheels
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -35,14 +35,14 @@ jobs:
     continue-on-error: ${{ matrix.zmq == 'head' }}
 
     env:
-      MACOSX_DEPLOYMENT_TARGET: "11.7"
+      MACOSX_DEPLOYMENT_TARGET: "13.7"
 
     strategy:
       fail-fast: true
       matrix:
         include:
           - os: macos-13
-            python: "3.7"
+            python: "3.8"
 
           - os: macos-14
             python: "3.12"
@@ -57,7 +57,7 @@ jobs:
             zmq: bundled
 
           - os: ubuntu-20.04
-            python: "3.7"
+            python: "3.8"
             zmq: bundled
             tornado: none
 
@@ -66,7 +66,7 @@ jobs:
             zmq: bundled
 
           - os: ubuntu-22.04
-            python: pypy-3.7
+            python: pypy-3.8
 
           - os: ubuntu-22.04
             python: "3.9"
@@ -77,9 +77,6 @@ jobs:
 
           - os: ubuntu-22.04
             python: "3.11"
-
-          - os: ubuntu-22.04
-            python: "3.8"
             zmq: head
 
           - os: ubuntu-22.04
@@ -93,11 +90,11 @@ jobs:
             free_threading: free_threading
 
           - os: windows-2022
-            python: "3.7"
+            python: "3.8"
             arch: x86
 
           - os: windows-2022
-            python: "3.9"
+            python: "3.11"
             arch: x64
 
           - os: windows-2022
diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
@@ -62,7 +62,7 @@ jobs:
     name: wheel-${{ matrix.name }}
 
     env:
-      MACOSX_DEPLOYMENT_TARGET: "10.9"
+      MACOSX_DEPLOYMENT_TARGET: "10.15"
       CIBW_BUILD: "${{ matrix.cibw.build || '*' }}"
       CIBW_SKIP: "${{ matrix.cibw.skip || '' }}"
       CIBW_ARCHS: "${{ matrix.cibw.arch || 'auto' }}"
@@ -72,18 +72,13 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - os: macos-13
-            name: mac-cpython
-            cibw:
-              build: "cp*"
-
           - os: macos-13
             name: mac-pypy
             cibw:
               build: "pp*"
 
           - os: macos-14
-            name: mac-arm
+            name: mac-cpython
             cibw:
               arch: universal2
               build: "cp*"
diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
 This package contains Python bindings for [ZeroMQ](https://zeromq.org).
 ØMQ is a lightweight and fast messaging implementation.
 
-PyZMQ should work with any reasonable version of Python (≥ 3.7), as well as PyPy.
+PyZMQ should work with any reasonable version of Python (≥ 3.8), as well as PyPy.
 The Cython backend used by CPython supports libzmq ≥ 2.1.4 (including 3.2.x and 4.x),
 but the CFFI backend used by PyPy only supports libzmq ≥ 3.2.2 (including 4.x).
 
diff --git a/docs/source/index.md b/docs/source/index.md
@@ -11,7 +11,7 @@ an overview of what the ØMQ API looks like in Python. For information on how to
 ØMQ in general, see the many examples in the excellent [ØMQ Guide], all of which
 have a version in Python.
 
-PyZMQ works with Python 3 (≥ 3.7), as well as PyPy via CFFI.
+PyZMQ works with Python 3 (≥ 3.8), as well as PyPy via CFFI.
 
 Please don't hesitate to report pyzmq-specific issues to our [tracker] on GitHub.
 General questions about ØMQ are better sent to the [ØMQ tracker] or [mailing list].
diff --git a/examples/security/asyncio-ironhouse.py b/examples/security/asyncio-ironhouse.py
@@ -109,10 +109,3 @@ async def run() -> None:
     logging.basicConfig(level=level, format="[%(levelname)s] %(message)s")
 
     asyncio.run(run())
-
-    # Note: asyncio.run() was added in Python 3.7.
-    # For earlier Python versions, you can use:
-    #
-    # loop = asyncio.get_event_loop()
-    # loop.run_until_complete(run())
-    # loop.close()
diff --git a/pyproject.toml b/pyproject.toml
@@ -19,7 +19,7 @@ authors = [
   { name = "Min Ragan-Kelley" },
 ]
 license = { file = "LICENSE.md" }
-requires-python = ">=3.7"
+requires-python = ">=3.8"
 classifiers = [
   "Development Status :: 5 - Production/Stable",
   "Intended Audience :: Developers",
@@ -32,7 +32,6 @@ classifiers = [
   "Topic :: System :: Networking",
   "Programming Language :: Python :: 3",
   "Programming Language :: Python :: 3 :: Only",
-  "Programming Language :: Python :: 3.7",
   "Programming Language :: Python :: 3.8",
   "Programming Language :: Python :: 3.9",
   "Programming Language :: Python :: 3.10",
@@ -166,9 +165,8 @@ before-all = "bash tools/install_libzmq.sh"
 repair-wheel-command = "delocate-wheel --sanitize-rpaths --require-archs {delocate_archs} -w {dest_dir} -v {wheel}"
 
 [tool.cibuildwheel.macos.environment]
-# note: everything here needs to also be duplicated in overrides below
 ZMQ_PREFIX = "/tmp/zmq"
-MACOSX_DEPLOYMENT_TARGET = "10.9"
+MACOSX_DEPLOYMENT_TARGET = "10.15"
 
 [tool.cibuildwheel.windows]
 before-all = "python buildutils/bundle.py licenses"
@@ -191,10 +189,6 @@ repair-wheel-command = """\
 "cmake.define.ZMQ_HAVE_IPC" = "OFF"
 "cmake.define.POLLER" = "select"
 
-# mac-arm target is 10.15
-[[tool.cibuildwheel.overrides]]
-select = "*macos*{universal2,arm64}*"
-environment = { ZMQ_PREFIX = "/tmp/zmq", MACOSX_DEPLOYMENT_TARGET = "10.15" }
 
 # manylinux2010 for (less) old cp37-9, pp37-8
 [[tool.cibuildwheel.overrides]]
diff --git a/pytest.ini b/pytest.ini
@@ -10,3 +10,4 @@ testpaths =
     tests
 # automatically run coroutine tests with asyncio
 asyncio_mode = auto
+asyncio_default_fixture_loop_scope = function
diff --git a/test-requirements.txt b/test-requirements.txt
@@ -1,18 +1,15 @@
 black; platform_python_implementation != "PyPy"
 # gevent wheels on mac cause Illegal Instruction
 codecov
-# coverage 5 has issues with Cython: https://github.com/cython/cython/issues/3515
-coverage<5; python_version < "3.7"
-coverage>=7.1; python_version >= "3.7"
+coverage>=7.1
 cython; platform_python_implementation != "PyPy" # required for Cython tests
 cython>=3.0.0b3; platform_python_implementation != "PyPy" and python_version >= "3.12" # required for Cython tests
 flake8
 gevent; platform_python_implementation != "PyPy" and sys_platform != "win32" and sys_platform != "darwin" and python_version < "3.11"
 mypy; platform_python_implementation != "PyPy"
 pymongo
 pytest
-pytest-asyncio>=0.16; python_version < "3.7"
-pytest-asyncio>=0.17; python_version >= "3.7"
+pytest-asyncio>=0.17
 # pytest-cov 2.11 requires coverage 5, which still doesn't work with Cython
 pytest-cov==2.10.*
 pytest-rerunfailures
diff --git a/tests/test_asyncio.py b/tests/test_asyncio.py
@@ -7,7 +7,6 @@
 import json
 import os
 import sys
-from concurrent.futures import CancelledError
 from multiprocessing import Process
 
 import pytest
@@ -121,13 +120,8 @@ async def test_recv_json_cancelled(push_pull):
     await asyncio.sleep(0)
     obj = dict(a=5)
     await a.send_json(obj)
-    # CancelledError change in 3.8 https://bugs.python.org/issue32528
-    if sys.version_info < (3, 8):
-        with pytest.raises(CancelledError):
-            recvd = await f
-    else:
-        with pytest.raises(asyncio.exceptions.CancelledError):
-            recvd = await f
+    with pytest.raises(asyncio.CancelledError):
+        recvd = await f
     assert f.done()
     # give it a chance to incorrectly consume the event
     events = await b.poll(timeout=5)
diff --git a/tests/test_auth.py b/tests/test_auth.py
@@ -398,10 +398,6 @@ def make_auth(self):
         return ThreadAuthenticator(self.context)
 
 
-@pytest.mark.skipif(
-    sys.platform == 'win32' and sys.version_info < (3, 8),
-    reason="flaky event loop cleanup on windows+py<38",
-)
 class TestAsyncioAuthentication(AuthTest):
     """Test authentication running in a thread"""
 
diff --git a/tests/test_ioloop.py b/tests/test_ioloop.py
@@ -4,17 +4,7 @@
 
 import pytest
 
-try:
-    import tornado.ioloop
-except ImportError:
-    _tornado = False
-else:
-    _tornado = True
-
-
-def setup():
-    if not _tornado:
-        pytest.skip("requires tornado")
+tornado = pytest.importorskip("tornado")
 
 
 def test_ioloop():
diff --git a/tools/install_libzmq.sh b/tools/install_libzmq.sh
@@ -8,6 +8,9 @@ LICENSE_DIR="$PYZMQ_DIR/licenses"
 test -d "$LICENSE_DIR" || mkdir "$LICENSE_DIR"
 
 if [[ "$(uname)" == "Darwin" ]]; then
+    # make sure deployment target is set
+    echo "${MACOSX_DEPLOYMENT_TARGET=}"
+    test ! -z "${MACOSX_DEPLOYMENT_TARGET}"
     # need LT_MULTI_MODULE or libtool will strip out
     # all multi-arch symbols at the last step
     export LT_MULTI_MODULE=1
diff --git a/tools/run_with_env.cmd b/tools/run_with_env.cmd
diff --git a/zmq/_typing.py b/zmq/_typing.py
@@ -1,25 +1,6 @@
 from __future__ import annotations
 
 import sys
-from typing import Any, Dict
-
-if sys.version_info >= (3, 8):
-    from typing import Literal, TypedDict
-else:
-    # avoid runtime dependency on typing_extensions on py37
-    try:
-        from typing_extensions import Literal, TypedDict  # type: ignore
-    except ImportError:
-
-        class _Literal:
-            def __getitem__(self, key):
-                return Any
-
-        Literal = _Literal()  # type: ignore
-
-        class TypedDict(Dict):  # type: ignore
-            pass
-
 
 if sys.version_info >= (3, 10):
     from typing import TypeAlias
diff --git a/zmq/backend/cffi/error.py b/zmq/backend/cffi/error.py
@@ -8,11 +8,7 @@
 
 
 def strerror(errno):
-    s = ffi.string(C.zmq_strerror(errno))
-    if not isinstance(s, str):
-        # py3
-        s = s.decode()
-    return s
+    return ffi.string(C.zmq_strerror(errno)).decode()
 
 
 zmq_errno = C.zmq_errno
diff --git a/zmq/eventloop/zmqstream.py b/zmq/eventloop/zmqstream.py
@@ -17,15 +17,14 @@
 import pickle
 import warnings
 from queue import Queue
-from typing import Any, Awaitable, Callable, Sequence, cast, overload
+from typing import Any, Awaitable, Callable, Literal, Sequence, cast, overload
 
 from tornado.ioloop import IOLoop
 from tornado.log import gen_log
 
 import zmq
 import zmq._future
 from zmq import POLLIN, POLLOUT
-from zmq._typing import Literal
 from zmq.utils import jsonapi
 
 
diff --git a/zmq/sugar/context.py b/zmq/sugar/context.py
diff --git a/zmq/sugar/socket.py b/zmq/sugar/socket.py
diff --git a/zmq/utils/monitor.py b/zmq/utils/monitor.py
