pythonPackages.pytest_*: move to pkgs/development/python-modules

5 files changed, 110 insertions, 52 deletions

diff --git a/pkgs/development/python-modules/pytest/2_7.nix b/pkgs/development/python-modules/pytest/2_7.nix
new file mode 100644
index 000000000000..adaa640fdbe6
--- /dev/null
+++ b/pkgs/development/python-modules/pytest/2_7.nix
@@ -0,0 +1,28 @@
+{ stdenv, pkgs, buildPythonPackage, fetchurl, isPy26, argparse, py, selenium }:
+buildPythonPackage rec {
+  name = "pytest-2.7.3";
+
+  src = fetchurl {
+    url = "mirror://pypi/p/pytest/${name}.tar.gz";
+    sha256 = "1z4yi986f9n0p8qmzmn21m21m8j1x78hk3505f89baqm6pdw7afm";
+  };
+
+  # Disabled temporarily because of Hydra issue with namespaces
+  doCheck = false;
+
+  preCheck = ''
+    # don't test bash builtins
+    rm testing/test_argcomplete.py
+  '';
+
+  propagatedBuildInputs = [ py ]
+    ++ (stdenv.lib.optional isPy26 argparse)
+    ++ stdenv.lib.optional
+      pkgs.config.pythonPackages.pytest.selenium or false
+      selenium;
+
+  meta = with stdenv.lib; {
+    maintainers = with maintainers; [ domenkozar lovek323 madjar ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/development/python-modules/pytest/2_8.nix b/pkgs/development/python-modules/pytest/2_8.nix
new file mode 100644
index 000000000000..6232ccaf7006
--- /dev/null
+++ b/pkgs/development/python-modules/pytest/2_8.nix
@@ -0,0 +1,28 @@
+{ stdenv, pkgs, buildPythonPackage, fetchurl, isPy26, argparse, py, selenium }:
+buildPythonPackage rec {
+  name = "pytest-2.8.7";
+
+  src = fetchurl {
+    url = "mirror://pypi/p/pytest/${name}.tar.gz";
+    sha256 = "1bwb06g64x2gky8x5hcrfpg6r351xwvafimnhm5qxq7wajz8ck7w";
+  };
+
+  # Disabled temporarily because of Hydra issue with namespaces
+  doCheck = false;
+
+  preCheck = ''
+    # don't test bash builtins
+    rm testing/test_argcomplete.py
+  '';
+
+  propagatedBuildInputs = [ py ]
+    ++ (stdenv.lib.optional isPy26 argparse)
+    ++ stdenv.lib.optional
+      pkgs.config.pythonPackages.pytest.selenium or false
+      selenium;
+
+  meta = with stdenv.lib; {
+    maintainers = with maintainers; [ domenkozar lovek323 madjar ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/development/python-modules/pytest/2_9.nix b/pkgs/development/python-modules/pytest/2_9.nix
new file mode 100644
index 000000000000..3ca7120dd92c
--- /dev/null
+++ b/pkgs/development/python-modules/pytest/2_9.nix
@@ -0,0 +1,28 @@
+{ stdenv, pkgs, buildPythonPackage, fetchurl, isPy26, argparse, py, selenium }:
+buildPythonPackage rec {
+  name = "pytest-2.9.2";
+
+  src = fetchurl {
+    url = "mirror://pypi/p/pytest/${name}.tar.gz";
+    sha256 = "1n6igbc1b138wx1q5gca4pqw1j6nsyicfxds5n0b5989kaxqmh8j";
+  };
+
+  # Disabled temporarily because of Hydra issue with namespaces
+  doCheck = false;
+
+  preCheck = ''
+    # don't test bash builtins
+    rm testing/test_argcomplete.py
+  '';
+
+  propagatedBuildInputs = [ py ]
+    ++ (stdenv.lib.optional isPy26 argparse)
+    ++ stdenv.lib.optional
+      pkgs.config.pythonPackages.pytest.selenium or false
+      selenium;
+
+  meta = with stdenv.lib; {
+    maintainers = with maintainers; [ domenkozar lovek323 madjar ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix
new file mode 100644
index 000000000000..76e2b67e65ad
--- /dev/null
+++ b/pkgs/development/python-modules/pytest/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, buildPythonPackage, fetchurl, hypothesis, py }:
+buildPythonPackage rec {
+  name = "pytest-${version}";
+  version = "3.0.5";
+
+  preCheck = ''
+    # don't test bash builtins
+    rm testing/test_argcomplete.py
+  '';
+
+  src = fetchurl {
+    url = "mirror://pypi/p/pytest/${name}.tar.gz";
+    sha256 = "1z9pj39w0r2gw5hsqndlmsqa80kgbrann5kfma8ww8zhaslkl02a";
+  };
+
+  propagatedBuildInputs = [ hypothesis py ];
+
+  meta = with stdenv.lib; {
+    maintainers = with maintainers; [ domenkozar lovek323 madjar ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0118abd57cf8..31d5c0f3d11b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4997,61 +4997,13 @@ in {
 
   pytest = self.pytest_29;
 
-  pytest_27 = buildPythonPackage rec {
-    name = "pytest-2.7.3";
+  pytest_27 = callPackage ../development/python-modules/pytest/2_7.nix {};
 
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/pytest/${name}.tar.gz";
-      sha256 = "1z4yi986f9n0p8qmzmn21m21m8j1x78hk3505f89baqm6pdw7afm";
-    };
-
-    # Disabled temporarily because of Hydra issue with namespaces
-    doCheck = false;
-
-    preCheck = ''
-      # don't test bash builtins
-      rm testing/test_argcomplete.py
-    '';
-
-    propagatedBuildInputs = with self; [ py ]
-      ++ (optional isPy26 argparse)
-      ++ stdenv.lib.optional
-        pkgs.config.pythonPackages.pytest.selenium or false
-        self.selenium;
-
-    meta = {
-      maintainers = with maintainers; [ domenkozar lovek323 madjar ];
-      platforms = platforms.unix;
-    };
-  };
+  pytest_28 = callPackage ../development/python-modules/pytest/2_8.nix {};
 
-  pytest_28 = self.pytest_27.override rec {
-    name = "pytest-2.8.7";
+  pytest_29 = callPackage ../development/python-modules/pytest/2_9.nix {};
 
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/pytest/${name}.tar.gz";
-      sha256 = "1bwb06g64x2gky8x5hcrfpg6r351xwvafimnhm5qxq7wajz8ck7w";
-    };
-  };
-
-  pytest_29 = self.pytest_27.override rec {
-    name = "pytest-2.9.2";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/pytest/${name}.tar.gz";
-      sha256 = "1n6igbc1b138wx1q5gca4pqw1j6nsyicfxds5n0b5989kaxqmh8j";
-    };
-  };
-
-  pytest_30 = self.pytest_27.override rec {
-    name = "pytest-3.0.5";
-
-    propagatedBuildInputs = with self; [ hypothesis py ];
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/pytest/${name}.tar.gz";
-      sha256 = "1z9pj39w0r2gw5hsqndlmsqa80kgbrann5kfma8ww8zhaslkl02a";
-    };
-  };
+  pytest_30 = callPackage ../development/python-modules/pytest {};
 
   pytestcache = buildPythonPackage rec {
     name = "pytest-cache-1.0";