aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeo Famulari <leo@famulari.name>2017-03-28 15:40:37 -0400
committerLeo Famulari <leo@famulari.name>2017-03-28 15:59:22 -0400
commit23b9168dcdb0bdd47f74a81dc9653e1e05142a14 (patch)
tree84f868b97e94113adbdadc881327d3fbba3c1ccf
parenteec21d4be7f200d227d8ed9dfb2168bdff2d43d2 (diff)
downloadguix-23b9168dcdb0bdd47f74a81dc9653e1e05142a14.tar
guix-23b9168dcdb0bdd47f74a81dc9653e1e05142a14.tar.gz
gnu: python-pytest-2.9.2: Replace with python-pytest-3.0.
* gnu/packages/python.scm (python-pytest-2.9.2): Replace with ... (python-pytest-3.0): ... new variable. (python2-pytest-3.0): New variable. (python-cryptography, python2-cryptography, python-sphinx-1.5.3)[native-inputs]: Replace python-pytest-2.9.2 with python-pytest-3.0. * gnu/packages/backup.scm (borg)[native-inputs]: Likewise. gnu/packages/calendar.scm (khal)[native-inputs]: Likewise.
-rw-r--r--gnu/packages/backup.scm2
-rw-r--r--gnu/packages/calendar.scm2
-rw-r--r--gnu/packages/python.scm40
3 files changed, 19 insertions, 25 deletions
diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm
index 7e9ae18f30..8e1f195158 100644
--- a/gnu/packages/backup.scm
+++ b/gnu/packages/backup.scm
@@ -529,7 +529,7 @@ detection, and lossless compression.")
("python-setuptools-scm" ,python-setuptools-scm)
;; Borg 1.0.8's test suite uses 'tmpdir_factory', which was introduced in
;; pytest 2.8.
- ("python-pytest" ,python-pytest-2.9.2)
+ ("python-pytest" ,python-pytest-3.0)
;; For generating the documentation.
("python-sphinx" ,python-sphinx)
("python-sphinx-rtd-theme" ,python-sphinx-rtd-theme)))
diff --git a/gnu/packages/calendar.scm b/gnu/packages/calendar.scm
index 1e9a93ca93..977111bfe1 100644
--- a/gnu/packages/calendar.scm
+++ b/gnu/packages/calendar.scm
@@ -113,7 +113,7 @@ data units.")
(zero? (system* "py.test" "tests")))))))
(native-inputs
;; XXX Uses tmpdir_factory, introduced in pytest 2.8.
- `(("python-pytest" ,python-pytest-2.9.2)
+ `(("python-pytest" ,python-pytest-3.0)
("python-pytest-cov" ,python-pytest-cov)
("python-setuptools-scm" ,python-setuptools-scm)
;; Required for tests
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index ec80cf13ca..f989338683 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -1818,19 +1818,18 @@ and many external plugins.")
(define-public python2-pytest
(package-with-python2 python-pytest))
-;; This package is used by Borg until we can upgrade all our Python packages to
-;; use a more recent pytest.
-(define-public python-pytest-2.9.2
+;; Some packages require a newer pytest.
+(define-public python-pytest-3.0
(package
(inherit python-pytest)
(name "python-pytest")
- (version "2.9.2")
+ (version "3.0.7")
(source (origin
(method url-fetch)
(uri (pypi-uri "pytest" version))
(sha256
(base32
- "1n6igbc1b138wx1q5gca4pqw1j6nsyicfxds5n0b5989kaxqmh8j"))))
+ "1asc4b2nd2a4f0g3r12y97rslq5wliji7b73wwkvdrm5s7mrc1mp"))))
(arguments
`(#:phases
(modify-phases %standard-phases
@@ -1841,25 +1840,20 @@ and many external plugins.")
(string-append "@pytest.mark.skip"
"(reason=\"Assumes that /usr exists.\")\n "
line)))
- #t)))))))
-
-;; This package is used by Sphinx version 1.5.2 and up
-(define-public python-pytest-3.0.7
- (package
- (inherit python-pytest-2.9.2)
- (name "python-pytest")
- (version "3.0.7")
- (source
- (origin
- (method url-fetch)
- (uri (pypi-uri "pytest" version))
- (sha256
- (base32
- "1asc4b2nd2a4f0g3r12y97rslq5wliji7b73wwkvdrm5s7mrc1mp"))))
+ #t)))))
(native-inputs
`(("python-nose" ,python-nose)
("python-mock" ,python-mock)
- ("python-hypothesis" ,python-hypothesis)))))
+ ("python-hypothesis" ,python-hypothesis)))
+ (properties `((python2-variant . ,(delay python2-pytest-3.0))))))
+
+(define-public python2-pytest-3.0
+ (let ((base (package-with-python2
+ (strip-python2-variant python-pytest-3.0))))
+ (package (inherit base)
+ (native-inputs
+ `(("python2-enum34" ,python2-enum34)
+ ,@(package-native-inputs base))))))
(define-public python-pytest-cov
(package
@@ -3115,7 +3109,7 @@ sources.")
(base32
"0kw1axswbvaavr8ggyf4qr6hnisnrzlbkkcdada69vk1x9xjassg"))))
(native-inputs
- `(("python-pytest" ,python-pytest-3.0.7)
+ `(("python-pytest" ,python-pytest-3.0)
,@(package-native-inputs python-sphinx)))))
(define-public python2-sphinx
@@ -7315,7 +7309,7 @@ responses, rather than doing any computation.")
("python-pyasn1" ,python-pyasn1)
("python-pyasn1-modules" ,python-pyasn1-modules)
("python-pytz" ,python-pytz)
- ("python-pytest" ,python-pytest-2.9.2)))
+ ("python-pytest" ,python-pytest-3.0)))
(home-page "https://github.com/pyca/cryptography")
(synopsis "Cryptographic recipes and primitives for Python")
(description