diff --git a/pkgs/development/python-modules/pytest-sanic/default.nix b/pkgs/development/python-modules/pytest-sanic/default.nix index 0044a13d2c9a..e2353c4840bb 100644 --- a/pkgs/development/python-modules/pytest-sanic/default.nix +++ b/pkgs/development/python-modules/pytest-sanic/default.nix @@ -1,28 +1,41 @@ { lib -, buildPythonPackage -, fetchPypi -, pytest -, aiohttp , async_generator +, buildPythonPackage +, doCheck ? true +, fetchFromGitHub +, httpx +, pytest +, pytestCheckHook +, sanic +, websockets }: buildPythonPackage rec { pname = "pytest-sanic"; - version = "1.6.2"; + version = "1.7.0"; - src = fetchPypi { - inherit pname version; - sha256 = "6428ed8cc2e6cfa05b92689a8589149aacdc1f0640fcf9673211aa733e6a5209"; + src = fetchFromGitHub { + owner = "yunstanford"; + repo = pname; + rev = "v${version}"; + sha256 = "1zpgnw1lqbll59chv4hgcn31mdql1nv4gw9crbihky3ly3d3ncqi"; }; propagatedBuildInputs = [ - pytest - aiohttp async_generator + httpx + pytest + websockets ]; - # circular dependency on sanic - doCheck = false; + checkInputs = [ + sanic + pytestCheckHook + ]; + + inherit doCheck; + + pythonImportsCheck = [ "pytest_sanic" ]; meta = with lib; { description = "A pytest plugin for Sanic"; diff --git a/pkgs/development/python-modules/sanic/default.nix b/pkgs/development/python-modules/sanic/default.nix index f503b0b85561..e5faa440ad8d 100644 --- a/pkgs/development/python-modules/sanic/default.nix +++ b/pkgs/development/python-modules/sanic/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi, doCheck ? true , aiofiles, httptools, httpx, multidict, ujson, uvloop, websockets , pytestCheckHook, beautifulsoup4, gunicorn, httpcore, uvicorn , pytest-asyncio, pytest-benchmark, pytest-dependency, pytest-sanic, pytest-sugar, pytestcov @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "06p0lsxqbfbka2yaqlpp0bg5pf7ma44zi6kq7qbb6hhry48dp1w6"; }; - patchPhase = '' + postPatch = '' substituteInPlace setup.py \ --replace '"multidict==5.0.0"' '"multidict"' \ --replace '"httpx==0.15.4"' '"httpx"' \ @@ -30,14 +30,19 @@ buildPythonPackage rec { pytest-asyncio pytest-benchmark pytest-dependency pytest-sanic pytest-sugar pytestcov ]; + inherit doCheck; + disabledTests = [ "test_gunicorn" # No "examples" directory in pypi distribution. "test_logo" # Fails to filter out "DEBUG asyncio:selector_events.py:59 Using selector: EpollSelector" "test_zero_downtime" # No "examples.delayed_response.app" module in pypi distribution. + "test_reloader_live" # OSError: [Errno 98] error while attempting to bind on address ('127.0.0.1', 42104) ]; __darwinAllowLocalNetworking = true; + pythonImportsCheck = [ "sanic" ]; + meta = with lib; { description = "A microframework based on uvloop, httptools, and learnings of flask"; homepage = "http://github.com/channelcat/sanic/"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7799b6356b39..7c9c32111f15 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6358,7 +6358,9 @@ in { pytest-runner = self.pytestrunner; # added 2021-01-04 pytestrunner = callPackage ../development/python-modules/pytestrunner { }; - pytest-sanic = callPackage ../development/python-modules/pytest-sanic { }; + pytest-sanic = callPackage ../development/python-modules/pytest-sanic { + sanic = self.sanic.override { doCheck = false; }; + }; pytest-server-fixtures = callPackage ../development/python-modules/pytest-server-fixtures { };