diff options
author | Robert Schütz <robert.schuetz@stud.uni-heidelberg.de> | 2018-01-17 11:46:27 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-01-20 13:37:43 +0100 |
commit | ee8f15ec7c1f9115243248c374918b9cd4f06d16 (patch) | |
tree | c70ea9def02dd033a9b482ebab0d047c4beb17c7 | |
parent | 1623c8371c48a50ff8a4adeace47fe3e1a7c1117 (diff) | |
download | nixlib-ee8f15ec7c1f9115243248c374918b9cd4f06d16.tar nixlib-ee8f15ec7c1f9115243248c374918b9cd4f06d16.tar.gz nixlib-ee8f15ec7c1f9115243248c374918b9cd4f06d16.tar.bz2 nixlib-ee8f15ec7c1f9115243248c374918b9cd4f06d16.tar.lz nixlib-ee8f15ec7c1f9115243248c374918b9cd4f06d16.tar.xz nixlib-ee8f15ec7c1f9115243248c374918b9cd4f06d16.tar.zst nixlib-ee8f15ec7c1f9115243248c374918b9cd4f06d16.zip |
pythonPackages.pytestrunner: 2.6.2 -> 3.0
Also add missing dependency to progressbar2
-rw-r--r-- | pkgs/development/python-modules/progressbar2/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/python-modules/pytestrunner/default.nix | 19 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 21 |
3 files changed, 22 insertions, 20 deletions
diff --git a/pkgs/development/python-modules/progressbar2/default.nix b/pkgs/development/python-modules/progressbar2/default.nix index 7721ca4e5ca5..212c06cc9421 100644 --- a/pkgs/development/python-modules/progressbar2/default.nix +++ b/pkgs/development/python-modules/progressbar2/default.nix @@ -14,6 +14,7 @@ , pytestcov , pytestcache , pep8 +, pytestrunner }: buildPythonPackage rec { @@ -30,6 +31,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ python-utils ]; + nativeBuildInputs = [ pytestrunner ]; checkInputs = [ pytest sphinx coverage execnet flake8 pytestpep8 pytestflakes pytestcov pytestcache pep8 diff --git a/pkgs/development/python-modules/pytestrunner/default.nix b/pkgs/development/python-modules/pytestrunner/default.nix new file mode 100644 index 000000000000..67af195b68a6 --- /dev/null +++ b/pkgs/development/python-modules/pytestrunner/default.nix @@ -0,0 +1,19 @@ +{ stdenv, buildPythonPackage, fetchPypi, setuptools_scm, pytest }: + +buildPythonPackage rec { + pname = "pytest-runner"; + version = "3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "00v7pi09q60yx0l1kzyklnmr5bp597mir85a9gsi7bdfyly3lz0g"; + }; + + buildInputs = [ setuptools_scm pytest ]; + + meta = with stdenv.lib; { + description = "Invoke py.test as distutils command with dependency resolution"; + homepage = https://bitbucket.org/pytest-dev/pytest-runner; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2c42031cbc14..63ce08a1396a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3424,26 +3424,7 @@ in { }; }; - pytestrunner = buildPythonPackage rec { - version = "2.6.2"; - name = "pytest-runner-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/pytest-runner/${name}.tar.gz"; - sha256 = "e775a40ee4a3a1d45018b199c44cc20bbe7f3df2dc8882f61465bb4141c78cdb"; - }; - - buildInputs = with self; [setuptools_scm pytest]; - - meta = { - description = "Invoke py.test as distutils command with dependency resolution"; - homepage = https://bitbucket.org/pytest-dev/pytest-runner; - license = licenses.mit; - }; - - # Trying to run tests fails with # RuntimeError: dictionary changed size during iteration - doCheck = false; - }; + pytestrunner = callPackage ../development/python-modules/pytestrunner { }; pytestquickcheck = callPackage ../development/python-modules/pytest-quickcheck { }; |