From 31541da6e68c1961f00d206b8386aee6df76d8b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Fern=C3=A1ndez=20L=C3=B3pez?= Date: Thu, 31 Mar 2022 09:30:43 +0200 Subject: [PATCH 1/4] Remove `SOCK_NONBLOCK` from socket creation on tests This fixes running tests on Mac OS X, which lacks the `SOCK_NONBLOCK` socket flag creation. --- tests/test_server.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/test_server.py b/tests/test_server.py index 8f86096d..616ccf21 100644 --- a/tests/test_server.py +++ b/tests/test_server.py @@ -21,7 +21,8 @@ def __init__(self, application, max_applications=1000): application, max_applications=max_applications, ) - self._sock = sock.socket(sock.AF_INET, sock.SOCK_DGRAM | sock.SOCK_NONBLOCK) + self._sock = sock.socket(sock.AF_INET, sock.SOCK_DGRAM) + self._sock.setblocking(False) self._sock.bind(("127.0.0.1", 0)) @property @@ -54,7 +55,8 @@ def close(self): class Client: def __init__(self, name): - self._sock = sock.socket(sock.AF_INET, sock.SOCK_DGRAM | sock.SOCK_NONBLOCK) + self._sock = sock.socket(sock.AF_INET, sock.SOCK_DGRAM) + self._sock.setblocking(False) self.name = name async def register(self, server_addr, name=None): From e413852d758c6902707bac76d197ef5bce3de802 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Fern=C3=A1ndez=20L=C3=B3pez?= Date: Fri, 1 Apr 2022 08:09:22 +0200 Subject: [PATCH 2/4] Pin click test dependency to 8.0.4 Due to an incompatibility with black linter, pin click to 8.0.4: https://github.com/psf/black/issues/2964 --- setup.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.cfg b/setup.cfg index 3ad56a3f..0f6b3065 100644 --- a/setup.cfg +++ b/setup.cfg @@ -36,6 +36,7 @@ zip_safe = false [options.extras_require] tests = + click==8.0.4 pytest pytest-asyncio mypy>=0.800 From 5a3c3f596626875254b6bb3d3ac2d3138faaf0ab Mon Sep 17 00:00:00 2001 From: Andrew Godwin Date: Fri, 1 Apr 2022 08:43:39 -0600 Subject: [PATCH 3/4] Remove Click fix in setup.cfg --- setup.cfg | 1 - 1 file changed, 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 0f6b3065..3ad56a3f 100644 --- a/setup.cfg +++ b/setup.cfg @@ -36,7 +36,6 @@ zip_safe = false [options.extras_require] tests = - click==8.0.4 pytest pytest-asyncio mypy>=0.800 From f68e17466d2b983325c2ad30e324650ef12382e7 Mon Sep 17 00:00:00 2001 From: Andrew Godwin Date: Fri, 1 Apr 2022 08:45:00 -0600 Subject: [PATCH 4/4] Updating Black pre-commit hook --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 8a050774..0379a317 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -6,7 +6,7 @@ repos: args: ["--py37-plus"] - repo: https://github.com/psf/black - rev: 20.8b1 + rev: 22.3.0 hooks: - id: black args: ["--target-version=py37"]