From c00664e84495953f26306676df114414271f59be Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 11 Feb 2021 02:32:01 +0000 Subject: [PATCH 1/3] python37Packages.graphql-core: 3.1.2 -> 3.1.3 --- pkgs/development/python-modules/graphql-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/graphql-core/default.nix b/pkgs/development/python-modules/graphql-core/default.nix index 9e48f66c13d1..a2c22565a2f2 100644 --- a/pkgs/development/python-modules/graphql-core/default.nix +++ b/pkgs/development/python-modules/graphql-core/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "graphql-core"; - version = "3.1.2"; + version = "3.1.3"; src = fetchFromGitHub { owner = "graphql-python"; repo = pname; rev = "v${version}"; - sha256 = "0kvbj9dwpx8mjfj86kqx54dbz9k72ki147ssyj0ca2syvb8jm3wb"; + sha256 = "0qy1i6vffwad74ymdsh1qjf5b6ph4z0vyxzkkc6yppwczhzmi1ps"; }; propagatedBuildInputs = [ From 45476305629e6a6fa965d550ad0c4a02b0b79297 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 11 Feb 2021 03:55:42 +0100 Subject: [PATCH 2/3] python3Packages.graphql-core: cleanup --- .../python-modules/graphql-core/default.nix | 22 ++++--------------- 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/pkgs/development/python-modules/graphql-core/default.nix b/pkgs/development/python-modules/graphql-core/default.nix index a2c22565a2f2..5c29a1135a9b 100644 --- a/pkgs/development/python-modules/graphql-core/default.nix +++ b/pkgs/development/python-modules/graphql-core/default.nix @@ -1,10 +1,11 @@ { buildPythonPackage , fetchFromGitHub , lib +, pythonOlder , coveralls , promise -, pytest +, pytestCheckHook , pytest-benchmark , pytest-mock , rx @@ -14,6 +15,7 @@ buildPythonPackage rec { pname = "graphql-core"; version = "3.1.3"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "graphql-python"; @@ -22,27 +24,11 @@ buildPythonPackage rec { sha256 = "0qy1i6vffwad74ymdsh1qjf5b6ph4z0vyxzkkc6yppwczhzmi1ps"; }; - propagatedBuildInputs = [ - promise - rx - six - ]; - checkInputs = [ - coveralls - pytest pytest-benchmark - pytest-mock + pytestCheckHook ]; - checkPhase = "pytest"; - - configurePhase = '' - substituteInPlace setup.py \ - --replace 'pytest-mock==1.2' 'pytest-mock==1.13.0' \ - --replace 'pytest-benchmark==3.0.0' 'pytest-benchmark==3.2.2' - ''; - meta = with lib; { description = "Port of graphql-js to Python"; homepage = "https://github.com/graphql-python/graphql-core"; From b38f8ae53ed2eeb25a57b29b7f2885f2b03c3ecc Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 11 Feb 2021 03:56:40 +0100 Subject: [PATCH 3/3] python3Packages.graphene: add missing test dependency This was previously propagated by graphql-core, thus shadowing the missing dependency. --- pkgs/development/python-modules/graphene/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/graphene/default.nix b/pkgs/development/python-modules/graphene/default.nix index 301ffca03477..bf7d08cdce36 100644 --- a/pkgs/development/python-modules/graphene/default.nix +++ b/pkgs/development/python-modules/graphene/default.nix @@ -5,6 +5,7 @@ , iso8601 , graphql-core , graphql-relay +, promise , pytestCheckHook , pytest-asyncio , pytest-benchmark @@ -31,6 +32,7 @@ buildPythonPackage rec { ]; checkInputs = [ + promise pytestCheckHook pytest-asyncio pytest-benchmark @@ -39,6 +41,8 @@ buildPythonPackage rec { snapshottest ]; + pytestFlagsArray = [ "--benchmark-disable" ]; + pythonImportsCheck = [ "graphene" ]; meta = with lib; {