From 4bed1fa043a9608f2ba8aebbe1be6382bbe7382d Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 7 Jul 2019 22:42:33 -0700 Subject: [PATCH 1/2] pythonPackages.pytest-xprocess: init at 0.12.1 --- .../pytest-xprocess/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/python-modules/pytest-xprocess/default.nix diff --git a/pkgs/development/python-modules/pytest-xprocess/default.nix b/pkgs/development/python-modules/pytest-xprocess/default.nix new file mode 100644 index 00000000000..840a096a085 --- /dev/null +++ b/pkgs/development/python-modules/pytest-xprocess/default.nix @@ -0,0 +1,32 @@ +{ lib, buildPythonPackage, fetchPypi +, psutil +, pytest +}: + +buildPythonPackage rec { + pname = "pytest-xprocess"; + version = "0.12.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "06w2acg0shy0vxrmnxpqclimhgfjys5ql5kmmzr7r1lai46x1q2h"; + }; + + propagatedBuildInputs = [ psutil pytest ]; + + # Remove test QoL package from install_requires + postPatch = '' + substituteInPlace setup.py \ + --replace "'pytest-cache', " "" + ''; + + # There's no tests in repo + doCheck = false; + + meta = with lib; { + description = "Pytest external process plugin"; + homepage = "https://github.com/pytest-dev"; + license = licenses.mit; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2ec132264a9..0ac7a0b50ca 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -855,6 +855,8 @@ in { pytest-tornado = callPackage ../development/python-modules/pytest-tornado { }; + pytest-xprocess = callPackage ../development/python-modules/pytest-xprocess { }; + python-binance = callPackage ../development/python-modules/python-binance { }; python-dbusmock = callPackage ../development/python-modules/python-dbusmock { }; From d36d7f1ab2e3ed411a3344a119b8ce97108694b8 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 7 Jul 2019 22:48:42 -0700 Subject: [PATCH 2/2] pythonPackages.flask-caching: 1.4.0 -> 1.7.2 --- .../python-modules/flask-caching/default.nix | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/flask-caching/default.nix b/pkgs/development/python-modules/flask-caching/default.nix index 84f549231ce..bd528af6bfa 100644 --- a/pkgs/development/python-modules/flask-caching/default.nix +++ b/pkgs/development/python-modules/flask-caching/default.nix @@ -1,28 +1,26 @@ -{ lib, buildPythonPackage, fetchPypi, flask, pytest, pytestcov }: +{ lib, buildPythonPackage, fetchPypi, flask, pytest, pytestcov, pytest-xprocess }: buildPythonPackage rec { pname = "Flask-Caching"; - version = "1.4.0"; + version = "1.7.2"; src = fetchPypi { inherit pname version; - sha256 = "e34f24631ba240e09fe6241e1bf652863e0cff06a1a94598e23be526bc2e4985"; + sha256 = "17jnnmnpdflv120yhsfbnpick06iias6f2hcxmf1mi1nr35kdqjj"; }; propagatedBuildInputs = [ flask ]; - checkInputs = [ pytest pytestcov ]; + checkInputs = [ pytest pytestcov pytest-xprocess ]; + # backend_cache relies on pytest-cache, which is a stale package from 2013 checkPhase = '' - py.test + pytest -k 'not backend_cache' ''; - # https://github.com/sh4nks/flask-caching/pull/74 - doCheck = false; - meta = with lib; { description = "Adds caching support to your Flask application"; - homepage = https://github.com/sh4nks/flask-caching; + homepage = "https://github.com/sh4nks/flask-caching"; license = licenses.bsd3; }; }