From 885e42e78f0120f904924eff5c794672dd9e5a1a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 7 Jul 2021 17:11:06 +0200 Subject: [PATCH 1/2] python3Packages.pyroma: 3.1 -> 3.2 --- pkgs/development/python-modules/pyroma/default.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/pyroma/default.nix b/pkgs/development/python-modules/pyroma/default.nix index c8fc988b96c0..72a114b8ab1f 100644 --- a/pkgs/development/python-modules/pyroma/default.nix +++ b/pkgs/development/python-modules/pyroma/default.nix @@ -1,22 +1,20 @@ { lib, buildPythonPackage, fetchPypi -, docutils, pygments, setuptools +, docutils, pygments, setuptools, requests }: buildPythonPackage rec { pname = "pyroma"; - version = "3.1"; + version = "3.2"; src = fetchPypi { inherit pname version; - sha256 = "45ad8201da9a813b5597bb85c80bbece93af9ec89170fc2be5ad85fa9463cef1"; + sha256 = "sha256-+MGB4NXSkvEXka/Bj30CGKg8hc9k1vj7FXHOnSmiTko="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "pygments < 2.6" "pygments" - ''; + propagatedBuildInputs = [ docutils pygments setuptools requests ]; - propagatedBuildInputs = [ docutils pygments setuptools ]; + # Tests require network access + doCheck = false; meta = with lib; { description = "Test your project's packaging friendliness"; From b86f54b571dc29bd491daeb23aafef18c3e60a94 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 7 Jul 2021 17:22:08 +0200 Subject: [PATCH 2/2] python3Packages.pyroma: enable tests --- .../python-modules/pyroma/default.nix | 40 +++++++++++++++---- 1 file changed, 32 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/pyroma/default.nix b/pkgs/development/python-modules/pyroma/default.nix index 72a114b8ab1f..03eea0b8b5e9 100644 --- a/pkgs/development/python-modules/pyroma/default.nix +++ b/pkgs/development/python-modules/pyroma/default.nix @@ -1,24 +1,48 @@ -{ lib, buildPythonPackage, fetchPypi -, docutils, pygments, setuptools, requests +{ lib +, buildPythonPackage +, fetchFromGitHub +, docutils +, pygments +, setuptools +, requests +, pytestCheckHook }: buildPythonPackage rec { pname = "pyroma"; version = "3.2"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-+MGB4NXSkvEXka/Bj30CGKg8hc9k1vj7FXHOnSmiTko="; + src = fetchFromGitHub { + owner = "regebro"; + repo = pname; + rev = version; + sha256 = "0ln9w984n48nyxwzd1y48l6b18lnv52radcyizaw56lapcgxrzdr"; }; - propagatedBuildInputs = [ docutils pygments setuptools requests ]; + propagatedBuildInputs = [ + docutils + pygments + setuptools + requests + ]; - # Tests require network access - doCheck = false; + checkInputs = [ + pytestCheckHook + ]; + + pytestFlagsArray = [ "pyroma/tests.py" ]; + + disabledTests = [ + # PyPI tests require network access + "PyPITest" + ]; + + pythonImportsCheck = [ "pyroma" ]; meta = with lib; { description = "Test your project's packaging friendliness"; homepage = "https://github.com/regebro/pyroma"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; }