Merge pull request #217499 from fabaff/paste-fix

python310Packages.paste: disable failing test on Python 3.11

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

@@ -2,40 +2,57 @@
 , buildPythonPackage
 , fetchFromGitHub
 , pytestCheckHook
+, pythonAtLeast
+, pythonOlder
+, setuptools
 , six
 }:
 
 buildPythonPackage rec {
   pname = "paste";
-  version = "3.5.0";
+  version = "3.5.2";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "cdent";
     repo = "paste";
-    rev = version;
-    sha256 = "sha256-yaOxbfQ8rdViepxhdF0UzlelC/ozdsP1lOdU5w4OPEQ=";
+    rev = "refs/tags/${version}";
+    hash = "sha256-lpQMzrRpcG5TqWm/FJn4oo9TV8Skf0ypZVeQC4y8p1U=";
   };
 
   postPatch = ''
     patchShebangs tests/cgiapp_data/
   '';
 
-  propagatedBuildInputs = [ six ];
+  propagatedBuildInputs = [
+    setuptools
+    six
+  ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
 
   disabledTests = [
     # broken test
     "test_file_cache"
     # requires network connection
     "test_proxy_to_website"
+  ] ++ lib.optionals (pythonAtLeast "3.11") [
+    # https://github.com/cdent/paste/issues/72
+    "test_form"
   ];
 
-  pythonNamespaces = [ "paste" ];
+  pythonNamespaces = [
+    "paste"
+  ];
 
   meta = with lib; {
     description = "Tools for using a Web Server Gateway Interface stack";
-    homepage = "http://pythonpaste.org/";
+    homepage = "https://pythonpaste.readthedocs.io/";
+    changelog = "https://github.com/cdent/paste/blob/${version}/docs/news.txt";
     license = licenses.mit;
     maintainers = with maintainers; [ ];
   };

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

@@ -2,24 +2,40 @@
 , buildPythonPackage
 , fetchFromGitHub
 , pytestCheckHook
+, pythonOlder
 }:
 
 buildPythonPackage rec {
   pname = "pastedeploy";
-  version = "2.1.1";
+  version = "3.0.1";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "Pylons";
     repo = pname;
-    rev = version;
-    sha256 = "sha256-9/8aM/G/EdapCZJlx0ZPzNbmw2uYjA1zGbNWJAWoeCU=";
+    rev = "refs/tags/${version}";
+    hash = "sha256-8MNeOcYPEYAfghZN/K/1v/tAAdgz/fCvuVnBoru+81Q=";
   };
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  postPatch = ''
+    substituteInPlace pytest.ini \
+      --replace " --cov" ""
+  '';
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [
+    "paste.deploy"
+  ];
 
   meta = with lib; {
     description = "Load, configure, and compose WSGI applications and servers";
     homepage = "https://github.com/Pylons/pastedeploy";
+    changelog = "https://github.com/Pylons/pastedeploy/blob/${version}/docs/news.rst";
     license = licenses.mit;
     maintainers = teams.openstack.members;
   };