From ee91c45f89e4f82c73158fcfb10755f081a0cded Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 20 Jan 2018 14:12:39 +0100 Subject: [PATCH] python.pkgs.pytest_32: remove old version --- .../development/python-modules/pytest/3_2.nix | 27 ------------------- pkgs/top-level/python-packages.nix | 8 ------ 2 files changed, 35 deletions(-) delete mode 100644 pkgs/development/python-modules/pytest/3_2.nix diff --git a/pkgs/development/python-modules/pytest/3_2.nix b/pkgs/development/python-modules/pytest/3_2.nix deleted file mode 100644 index d7a0b1bdad34..000000000000 --- a/pkgs/development/python-modules/pytest/3_2.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy26, argparse, hypothesis, py -, setuptools_scm, setuptools -}: -buildPythonPackage rec { - version = "3.2.5"; - pname = "pytest"; - - preCheck = '' - # don't test bash builtins - rm testing/test_argcomplete.py - ''; - - src = fetchPypi { - inherit pname version; - sha256 = "6d5bd4f7113b444c55a3bbb5c738a3dd80d43563d063fc42dcb0aaefbdd78b81"; - }; - - checkInputs = [ hypothesis ]; - buildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ py setuptools ] - ++ (stdenv.lib.optional isPy26 argparse); - - meta = with stdenv.lib; { - maintainers = with maintainers; [ domenkozar lovek323 madjar lsix ]; - platforms = platforms.unix; - }; -} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index efca8123f3a2..c53989671642 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3218,14 +3218,6 @@ in { pytest = self.pytest_33; - pytest_32 = callPackage ../development/python-modules/pytest/3_2.nix{ - hypothesis = self.hypothesis.override { - # hypothesis requires pytest that causes dependency cycle - doCheck = false; - pytest = null; - }; - }; - pytest_33 = callPackage ../development/python-modules/pytest/default.nix{ hypothesis = self.hypothesis.override { # hypothesis requires pytest that causes dependency cycle