TakeV/guix
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

gnu: python-pytest-2.9.2: Replace with python-pytest-3.0.

Browse source 
* 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.
This commit is contained in:
Leo Famulari 2017-03-28 15:40:37 -04:00
parent eec21d4be7
commit 23b9168dcd
No known key found for this signature in database
GPG key ID: 2646FA30BACA7F08
3 changed files with 19 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gnu/packages/backup.scm
View file

@ -529,7 +529,7 @@ (define-public borg
("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)))

2
gnu/packages/calendar.scm
View file

@ -113,7 +113,7 @@ (define-public khal
(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

40
gnu/packages/python.scm
View file

@ -1818,19 +1818,18 @@ (define-public python-pytest
(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 @@ (define-public python-pytest-2.9.2
(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 @@ (define-public python-sphinx-1.5.3
(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 @@ (define-public python-cryptography
("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