1
Fork 0
mirror of https://https.git.savannah.gnu.org/git/guix.git/ synced 2025-07-15 03:20:43 +02:00

Merge branch 'master' into core-updates

This commit is contained in:
Marius Bakke 2017-11-19 15:01:00 +01:00
commit 2dd12924cf
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
202 changed files with 24545 additions and 10664 deletions

View file

@ -27,7 +27,10 @@
#:use-module (gnu packages)
#:use-module (gnu packages base)
#:use-module (gnu packages databases)
#:use-module (gnu packages python))
#:use-module (gnu packages check)
#:use-module (gnu packages python)
#:use-module (gnu packages python-web)
#:use-module (gnu packages time))
(define-public python-django
(package
@ -151,7 +154,7 @@ with arguments to the field constructor.")
`(("python-django" ,python-django)
("python-setuptools-scm" ,python-setuptools-scm)))
(propagated-inputs
`(("python-pytest" ,python-pytest-3.0)))
`(("python-pytest" ,python-pytest)))
(home-page "http://pytest-django.readthedocs.org/")
(synopsis "Django plugin for py.test")
(description "Pytest-django is a plugin for py.test that provides a set of