[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#30982] [PATCH 7/8] gnu: python-pytest: Update to 3.5.0.
From: |
Arun Isaac |
Subject: |
[bug#30982] [PATCH 7/8] gnu: python-pytest: Update to 3.5.0. |
Date: |
Thu, 29 Mar 2018 12:58:15 +0530 |
* 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
- [bug#30982] [PATCH 0/8] Update python-pycairo and dependencies, Arun Isaac, 2018/03/29
- [bug#30982] [PATCH 1/8] gnu: python-attrs: Update to 17.4.0., Arun Isaac, 2018/03/29
- [bug#30982] [PATCH 2/8] gnu: python-pyasn1: Update to 0.4.2., Arun Isaac, 2018/03/29
- [bug#30982] [PATCH 3/8] gnu: python-pluggy: Update to 0.6.0., Arun Isaac, 2018/03/29
- [bug#30982] [PATCH 4/8] gnu: Add python-more-itertools., Arun Isaac, 2018/03/29
- [bug#30982] [PATCH 6/8] gnu: python-py: Update to 1.5.3., Arun Isaac, 2018/03/29
- [bug#30982] [PATCH 8/8] gnu: python-pycairo: Update to 1.16.3., Arun Isaac, 2018/03/29
- [bug#30982] [PATCH 7/8] gnu: python-pytest: Update to 3.5.0.,
Arun Isaac <=
- [bug#30982] [PATCH 5/8] gnu: python-hypothesis: Update to 3.52.0., Arun Isaac, 2018/03/29
- [bug#30982] [PATCH 0/8] Update python-pycairo and dependencies, Ludovic Courtès, 2018/03/30