Merge pull request #140875 from SuperSandro2000/cleanup

pkgs/development/python-modules/paste/default.nix

@@ -1,34 +1,42 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , six
-, pytest-runner
-, pytest
+, pytestCheckHook
 }:
 
 buildPythonPackage rec {
   pname = "paste";
   version = "3.5.0";
 
-  src = fetchPypi {
-    pname = "Paste";
-    inherit version;
-    sha256 = "17f3zppjjprs2jnklvzkz23mh9jdn6b1f445mvrjdm4ivi15q28v";
+  src = fetchFromGitHub {
+    owner = "cdent";
+    repo = "paste";
+    rev = version;
+    sha256 = "sha256-yaOxbfQ8rdViepxhdF0UzlelC/ozdsP1lOdU5w4OPEQ=";
   };
 
-  propagatedBuildInputs = [ six ];
-
-  checkInputs = [ pytest-runner pytest ];
-
-  # Certain tests require network
-  checkPhase = ''
-    py.test -k "not test_cgiapp and not test_proxy"
+  postPatch = ''
+    patchShebangs tests/cgiapp_data/
   '';
 
+  # propagatedBuildInputs = [ six ];
+
+  checkInputs = [ pytestCheckHook ];
+
+  disabledTests = [
+    # broken test
+    "test_file_cache"
+    # requires network connection
+    "test_proxy_to_website"
+  ];
+
+  pythonNamespaces = [ "paste" ];
+
   meta = with lib; {
     description = "Tools for using a Web Server Gateway Interface stack";
     homepage = "http://pythonpaste.org/";
     license = licenses.mit;
+    maintainers = with maintainers; [ ];
   };
-
 }

pkgs/development/python-modules/pastescript/default.nix

@@ -5,27 +5,32 @@
 , six
 , paste
 , pastedeploy
-, cheetah
 }:
 
 buildPythonPackage rec {
+  pname = "pastescript";
   version = "3.2.1";
-  pname = "PasteScript";
 
   src = fetchPypi {
-    inherit pname version;
+    pname = "PasteScript";
+    inherit version;
     sha256 = "f3ef819785e1b284e6fc108a131bce7e740b18255d96cd2e99ee3f00fd452468";
   };
 
-  buildInputs = [ nose ];
-  propagatedBuildInputs = [ six paste pastedeploy cheetah ];
+  propagatedBuildInputs = [
+    paste
+    pastedeploy
+    six
+  ];
 
-  doCheck = false;
+  checkInputs = [ nose ];
+
+  pythonNamespaces = [ "paste" ];
 
   meta = with lib; {
     description = "A pluggable command-line frontend, including commands to setup package file layouts";
     homepage = "https://github.com/cdent/pastescript/";
     license = licenses.mit;
+    maintainers = with maintainers; [ ];
   };
-
 }

pkgs/development/python-modules/plaster-pastedeploy/default.nix

@@ -1,10 +1,14 @@
-{ buildPythonPackage, fetchPypi, fetchpatch
-, plaster, pastedeploy
-, pytest, pytest-cov
+{ lib
+, buildPythonPackage
+, fetchPypi
+, fetchpatch
+, plaster
+, pastedeploy
+, pytestCheckHook
 }:
 
 buildPythonPackage rec {
-  pname = "plaster_pastedeploy";
+  pname = "plaster-pastedeploy";
   version = "0.6";
 
   src = fetchPypi {
@@ -21,10 +25,14 @@ buildPythonPackage rec {
     })
   ];
 
-  checkPhase = ''
-    py.test
-  '';
-
   propagatedBuildInputs = [ plaster pastedeploy ];
-  checkInputs = [ pytest pytest-cov ];
+
+  checkInputs = [ pytestCheckHook ];
+
+  meta = with lib; {
+    description = "PasteDeploy binding to the plaster configuration loader";
+    homepage = "https://github.com/Pylons/plaster_pastedeploy";
+    license = licenses.mit;
+    maintainers = with maintainers; [ ];
+  };
 }

pkgs/development/python-modules/pyramid/default.nix

@@ -29,10 +29,6 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ hupper pastedeploy plaster plaster-pastedeploy repoze_lru translationstring venusian webob zope_deprecation zope_interface ];
 
-  # Failing tests
-  # https://github.com/Pylons/pyramid/issues/1899
-  doCheck = !isPy35;
-
   pythonImportsCheck = [ "pyramid" ];
 
   meta = with lib; {

pkgs/development/python-modules/sqlobject/default.nix

@@ -1,7 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchPypi
-, pytest
+, pytestCheckHook
 , FormEncode
 , pastedeploy
 , paste
@@ -17,13 +17,14 @@ buildPythonPackage rec {
     sha256 = "45064184decf7f42d386704e5f47a70dee517d3e449b610506e174025f84d921";
   };
 
-  checkInputs = [ pytest ];
   propagatedBuildInputs = [ FormEncode pastedeploy paste pydispatcher ];
 
+  checkInputs = [ pytestCheckHook ];
+
   meta = with lib; {
     description = "Object Relational Manager for providing an object interface to your database";
     homepage = "http://www.sqlobject.org/";
     license = licenses.lgpl21;
+    maintainers = with maintainers; [ ];
   };
-
 }

pkgs/development/python-modules/webtest/default.nix

@@ -24,7 +24,7 @@ buildPythonPackage rec {
     sha256 = "sha256-qsFotbK08gCvTjWGfPMWcSIQ49XbgcHL3/OHImR7sIc=";
   };
 
-  preConfigure = ''
+  postPatch = ''
     substituteInPlace setup.py --replace "nose<1.3.0" "nose"
   '';
 

pkgs/top-level/python-packages.nix

@@ -5381,6 +5381,8 @@ in {
 
   pastel = callPackage ../development/python-modules/pastel { };
 
+  pastescript = callPackage ../development/python-modules/pastescript { };
+
   patator = callPackage ../development/python-modules/patator { };
 
   patch = callPackage ../development/python-modules/patch { };

pkgs/top-level/python2-packages.nix

@@ -388,8 +388,6 @@ with self; with super; {
 
   pandas = callPackage ../development/python-modules/pandas/2.nix { };
 
-  pasteScript = callPackage ../development/python-modules/pastescript { };
-
   pathpy = callPackage ../development/python-modules/path.py/2.nix { };
 
   pg8000 = callPackage ../development/python-modules/pg8000/1_12.nix { };