From 1c7c0d64ebbbf1cbf96a56b614012a2c00aa4a76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 7 Oct 2021 16:51:22 +0200 Subject: [PATCH] python39Packages.pastedeploy: adopt into openstack team --- .../python-modules/pastedeploy/default.nix | 27 ++++++++----------- .../python-modules/pastescript/default.nix | 4 +-- .../plaster-pastedeploy/default.nix | 6 ++--- .../python-modules/pyramid/default.nix | 4 +-- .../python-modules/sqlobject/default.nix | 4 +-- .../python-modules/webtest/default.nix | 4 +-- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 +- 8 files changed, 24 insertions(+), 28 deletions(-) diff --git a/pkgs/development/python-modules/pastedeploy/default.nix b/pkgs/development/python-modules/pastedeploy/default.nix index b5d429de081a..07705d62b32b 100644 --- a/pkgs/development/python-modules/pastedeploy/default.nix +++ b/pkgs/development/python-modules/pastedeploy/default.nix @@ -1,31 +1,26 @@ { lib , buildPythonPackage -, fetchPypi -, pytest-runner -, pytest +, fetchFromGitHub +, pytestCheckHook }: buildPythonPackage rec { + pname = "pastedeploy"; version = "2.1.1"; - pname = "PasteDeploy"; - src = fetchPypi { - inherit pname version; - sha256 = "6dead6ab9823a85d585ef27f878bc647f787edb9ca8da0716aa9f1261b464817"; + src = fetchFromGitHub { + owner = "Pylons"; + repo = pname; + rev = version; + sha256 = "sha256-9/8aM/G/EdapCZJlx0ZPzNbmw2uYjA1zGbNWJAWoeCU="; }; - buildInputs = [ pytest-runner ]; - - checkInputs = [ pytest ]; - - # no tests in PyPI tarball - # should be included with versions > 2.0.1 - doCheck = false; + checkInputs = [ pytestCheckHook ]; meta = with lib; { description = "Load, configure, and compose WSGI applications and servers"; - homepage = "http://pythonpaste.org/deploy/"; + homepage = "https://github.com/Pylons/pastedeploy"; license = licenses.mit; + maintainers = teams.openstack.members; }; - } diff --git a/pkgs/development/python-modules/pastescript/default.nix b/pkgs/development/python-modules/pastescript/default.nix index e7d8b844929d..1fbc627d9a9c 100644 --- a/pkgs/development/python-modules/pastescript/default.nix +++ b/pkgs/development/python-modules/pastescript/default.nix @@ -4,7 +4,7 @@ , nose , six , paste -, PasteDeploy +, pastedeploy , cheetah }: @@ -18,7 +18,7 @@ buildPythonPackage rec { }; buildInputs = [ nose ]; - propagatedBuildInputs = [ six paste PasteDeploy cheetah ]; + propagatedBuildInputs = [ six paste pastedeploy cheetah ]; doCheck = false; diff --git a/pkgs/development/python-modules/plaster-pastedeploy/default.nix b/pkgs/development/python-modules/plaster-pastedeploy/default.nix index 75bc033807f6..57b4e2f1b1b2 100644 --- a/pkgs/development/python-modules/plaster-pastedeploy/default.nix +++ b/pkgs/development/python-modules/plaster-pastedeploy/default.nix @@ -1,5 +1,5 @@ { buildPythonPackage, fetchPypi, fetchpatch -, plaster, PasteDeploy +, plaster, pastedeploy , pytest, pytest-cov }: @@ -13,7 +13,7 @@ buildPythonPackage rec { }; patches = [ - # Fix tests compatibility with PasteDeploy 2+ + # Fix tests compatibility with pastedeploy 2+ # https://github.com/Pylons/plaster_pastedeploy/pull/17 (fetchpatch { url = "https://github.com/Pylons/plaster_pastedeploy/commit/d77d81a57e917c67a20332beca8f418651172905.patch"; @@ -25,6 +25,6 @@ buildPythonPackage rec { py.test ''; - propagatedBuildInputs = [ plaster PasteDeploy ]; + propagatedBuildInputs = [ plaster pastedeploy ]; checkInputs = [ pytest pytest-cov ]; } diff --git a/pkgs/development/python-modules/pyramid/default.nix b/pkgs/development/python-modules/pyramid/default.nix index da9569b7fb73..d82a3dd7f5cd 100644 --- a/pkgs/development/python-modules/pyramid/default.nix +++ b/pkgs/development/python-modules/pyramid/default.nix @@ -4,7 +4,7 @@ , webtest , zope_component , hupper -, PasteDeploy +, pastedeploy , plaster , plaster-pastedeploy , repoze_lru @@ -27,7 +27,7 @@ buildPythonPackage rec { checkInputs = [ webtest zope_component ]; - propagatedBuildInputs = [ hupper PasteDeploy plaster plaster-pastedeploy repoze_lru translationstring venusian webob zope_deprecation zope_interface ]; + propagatedBuildInputs = [ hupper pastedeploy plaster plaster-pastedeploy repoze_lru translationstring venusian webob zope_deprecation zope_interface ]; # Failing tests # https://github.com/Pylons/pyramid/issues/1899 diff --git a/pkgs/development/python-modules/sqlobject/default.nix b/pkgs/development/python-modules/sqlobject/default.nix index 2335a0204e48..89f22724c93a 100644 --- a/pkgs/development/python-modules/sqlobject/default.nix +++ b/pkgs/development/python-modules/sqlobject/default.nix @@ -3,7 +3,7 @@ , fetchPypi , pytest , FormEncode -, PasteDeploy +, pastedeploy , paste , pydispatcher }: @@ -18,7 +18,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest ]; - propagatedBuildInputs = [ FormEncode PasteDeploy paste pydispatcher ]; + propagatedBuildInputs = [ FormEncode pastedeploy paste pydispatcher ]; meta = with lib; { description = "Object Relational Manager for providing an object interface to your database"; diff --git a/pkgs/development/python-modules/webtest/default.nix b/pkgs/development/python-modules/webtest/default.nix index e5dd4758df70..e8c96fba0f8f 100644 --- a/pkgs/development/python-modules/webtest/default.nix +++ b/pkgs/development/python-modules/webtest/default.nix @@ -10,7 +10,7 @@ , mock , pyquery , wsgiproxy2 -, PasteDeploy +, pastedeploy }: buildPythonPackage rec { @@ -38,7 +38,7 @@ buildPythonPackage rec { checkInputs = [ nose mock - PasteDeploy + pastedeploy wsgiproxy2 pyquery ]; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index ad0b39b27ac6..00b97d1c6590 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -55,6 +55,7 @@ mapAliases ({ lammps-cython = throw "no longer builds and is unmaintained"; MechanicalSoup = mechanicalsoup; # added 2021-06-01 pam = python-pam; # added 2020-09-07. + PasteDeploy = pastedeploy; privacyidea = throw "renamed to pkgs.privacyidea"; # added 2021-06-20 prometheus_client = prometheus-client; # added 2021-06-10 prompt_toolkit = prompt-toolkit; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7f370f947312..d7da64784785 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5369,7 +5369,7 @@ in { paste = callPackage ../development/python-modules/paste { }; - PasteDeploy = callPackage ../development/python-modules/pastedeploy { }; + pastedeploy = callPackage ../development/python-modules/pastedeploy { }; pastel = callPackage ../development/python-modules/pastel { };