From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41041) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f1Rzh-0007E3-4W for guix-patches@gnu.org; Thu, 29 Mar 2018 03:29:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f1Rzb-0000NS-7M for guix-patches@gnu.org; Thu, 29 Mar 2018 03:29:09 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:49991) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1f1Rzb-0000NM-31 for guix-patches@gnu.org; Thu, 29 Mar 2018 03:29:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1f1Rza-0008AQ-QE for guix-patches@gnu.org; Thu, 29 Mar 2018 03:29:02 -0400 Subject: [bug#30982] [PATCH 7/8] gnu: python-pytest: Update to 3.5.0. Resent-Message-ID: From: Arun Isaac Date: Thu, 29 Mar 2018 12:58:15 +0530 Message-Id: <20180329072816.3911-7-arunisaac@systemreboot.net> In-Reply-To: <20180329072816.3911-1-arunisaac@systemreboot.net> References: <20180329072816.3911-1-arunisaac@systemreboot.net> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 30982@debbugs.gnu.org * gnu/packages/python.scm (python-six): Replace system* with invoke. (python-six-bootstrap, python2-six-bootstrap, python2-funcsigs-bootstrap): New variables. (python-more-itertools)[propagated-inputs]: Replace python-six with python-six-bootstrap. * gnu/packages/check.scm (python-pytest): Update to 3.5.0. [propagated-inputs]: Add python-attrs-bootstrap, python-more-itertools-bootstrap, python-pluggy and python-six-bootstrap. [properties]: Add python2-variant. (python2-pytest)[propagated-inputs]: Add python2-funcsigs. (python-pytest-bootstrap)[properties]: Add python2-variant. (python2-pytest-bootstrap)[propagated-inputs]: Add python2-funcsigs-bootstrap. --- gnu/packages/check.scm | 33 +++++++++++++++++++++++++-------- gnu/packages/python.scm | 21 ++++++++++++++++++++- 2 files changed, 45 insertions(+), 9 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index e99d44a56..c214f8bf8 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -597,14 +597,14 @@ standard library.") (define-public python-pytest (package (name "python-pytest") - (version "3.2.3") + (version "3.5.0") (source (origin (method url-fetch) (uri (pypi-uri "pytest" version)) (sha256 (base32 - "0g6w86ks73fnrnsyib9ii2rbyx830vn7aglsjqz9v1n2xwbndyi7")))) + "1q832zd07zak2lyxbycxjydh0jp7y3hvawjqzlvra6aghz8r3r7s")))) (build-system python-build-system) (arguments `(#:phases @@ -622,7 +622,11 @@ standard library.") line))) #t))))) (propagated-inputs - `(("python-py" ,python-py))) + `(("python-attrs" ,python-attrs-bootstrap) + ("python-more-itertools" ,python-more-itertools) + ("python-pluggy" ,python-pluggy) + ("python-py" ,python-py) + ("python-six" ,python-six-bootstrap))) (native-inputs `(;; Tests need the "regular" bash since 'bash-final' lacks `compgen`. ("bash" ,bash) @@ -636,20 +640,33 @@ standard library.") "Pytest is a testing tool that provides auto-discovery of test modules and functions, detailed info on failing assert statements, modular fixtures, and many external plugins.") - (license license:expat))) + (license license:expat) + (properties `((python2-variant . ,(delay python2-pytest)))))) (define-public python2-pytest - (package-with-python2 python-pytest)) + (let ((pytest (package-with-python2 + (strip-python2-variant python-pytest)))) + (package + (inherit pytest) + (propagated-inputs + `(("python2-funcsigs" ,python2-funcsigs) + ,@(package-propagated-inputs pytest)))))) (define-public python-pytest-bootstrap (package - (inherit python-pytest) + (inherit (strip-python2-variant python-pytest)) (name "python-pytest-bootstrap") (native-inputs `(("python-setuptools-scm" ,python-setuptools-scm))) - (arguments `(#:tests? #f)))) + (arguments `(#:tests? #f)) + (properties `((python2-variant . ,(delay python2-pytest-bootstrap)))))) (define-public python2-pytest-bootstrap - (package-with-python2 python-pytest-bootstrap)) + (let ((pytest (package-with-python2 + (strip-python2-variant python-pytest-bootstrap)))) + (package (inherit pytest) + (propagated-inputs + `(("python2-funcsigs" ,python2-funcsigs-bootstrap) + ,@(package-propagated-inputs pytest)))))) (define-public python-pytest-cov (package diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 0548fe722..0078cc104 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -1111,6 +1111,16 @@ Python file, so it can be easily copied into your project.") (define-public python2-six (package-with-python2 python-six)) +(define-public python-six-bootstrap + (package + (inherit python-six) + (name "python-six-bootstrap") + (native-inputs `()) + (arguments `(#:tests? #f)))) + +(define-public python2-six-bootstrap + (package-with-python2 python-six-bootstrap)) + (define-public python-schedule (package (name "python-schedule") @@ -1667,6 +1677,15 @@ matching them against a list of media-ranges.") "Backport of @code{funcsigs} which was introduced in Python 3.3.") (license license:asl2.0))) +(define-public python2-funcsigs-bootstrap + (package + (inherit python2-funcsigs) + (name "python2-funcsigs-bootstrap") + (native-inputs `()) + (arguments + `(#:tests? #f + ,@(package-arguments python2-funcsigs))))) + (define-public python-pafy (package (name "python-pafy") @@ -13134,7 +13153,7 @@ file system events on Linux.") "0i3ch700g5fyjp692gprlnzbysl8w0sa2vijbp3s40drvk67xkn9")))) (build-system python-build-system) (propagated-inputs - `(("python-six" ,python-six))) + `(("python-six" ,python-six-bootstrap))) (home-page "https://github.com/erikrose/more-itertools") (synopsis "More routines for operating on iterables, beyond itertools") (description "Python's built-in @code{itertools} module implements a -- 2.15.1