diff --git a/pkgs/applications/office/paperless-ngx/default.nix b/pkgs/applications/office/paperless-ngx/default.nix index f5de1d65184c..403e3d0d88a6 100644 --- a/pkgs/applications/office/paperless-ngx/default.nix +++ b/pkgs/applications/office/paperless-ngx/default.nix @@ -64,6 +64,7 @@ let sha256 = "sha256-bKrPLbD9zG7DwIYBst1cb+zkDsM8B02wh3D80iortpw="; }; propagatedBuildInputs = oldAttrs.propagatedBuildInputs ++ [ self.daphne ]; + pytestFlagsArray = [ "--asyncio-mode=auto" ]; }); daphne = super.daphne.overridePythonAttrs (oldAttrs: rec { diff --git a/pkgs/development/python-modules/aioftp/default.nix b/pkgs/development/python-modules/aioftp/default.nix index df7575de0484..37f8d9fa3353 100644 --- a/pkgs/development/python-modules/aioftp/default.nix +++ b/pkgs/development/python-modules/aioftp/default.nix @@ -33,10 +33,6 @@ buildPythonPackage rec { trustme ]; - pytestFlagsArray = [ - "--asyncio-mode=legacy" - ]; - disabledTests = lib.optionals stdenv.isDarwin [ # uses 127.0.0.2, which macos doesn't like "test_pasv_connection_pasv_forced_response_address" diff --git a/pkgs/development/python-modules/aiogithubapi/default.nix b/pkgs/development/python-modules/aiogithubapi/default.nix index 248443ff2360..051913ccce56 100644 --- a/pkgs/development/python-modules/aiogithubapi/default.nix +++ b/pkgs/development/python-modules/aiogithubapi/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { ]; pytestFlagsArray = [ - "--asyncio-mode=legacy" + "--asyncio-mode=auto" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/aioswitcher/default.nix b/pkgs/development/python-modules/aioswitcher/default.nix index 4c7a382813c5..5a671bce26ce 100644 --- a/pkgs/development/python-modules/aioswitcher/default.nix +++ b/pkgs/development/python-modules/aioswitcher/default.nix @@ -44,10 +44,6 @@ buildPythonPackage rec { time-machine ]; - pytestFlagsArray = [ - "--asyncio-mode=legacy" - ]; - disabledTests = [ # AssertionError: Expected <14:00> to be equal to <17:00>, but was not. "test_schedule_parser_with_a_weekly_recurring_enabled_schedule_data" diff --git a/pkgs/development/python-modules/aiosyncthing/default.nix b/pkgs/development/python-modules/aiosyncthing/default.nix index 624c86fb314b..cefdf75a2866 100644 --- a/pkgs/development/python-modules/aiosyncthing/default.nix +++ b/pkgs/development/python-modules/aiosyncthing/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { ]; pytestFlagsArray = [ - "--asyncio-mode=legacy" + "--asyncio-mode=auto" ]; postPatch = '' diff --git a/pkgs/development/python-modules/amqtt/default.nix b/pkgs/development/python-modules/amqtt/default.nix index ecf326a9a21a..6f4a5007e7c6 100644 --- a/pkgs/development/python-modules/amqtt/default.nix +++ b/pkgs/development/python-modules/amqtt/default.nix @@ -56,7 +56,7 @@ buildPythonPackage rec { ]; pytestFlagsArray = [ - "--asyncio-mode=legacy" + "--asyncio-mode=auto" ]; disabledTestPaths = [ diff --git a/pkgs/development/python-modules/channels/default.nix b/pkgs/development/python-modules/channels/default.nix index 5bc2db228ae4..2d6f0d009169 100644 --- a/pkgs/development/python-modules/channels/default.nix +++ b/pkgs/development/python-modules/channels/default.nix @@ -41,10 +41,6 @@ buildPythonPackage rec { pytestCheckHook ] ++ passthru.optional-dependencies.daphne; - pytestFlagsArray = [ - "--asyncio-mode=legacy" - ]; - pythonImportsCheck = [ "channels" ]; diff --git a/pkgs/development/python-modules/discovery30303/default.nix b/pkgs/development/python-modules/discovery30303/default.nix index c9b09cbfe69c..6b69ecfc98cc 100644 --- a/pkgs/development/python-modules/discovery30303/default.nix +++ b/pkgs/development/python-modules/discovery30303/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { ]; pytestFlagsArray = [ - "--asyncio-mode=legacy" + "--asyncio-mode=auto" ]; postPatch = '' diff --git a/pkgs/development/python-modules/dynalite-devices/default.nix b/pkgs/development/python-modules/dynalite-devices/default.nix index 456e0a6a628d..ed3f3ffb82ab 100644 --- a/pkgs/development/python-modules/dynalite-devices/default.nix +++ b/pkgs/development/python-modules/dynalite-devices/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { ]; pytestFlagsArray = [ - "--asyncio-mode=legacy" + "--asyncio-mode=auto" ]; pythonImportsCheck = [ "dynalite_devices_lib" ]; diff --git a/pkgs/development/python-modules/gql/default.nix b/pkgs/development/python-modules/gql/default.nix index bd41fd24ee10..dae5fb3438e0 100644 --- a/pkgs/development/python-modules/gql/default.nix +++ b/pkgs/development/python-modules/gql/default.nix @@ -80,7 +80,7 @@ buildPythonPackage rec { ''; pytestFlagsArray = [ - "--asyncio-mode=legacy" + "--asyncio-mode=auto" ]; disabledTests = [ diff --git a/pkgs/development/python-modules/homematicip/default.nix b/pkgs/development/python-modules/homematicip/default.nix index e620f317b9fd..aba7e19b69e0 100644 --- a/pkgs/development/python-modules/homematicip/default.nix +++ b/pkgs/development/python-modules/homematicip/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { ]; pytestFlagsArray = [ - "--asyncio-mode=legacy" + "--asyncio-mode=auto" ]; disabledTests = [ diff --git a/pkgs/development/python-modules/hypercorn/default.nix b/pkgs/development/python-modules/hypercorn/default.nix index 35a9f8f6bb85..940c31e31882 100644 --- a/pkgs/development/python-modules/hypercorn/default.nix +++ b/pkgs/development/python-modules/hypercorn/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, fetchFromGitLab +, fetchFromGitHub , pythonOlder , typing-extensions , wsproto @@ -10,25 +10,27 @@ , mock , poetry-core , pytest-asyncio -, pytest-cov -, pytest-sugar , pytest-trio , pytestCheckHook }: buildPythonPackage rec { pname = "Hypercorn"; - version = "0.13.2"; + version = "0.14.3"; disabled = pythonOlder "3.7"; format = "pyproject"; - src = fetchFromGitLab { + src = fetchFromGitHub { owner = "pgjones"; repo = pname; rev = version; - sha256 = "sha256-fIjw5A6SvFUv8cU7xunVlPYphv+glypY4pzvHNifYLQ="; + hash = "sha256-ECREs8UwqTWUweUrwnUwpVotCII2v4Bz7ZCk3DSAd8I="; }; + postPatch = '' + sed -i "/^addopts/d" pyproject.toml + ''; + nativeBuildInputs = [ poetry-core ]; @@ -38,20 +40,14 @@ buildPythonPackage rec { checkInputs = [ pytest-asyncio - pytest-cov - pytest-sugar pytest-trio pytestCheckHook ] ++ lib.optionals (pythonOlder "3.8") [ mock ]; - pytestFlagsArray = [ - "--asyncio-mode=legacy" - ]; - pythonImportsCheck = [ "hypercorn" ]; meta = with lib; { - homepage = "https://pgjones.gitlab.io/hypercorn/"; + homepage = "https://github.com/pgjones/hypercorn"; description = "The ASGI web server inspired by Gunicorn"; license = licenses.mit; maintainers = with maintainers; [ dgliwka ]; diff --git a/pkgs/development/python-modules/jsonrpc-websocket/default.nix b/pkgs/development/python-modules/jsonrpc-websocket/default.nix index 9bd8ef8a108b..9da8d8cf8ab1 100644 --- a/pkgs/development/python-modules/jsonrpc-websocket/default.nix +++ b/pkgs/development/python-modules/jsonrpc-websocket/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { ]; pytestFlagsArray = [ - "--asyncio-mode=legacy" + "--asyncio-mode=auto" "tests.py" ]; diff --git a/pkgs/development/python-modules/matrix-nio/default.nix b/pkgs/development/python-modules/matrix-nio/default.nix index 1aa838647ad0..45689c045168 100644 --- a/pkgs/development/python-modules/matrix-nio/default.nix +++ b/pkgs/development/python-modules/matrix-nio/default.nix @@ -79,7 +79,6 @@ buildPythonPackage rec { ]; pytestFlagsArray = [ - "--asyncio-mode=legacy" "--benchmark-disable" ]; diff --git a/pkgs/development/python-modules/pylitterbot/default.nix b/pkgs/development/python-modules/pylitterbot/default.nix index 96b7cb163669..169784039c6c 100644 --- a/pkgs/development/python-modules/pylitterbot/default.nix +++ b/pkgs/development/python-modules/pylitterbot/default.nix @@ -49,10 +49,6 @@ buildPythonPackage rec { --replace 'deepdiff = "^5.8.1"' 'deepdiff = ">=5.8.1"' ''; - pytestFlagsArray = [ - "--asyncio-mode=legacy" - ]; - pythonImportsCheck = [ "pylitterbot" ]; diff --git a/pkgs/development/python-modules/pylutron-caseta/default.nix b/pkgs/development/python-modules/pylutron-caseta/default.nix index 114e295c66ea..a14fce498e20 100644 --- a/pkgs/development/python-modules/pylutron-caseta/default.nix +++ b/pkgs/development/python-modules/pylutron-caseta/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { ]; pytestFlagsArray = [ - "--asyncio-mode=legacy" + "--asyncio-mode=auto" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/pyotgw/default.nix b/pkgs/development/python-modules/pyotgw/default.nix index ff519920ad66..c0f24aa3dc6d 100644 --- a/pkgs/development/python-modules/pyotgw/default.nix +++ b/pkgs/development/python-modules/pyotgw/default.nix @@ -30,10 +30,6 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ - "--asyncio-mode=legacy" - ]; - pythonImportsCheck = [ "pyotgw" ]; diff --git a/pkgs/development/python-modules/pypck/default.nix b/pkgs/development/python-modules/pypck/default.nix index c1996ae402a1..13519664b52b 100644 --- a/pkgs/development/python-modules/pypck/default.nix +++ b/pkgs/development/python-modules/pypck/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { ]; pytestFlagsArray = [ - "--asyncio-mode=legacy" + "--asyncio-mode=auto" ]; disabledTests = lib.optionals stdenv.isDarwin [ diff --git a/pkgs/development/python-modules/pyspcwebgw/default.nix b/pkgs/development/python-modules/pyspcwebgw/default.nix index b847240869ac..7a40985457da 100644 --- a/pkgs/development/python-modules/pyspcwebgw/default.nix +++ b/pkgs/development/python-modules/pyspcwebgw/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { ]; pytestFlagsArray = [ - "--asyncio-mode=legacy" + "--asyncio-mode=auto" ]; pythonImportsCheck = [ "pyspcwebgw" ]; diff --git a/pkgs/development/python-modules/pytautulli/default.nix b/pkgs/development/python-modules/pytautulli/default.nix index aee51ae764f8..b21b21842269 100644 --- a/pkgs/development/python-modules/pytautulli/default.nix +++ b/pkgs/development/python-modules/pytautulli/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { ]; pytestFlagsArray = [ - "--asyncio-mode=legacy" + "--asyncio-mode=auto" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/python-kasa/default.nix b/pkgs/development/python-modules/python-kasa/default.nix index d4c9524c9edd..7f55dd64b94e 100644 --- a/pkgs/development/python-modules/python-kasa/default.nix +++ b/pkgs/development/python-modules/python-kasa/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { ]; pytestFlagsArray = [ - "--asyncio-mode=legacy" + "--asyncio-mode=auto" ]; disabledTestPaths = [ diff --git a/pkgs/development/python-modules/python-smarttub/default.nix b/pkgs/development/python-modules/python-smarttub/default.nix index b977bc2d0c20..dba19a2ee627 100644 --- a/pkgs/development/python-modules/python-smarttub/default.nix +++ b/pkgs/development/python-modules/python-smarttub/default.nix @@ -38,10 +38,6 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ - "--asyncio-mode=legacy" - ]; - postPatch = '' substituteInPlace setup.py \ --replace "pyjwt~=2.1.0" "pyjwt>=2.1.0" diff --git a/pkgs/development/python-modules/pytraccar/default.nix b/pkgs/development/python-modules/pytraccar/default.nix index b50d734d01a1..c65fdf8b1080 100644 --- a/pkgs/development/python-modules/pytraccar/default.nix +++ b/pkgs/development/python-modules/pytraccar/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { ]; pytestFlagsArray = [ - "--asyncio-mode=legacy" + "--asyncio-mode=auto" ]; postPatch = '' diff --git a/pkgs/development/python-modules/pywizlight/default.nix b/pkgs/development/python-modules/pywizlight/default.nix index 21ddb6f6097f..2ca664b88a17 100644 --- a/pkgs/development/python-modules/pywizlight/default.nix +++ b/pkgs/development/python-modules/pywizlight/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { ]; pytestFlagsArray = [ - "--asyncio-mode=legacy" + "--asyncio-mode=auto" ]; disabledTests = [ diff --git a/pkgs/development/python-modules/renault-api/default.nix b/pkgs/development/python-modules/renault-api/default.nix index 5b2165c7583b..33e1f0124a7f 100644 --- a/pkgs/development/python-modules/renault-api/default.nix +++ b/pkgs/development/python-modules/renault-api/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { ]; pytestFlagsArray = [ - "--asyncio-mode=legacy" + "--asyncio-mode=auto" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/respx/default.nix b/pkgs/development/python-modules/respx/default.nix index c144ed9adb28..4d4e4e1175d8 100644 --- a/pkgs/development/python-modules/respx/default.nix +++ b/pkgs/development/python-modules/respx/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "respx"; - version = "0.19.2"; + version = "0.20.0"; src = fetchFromGitHub { owner = "lundberg"; repo = pname; rev = version; - sha256 = "sha256-uNmSBJOQF4baq8AWzfwj0kinO19jr6Mp9Yblys/WmZs="; + sha256 = "sha256-xb5jb+l6wA1v/r2yGUB6IuUVXIaTc+3O/w5xn/+A74o="; }; propagatedBuildInputs = [ @@ -35,10 +35,6 @@ buildPythonPackage rec { trio ]; - pytestFlagsArray = [ - "--asyncio-mode=legacy" - ]; - postPatch = '' sed -i "/--cov/d" setup.cfg ''; @@ -52,6 +48,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for mocking HTTPX"; homepage = "https://lundberg.github.io/respx/"; + changelog = "https://github.com/lundberg/respx/blob/${src.rev}/CHANGELOG.md"; license = with licenses; [ bsd3 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/structlog/default.nix b/pkgs/development/python-modules/structlog/default.nix index 68d91685c9c2..a3b591db5f8e 100644 --- a/pkgs/development/python-modules/structlog/default.nix +++ b/pkgs/development/python-modules/structlog/default.nix @@ -39,10 +39,6 @@ buildPythonPackage rec { simplejson ]; - pytestFlagsArray = [ - "--asyncio-mode=legacy" - ]; - meta = with lib; { description = "Painless structural logging"; homepage = "https://github.com/hynek/structlog"; diff --git a/pkgs/development/python-modules/subarulink/default.nix b/pkgs/development/python-modules/subarulink/default.nix index d788e164f80d..bf975f5e8483 100644 --- a/pkgs/development/python-modules/subarulink/default.nix +++ b/pkgs/development/python-modules/subarulink/default.nix @@ -36,10 +36,6 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ - "--asyncio-mode=legacy" - ]; - postPatch = '' substituteInPlace setup.cfg \ --replace "--cov=subarulink" "" diff --git a/pkgs/development/python-modules/unifi-discovery/default.nix b/pkgs/development/python-modules/unifi-discovery/default.nix index 3b3bfe4ca979..387818583777 100644 --- a/pkgs/development/python-modules/unifi-discovery/default.nix +++ b/pkgs/development/python-modules/unifi-discovery/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { ]; pytestFlagsArray = [ - "--asyncio-mode=legacy" + "--asyncio-mode=auto" ]; postPatch = '' diff --git a/pkgs/development/python-modules/xbox-webapi/default.nix b/pkgs/development/python-modules/xbox-webapi/default.nix index ccd2d3febf13..de4500378f0d 100644 --- a/pkgs/development/python-modules/xbox-webapi/default.nix +++ b/pkgs/development/python-modules/xbox-webapi/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { ]; pytestFlagsArray = [ - "--asyncio-mode=legacy" + "--asyncio-mode=auto" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/zigpy-znp/default.nix b/pkgs/development/python-modules/zigpy-znp/default.nix index 2b7fef4c8e27..083805f8e7ee 100644 --- a/pkgs/development/python-modules/zigpy-znp/default.nix +++ b/pkgs/development/python-modules/zigpy-znp/default.nix @@ -49,10 +49,6 @@ buildPythonPackage rec { asynctest ]; - pytestFlagsArray = [ - "--asyncio-mode=legacy" - ]; - pythonImportsCheck = [ "zigpy_znp" ];