From cdfb32d17a988c9fe2952c586f7ea8c2b6ca7115 Mon Sep 17 00:00:00 2001 From: Kevin Amado Date: Mon, 20 Jan 2020 09:58:04 -0500 Subject: [PATCH] pythonPackages.pyparsing: improve tests - Fetch pyparsing from GitHub instead of PyPi - Add tests --- .../python-modules/pyparsing/default.nix | 44 +++++++++++++------ 1 file changed, 30 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/pyparsing/default.nix b/pkgs/development/python-modules/pyparsing/default.nix index f1f43a5f495b..4acc4fa804b3 100644 --- a/pkgs/development/python-modules/pyparsing/default.nix +++ b/pkgs/development/python-modules/pyparsing/default.nix @@ -1,19 +1,35 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ buildPythonPackage +, fetchFromGitHub +, lib + +# pythonPackages +, coverage +}: + buildPythonPackage rec { - pname = "pyparsing"; - version = "2.4.6"; + pname = "pyparsing"; + version = "2.4.6"; - src = fetchPypi { - inherit pname version; - sha256 = "4c830582a84fb022400b85429791bc551f1f4871c33f23e44f353119e92f969f"; - }; + src = fetchFromGitHub { + owner = "pyparsing"; + repo = pname; + rev = "pyparsing_${version}"; + sha256 = "1fh7s3cfr274pd6hh6zygl99842rqws98an2nkrrqj2spb9ldxcm"; + }; - # Not everything necessary to run the tests is included in the distribution - doCheck = false; + # https://github.com/pyparsing/pyparsing/blob/847af590154743bae61a32c3dc1a6c2a19009f42/tox.ini#L6 + checkInputs = [ coverage ]; + checkPhase = '' + coverage run --branch simple_unit_tests.py + coverage run --branch unitTests.py + ''; - meta = with stdenv.lib; { - homepage = https://pyparsing.wikispaces.com/; - description = "An alternative approach to creating and executing simple grammars, vs. the traditional lex/yacc approach, or the use of regular expressions"; - license = licenses.mit; - }; + meta = with lib; { + homepage = "https://github.com/pyparsing/pyparsing"; + description = "An alternative approach to creating and executing simple grammars, vs. the traditional lex/yacc approach, or the use of regular expressions"; + license = licenses.mit; + maintainers = with maintainers; [ + kamadorueda + ]; + }; }