movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 21:50:33 +03:00
Code Activity

Merge pull request #39224 from dotlambda/no-pytest-sugar

Browse source 
python: get rid of pytest-sugar in checkInputs
This commit is contained in:
Robert Schütz 2018-04-20 15:55:03 +02:00 • committed by GitHub
commit aea4fa35c7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/python-modules/cheroot/default.nix
View file

@ -1,6 +1,6 @@
{ stdenv, fetchPypi, buildPythonPackage { stdenv, fetchPypi, buildPythonPackage
, more-itertools, six , more-itertools, six
, coverage, codecov, pytest, pytestcov, pytest-sugar, portend , pytest, pytestcov, portend
, backports_unittest-mock, setuptools_scm }: , backports_unittest-mock, setuptools_scm }:
buildPythonPackage rec { buildPythonPackage rec {
@ -16,7 +16,7 @@ buildPythonPackage rec {
buildInputs = [ setuptools_scm ]; buildInputs = [ setuptools_scm ];
checkInputs = [ coverage codecov pytest pytestcov pytest-sugar portend backports_unittest-mock ]; checkInputs = [ pytest pytestcov portend backports_unittest-mock ];
checkPhase = '' checkPhase = ''
py.test cheroot py.test cheroot

5
pkgs/development/python-modules/cherrypy/default.nix
View file

@ -1,11 +1,10 @@
{ lib, buildPythonPackage, fetchPypi { lib, buildPythonPackage, fetchPypi
, cheroot, portend, routes, six , cheroot, portend, routes, six
, setuptools_scm , setuptools_scm
, backports_unittest-mock, codecov, coverage, objgraph, pathpy, pytest, pytest-sugar, pytestcov , backports_unittest-mock, objgraph, pathpy, pytest, pytestcov
}: }:
buildPythonPackage rec { buildPythonPackage rec {
name = "${pname}-${version}";
pname = "CherryPy"; pname = "CherryPy";
version = "14.0.1"; version = "14.0.1";
@ -18,7 +17,7 @@ buildPythonPackage rec {
buildInputs = [ setuptools_scm ]; buildInputs = [ setuptools_scm ];
checkInputs = [ backports_unittest-mock codecov coverage objgraph pathpy pytest pytest-sugar pytestcov ]; checkInputs = [ backports_unittest-mock objgraph pathpy pytest pytestcov ];
checkPhase = '' checkPhase = ''
LANG=en_US.UTF-8 pytest LANG=en_US.UTF-8 pytest

17
pkgs/development/python-modules/portend/default.nix
View file

@ -1,20 +1,25 @@
{ stdenv, buildPythonPackage, fetchPypi { stdenv, buildPythonPackage, fetchPypi
, pytest, pytest-sugar, pytest-warnings, setuptools_scm , pytest, setuptools_scm, tempora }:
, tempora }:
buildPythonPackage rec { buildPythonPackage rec {
name = "${pname}-${version}";
pname = "portend"; pname = "portend";
version = "2.2"; version = "2.2";
buildInputs = [ pytest pytest-sugar pytest-warnings setuptools_scm ];
propagatedBuildInputs = [ tempora ];
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "bc48d3d99e1eaf2e9406c729f8848bfdaf87876cd3560dc3ec6c16714f529586"; sha256 = "bc48d3d99e1eaf2e9406c729f8848bfdaf87876cd3560dc3ec6c16714f529586";
}; };
nativeBuildInputs = [ setuptools_scm ];
propagatedBuildInputs = [ tempora ];
checkInputs = [ pytest ];
checkPhase = ''
py.test
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Monitor TCP ports for bound or unbound states"; description = "Monitor TCP ports for bound or unbound states";
homepage = https://github.com/jaraco/portend; homepage = https://github.com/jaraco/portend;

4
pkgs/development/python-modules/pytest-sugar/default.nix
View file

@ -19,5 +19,9 @@ buildPythonPackage rec {
description = "A plugin that changes the default look and feel of py.test"; description = "A plugin that changes the default look and feel of py.test";
homepage = https://github.com/Frozenball/pytest-sugar; homepage = https://github.com/Frozenball/pytest-sugar;
license = licenses.bsd3; license = licenses.bsd3;
# incompatible with pytest 3.5
# https://github.com/Frozenball/pytest-sugar/issues/134
broken = true; # 2018-04-20
}; };
} }