From 75c8841f75dd201e3b05b76d7bac37ac0f2bbf5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 26 Aug 2021 23:35:55 +0200 Subject: [PATCH 1/3] python39Packages.jupyter-repo2docker: simplify disabled --- .../python-modules/jupyter-repo2docker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyter-repo2docker/default.nix b/pkgs/development/python-modules/jupyter-repo2docker/default.nix index 7597df0d76aa..1b352f1e24c9 100644 --- a/pkgs/development/python-modules/jupyter-repo2docker/default.nix +++ b/pkgs/development/python-modules/jupyter-repo2docker/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, pythonAtLeast +{ lib, buildPythonPackage, fetchPypi, pythonOlder , docker , escapism , jinja2 @@ -14,7 +14,7 @@ buildPythonPackage rec { version = "2021.3.0"; pname = "jupyter-repo2docker"; - disabled = !(pythonAtLeast "3.4"); + disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; From 4ba7ccf5015b5aea35c6201e26570adafdd36418 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 26 Aug 2021 23:46:13 +0200 Subject: [PATCH 2/3] python39Packages.inform: remove pytest-runner, use pytestCheckHook phase --- .../development/python-modules/inform/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/inform/default.nix b/pkgs/development/python-modules/inform/default.nix index 9f78d86a2be6..2397c0bc4db6 100644 --- a/pkgs/development/python-modules/inform/default.nix +++ b/pkgs/development/python-modules/inform/default.nix @@ -2,8 +2,6 @@ , arrow , six , hypothesis -, pytest -, pytest-runner , pytestCheckHook }: @@ -18,13 +16,18 @@ buildPythonPackage rec { sha256 = "114cyff00j9r7qm2ld4w1a4kklr5gx570vk67p56gpr2553dkmly"; }; - nativeBuildInputs = [ pytest-runner ]; + postPatch = '' + substituteInPlace setup.py \ + --replace "pytest-runner>=2.0" "" + ''; + propagatedBuildInputs = [ arrow six ]; - checkInputs = [ pytest hypothesis ]; - checkPhase = '' + checkInputs = [ pytestCheckHook hypothesis ]; + preCheck = '' patchShebangs test.doctests.py test.inform.py - ./test.doctests.py && ./test.inform.py && pytest + ./test.doctests.py + ./test.inform.py ''; meta = with lib; { From 03eec0aef355e7c66492bb4039cf6de6832143b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 26 Aug 2021 23:57:44 +0200 Subject: [PATCH 3/3] python39Packages.aioprocessing: simplify disabled, add import check --- pkgs/development/python-modules/aioprocessing/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioprocessing/default.nix b/pkgs/development/python-modules/aioprocessing/default.nix index 04963f1d09b1..50e4140c183e 100644 --- a/pkgs/development/python-modules/aioprocessing/default.nix +++ b/pkgs/development/python-modules/aioprocessing/default.nix @@ -1,13 +1,13 @@ { lib , buildPythonPackage , fetchPypi -, pythonAtLeast +, pythonOlder }: buildPythonPackage rec { pname = "aioprocessing"; version = "1.1.0"; - disabled = !(pythonAtLeast "3.4"); + disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; @@ -17,6 +17,8 @@ buildPythonPackage rec { # Tests aren't included in pypi package doCheck = false; + pythonImportsCheck = [ "aioprocessing" ]; + meta = { description = "A library that integrates the multiprocessing module with asyncio"; homepage = "https://github.com/dano/aioprocessing";