diff options
author | Ludovic Courtès <ludo@gnu.org> | 2021-09-07 11:04:44 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2021-09-07 14:19:08 +0200 |
commit | d9dfbf886ddbb92dfdaa118bb9765e78aad5c53a (patch) | |
tree | 2732020de20a38c09b66a60b0cb36022799f7c2e /gnu/packages/django.scm | |
parent | b949f34f31a045eb0fb242b81a223178fb6994d3 (diff) | |
parent | 49922efb11da0f0e9d4f5979d081de5ea8c99d25 (diff) | |
download | guix-d9dfbf886ddbb92dfdaa118bb9765e78aad5c53a.tar.gz |
Merge branch 'master' into core-updates-frozen
Diffstat (limited to 'gnu/packages/django.scm')
-rw-r--r-- | gnu/packages/django.scm | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm index 3c4ea5efeb..aa1fbddc3d 100644 --- a/gnu/packages/django.scm +++ b/gnu/packages/django.scm @@ -48,13 +48,13 @@ (define-public python-django (package (name "python-django") - (version "3.2.5") + (version "3.2.6") (source (origin (method url-fetch) (uri (pypi-uri "Django" version)) (sha256 (base32 - "1kam3301jl53vm0mhflwwsqy5d7kb5dksmjanlaj7v7xakm5z81x")))) + "08p0gf1n548fjba76wspcj1jb3li6lr7xi87w2xq7hylr528azzj")))) (build-system python-build-system) (arguments '(#:phases @@ -307,16 +307,19 @@ size and quality.") (define-public python-pytest-django (package (name "python-pytest-django") - (version "3.10.0") + (version "4.4.0") (source (origin (method url-fetch) (uri (pypi-uri "pytest-django" version)) (sha256 (base32 - "19nvqsb7b9kz3ikpb50m8ppf7mfhzrapdxsqd5hhd1pdfz8dprjd")))) + "0mglnz0w6k7dgw1jn6giv56pmdjd6a3zwwkhxb2kyzmzk0viw5xm")))) (build-system python-build-system) (arguments - `(#:phases + ;; The test suite is disabled because there are many test failures (see: + ;; https://github.com/pytest-dev/pytest-django/issues/943). + `(#:tests? #f + #:phases (modify-phases %standard-phases (replace 'check (lambda* (#:key tests? inputs outputs #:allow-other-keys) @@ -336,9 +339,8 @@ size and quality.") (native-inputs `(("python-django" ,python-django) ("python-setuptools-scm" ,python-setuptools-scm) - ;; For tests. - ("python-pytest-xdist" ,python-pytest-xdist))) + ("python-pytest-xdist" ,python-pytest-xdist-next))) (propagated-inputs `(("python-pytest" ,python-pytest))) (home-page "https://pytest-django.readthedocs.org/") |