From 2c6cbd0d72b0aad99672d36c30bdfe8d127c8f4a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 21 Feb 2023 13:44:32 +0100 Subject: [PATCH 1/5] python310Packages.paste: 3.5.0 -> 3.5.2 --- .../python-modules/paste/default.nix | 24 ++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/paste/default.nix b/pkgs/development/python-modules/paste/default.nix index e388adfb1f1e..1e485caf8207 100644 --- a/pkgs/development/python-modules/paste/default.nix +++ b/pkgs/development/python-modules/paste/default.nix @@ -2,27 +2,37 @@ , buildPythonPackage , fetchFromGitHub , pytestCheckHook +, 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 @@ -31,7 +41,9 @@ buildPythonPackage rec { "test_proxy_to_website" ]; - pythonNamespaces = [ "paste" ]; + pythonNamespaces = [ + "paste" + ]; meta = with lib; { description = "Tools for using a Web Server Gateway Interface stack"; From 3d9cd7c149b38d3d9bf077c212c62770503cbe6e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 21 Feb 2023 14:04:25 +0100 Subject: [PATCH 2/5] python310Packages.paste: disable failing test on Python 3.11 --- pkgs/development/python-modules/paste/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/paste/default.nix b/pkgs/development/python-modules/paste/default.nix index 1e485caf8207..b292c2c45a29 100644 --- a/pkgs/development/python-modules/paste/default.nix +++ b/pkgs/development/python-modules/paste/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , pytestCheckHook +, pythonAtLeast , pythonOlder , setuptools , six @@ -25,7 +26,7 @@ buildPythonPackage rec { patchShebangs tests/cgiapp_data/ ''; - propagatedBuildInputs = [ + propagatedBuildInputs = [ setuptools six ]; @@ -39,6 +40,9 @@ buildPythonPackage rec { "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 = [ From c2de80161e28a606380ccc2857bbca18379e1907 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 21 Feb 2023 15:07:55 +0100 Subject: [PATCH 3/5] python311Packages.paste: add changelog to meta --- pkgs/development/python-modules/paste/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/paste/default.nix b/pkgs/development/python-modules/paste/default.nix index b292c2c45a29..ba082c9285b9 100644 --- a/pkgs/development/python-modules/paste/default.nix +++ b/pkgs/development/python-modules/paste/default.nix @@ -51,7 +51,8 @@ buildPythonPackage rec { 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; [ ]; }; From a6ae7f73875a3c669d1d83154edfda47191d8742 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 Feb 2023 00:28:53 +0100 Subject: [PATCH 4/5] python310Packages.pastedeploy: add changelog to meta --- pkgs/development/python-modules/pastedeploy/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/pastedeploy/default.nix b/pkgs/development/python-modules/pastedeploy/default.nix index 03b765719069..1fab03a168e7 100644 --- a/pkgs/development/python-modules/pastedeploy/default.nix +++ b/pkgs/development/python-modules/pastedeploy/default.nix @@ -20,6 +20,7 @@ buildPythonPackage rec { 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; }; From cb753dd281835ccc42dd17446453a5dca32bdaee Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 Feb 2023 00:37:06 +0100 Subject: [PATCH 5/5] python310Packages.pastedeploy: 2.1.1 -> 3.0.1 Changelog: https://github.com/Pylons/pastedeploy/blob/3.0.1/docs/news.rst --- .../python-modules/pastedeploy/default.nix | 23 +++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pastedeploy/default.nix b/pkgs/development/python-modules/pastedeploy/default.nix index 1fab03a168e7..749d3574d701 100644 --- a/pkgs/development/python-modules/pastedeploy/default.nix +++ b/pkgs/development/python-modules/pastedeploy/default.nix @@ -2,20 +2,35 @@ , 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";