From patchwork Fri Aug 30 14:25:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Marius Bakke X-Patchwork-Id: 15182 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id E170D17368; Fri, 30 Aug 2019 15:42:51 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 6F5C217365 for ; Fri, 30 Aug 2019 15:42:51 +0100 (BST) Received: from localhost ([::1]:32822 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i3i6z-0003KE-VI for patchwork@mira.cbaines.net; Fri, 30 Aug 2019 10:42:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56723) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i3hrp-0002Qb-AH for guix-patches@gnu.org; Fri, 30 Aug 2019 10:27:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i3hrm-0002Ih-Hb for guix-patches@gnu.org; Fri, 30 Aug 2019 10:27:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45844) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i3hrk-0002Fg-DQ for guix-patches@gnu.org; Fri, 30 Aug 2019 10:27:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i3hrh-0003pi-N2 for guix-patches@gnu.org; Fri, 30 Aug 2019 10:27:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#37234] [PATCH 01/21] gnu: Add python-gunicorn. References: <20190830142333.27853-1-mbakke@fastmail.com> In-Reply-To: <20190830142333.27853-1-mbakke@fastmail.com> Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 30 Aug 2019 14:27:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 37234 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 37234@debbugs.gnu.org Received: via spool by 37234-submit@debbugs.gnu.org id=B37234.156717516214466 (code B ref 37234); Fri, 30 Aug 2019 14:27:01 +0000 Received: (at 37234) by debbugs.gnu.org; 30 Aug 2019 14:26:02 +0000 Received: from localhost ([127.0.0.1]:54569 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i3hqb-0003kC-Al for submit@debbugs.gnu.org; Fri, 30 Aug 2019 10:26:02 -0400 Received: from wout4-smtp.messagingengine.com ([64.147.123.20]:53071) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i3hqY-0003jh-5L for 37234@debbugs.gnu.org; Fri, 30 Aug 2019 10:25:50 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.west.internal (Postfix) with ESMTP id 9386E52E for <37234@debbugs.gnu.org>; Fri, 30 Aug 2019 10:25:42 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Fri, 30 Aug 2019 10:25:42 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= from:to:subject:date:message-id:mime-version:content-type :content-transfer-encoding; s=fm3; bh=dLlF8+JGNaRwk+tb88YT0exfDu Mi8l0RrrrCM4aERO8=; b=Mth6Fb7AojbdPr3BFwStqI63r/YEVUWz7R1ziG/dQy iANKrIEad/d5M6l1Rq3Zd8ESq5GQqJ2WI4wlUAkD8S8z9m+h9ZUSxnMlf1KfEGBm L2ti6KX4aVgAplM2YYI0ZxPdZwg0CtC2zNM7qnXrjmlPeQJSbcCkiKVqsaqwmMZw RnADp0lP21z2D5WUj9JWtS065lH5GSEe3veSouLIKcQzOJy4+763FEmE0rdiKa7d miq/5sHjrIhxgwJSgQg3WFulanJF93ekktfcBm71a1MWhNK6nkPnx5CJfkn+qPZ8 3cS8/Z/DI5ALSF+8fpshHCEfKYm1xczFVAOm+XH1vObg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:content-type :date:from:message-id:mime-version:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=dLlF8+ JGNaRwk+tb88YT0exfDuMi8l0RrrrCM4aERO8=; b=BMDasTiVdkDX8PKXvVfdwR DbQq5NukZczCtm26CYyUsXJ74K9XvTKZtQxrOESl97g4Xd4+2q8mPs1Ox3IPKQ8Z oClX15z3quZbF1+aL0tKuovDCaTYCuwsyqMpGYKiz+2ci0HNSDCobj9VDMYaC1B4 728MY4eDJNChrtJXZLB3UD88FSyDDcsJiJ/kfRwWG9i/3rQE3+xHF/CJXV9TnH6s j4uE8L74P7yfhea6gndzH9NeKOprZt3Q/RdpCeIpoS0mK89N3K3jCbQc9t9SQ/H4 bnqizDoBwb2WJpoR+ez8FAEwejmEn4sW1w3mQ71pbJGSNVwZyW1JovoMQPvO5KDA == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduvddrudeigedgjeeiucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofggtgfgsehtkeertd ertdejnecuhfhrohhmpeforghrihhushcuuegrkhhkvgcuoehmsggrkhhkvgesfhgrshht mhgrihhlrdgtohhmqeenucffohhmrghinhephhhtthhpshgvrhhvvghrrdhithdpghhunh hitghorhhnrdhorhhgnecukfhppeeivddrudeirdduledvrdduhedtnecurfgrrhgrmhep mhgrihhlfhhrohhmpehmsggrkhhkvgesfhgrshhtmhgrihhlrdgtohhmnecuvehluhhsth gvrhfuihiivgeptd X-ME-Proxy: Received: from localhost (ti0006q161-0149.bb.online.no [62.16.192.150]) by mail.messagingengine.com (Postfix) with ESMTPA id A944780066 for <37234@debbugs.gnu.org>; Fri, 30 Aug 2019 10:25:41 -0400 (EDT) From: Marius Bakke Date: Fri, 30 Aug 2019 16:25:19 +0200 Message-Id: <20190830142539.28376-1-mbakke@fastmail.com> X-Mailer: git-send-email 2.22.1 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/check.scm (python-pytest-3.2, python-pytest-cov-2.5, python-coverage-4.3): New public variables. * gnu/packages/python-web.scm (python-gunicorn): New public variable. --- gnu/packages/check.scm | 41 ++++++++++++++++++++++++++++++++++++- gnu/packages/python-web.scm | 28 ++++++++++++++++++++++++- 2 files changed, 67 insertions(+), 2 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 085538b2de..e81cd50b66 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -25,7 +25,7 @@ ;;; Copyright © 2017, 2019 Kei Kebreau ;;; Copyright © 2017 ng0 ;;; Copyright © 2015, 2017, 2018 Ricardo Wurmus -;;; Copyright © 2016, 2017, 2018 Marius Bakke +;;; Copyright © 2016, 2017, 2018, 2019 Marius Bakke ;;; Copyright © 2017, 2018 Ludovic Courtès ;;; Copyright © 2018 Fis Trivial ;;; Copyright © 2019 Pierre Langlois @@ -776,6 +776,21 @@ and many external plugins.") ("python2-pathlib2" ,python2-pathlib2-bootstrap) ,@(package-propagated-inputs pytest)))))) +;; python-gunicorn requires this ancient version for Python 2.6 support. +(define-public python-pytest-3.2 + (package + (inherit python-pytest) + (version "3.2.5") + (source (origin + (method url-fetch) + (uri (pypi-uri "pytest" version)) + (sha256 + (base32 + "10cbsyyyzamhvi1gqqyhccsx906xlcwcgddvldalqi1v27vx8nvd")))) + (arguments + ;; XXX: Tests require similarly ancient versions of many dependencies. + `(#:tests? #f)))) + (define-public python-pytest-cov (package (name "python-pytest-cov") @@ -811,6 +826,18 @@ supports coverage of subprocesses.") (define-public python2-pytest-cov (package-with-python2 python-pytest-cov)) +;; Some packages require this old version. Remove when no longer needed. +(define-public python-pytest-cov-2.5 + (package + (inherit python-pytest-cov) + (version "2.5.1") + (source (origin + (method url-fetch) + (uri (pypi-uri "pytest-cov" version)) + (sha256 + (base32 + "0bbfpwdh9k3636bxc88vz9fa7vf4akchgn513ql1vd0xy4n7bah3")))))) + (define-public python-pytest-runner (package (name "python-pytest-runner") @@ -1289,6 +1316,18 @@ executed.") (define-public python2-coverage (package-with-python2 python-coverage)) +;; python-gunicorn requires this version. Remove once no longer needed. +(define-public python-coverage-4.3 + (package + (inherit python-coverage) + (version "4.3.4") + (source (origin + (method url-fetch) + (uri (pypi-uri "coverage" version)) + (sha256 + (base32 + "1prkwz1hkcbx19nsadbcmk4wl27ysx001pa8bykfagd3d87zxbpa")))))) + (define-public python-cov-core (package (name "python-cov-core") diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 9b88d66118..3ed0c6dd16 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2017 Christopher Baines ;;; Copyright © 2016, 2017 Danny Milosavljevic ;;; Copyright © 2013, 2014, 2015, 2016 Andreas Enge -;;; Copyright © 2016, 2017 Marius Bakke +;;; Copyright © 2016, 2017, 2019 Marius Bakke ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus ;;; Copyright © 2017 Roel Janssen ;;; Copyright © 2016, 2017 Julien Lepiller @@ -421,6 +421,32 @@ both of which are installed automatically if you install this library.") (define-public python2-flask-babel (package-with-python2 python-flask-babel)) +(define-public python-gunicorn + (package + (name "python-gunicorn") + (version "19.9.0") + (source (origin + (method url-fetch) + (uri (pypi-uri "gunicorn" version)) + (sha256 + (base32 + "1wzlf4xmn6qjirh5w81l6i6kqjnab1n1qqkh7zsj1yb6gh4n49ps")))) + (build-system python-build-system) + (native-inputs + `(;; XXX: check requirements_test.txt to see whether these special + ;; versions are still needed when updating. + ("python-coverage" ,python-coverage-4.3) + ("python-pytest" ,python-pytest-3.2) + ("python-pytest-cov" ,python-pytest-cov-2.5))) + (home-page "https://gunicorn.org/") + (synopsis "Python WSGI erver") + (description + "Gunicorn ('Green Unicorn') is a Python WSGI HTTP Server. It is a +pre-fork worker model ported from Ruby's Unicorn project. The Gunicorn +server is broadly compatible with various web frameworks, simply implemented, +light on server resource usage, and fairly speedy.") + (license license:expat))) + (define-public python-html5lib (package (name "python-html5lib")