From 74eee9f27da6a9d76281de57c40a78a2495ce843 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sat, 23 Nov 2019 15:37:15 +0100
Subject: gnu: python-django-pipeline: Fix tests.
* gnu/packages/django.scm (python-django-pipeline)[arguments]:
Set PYTHONPATH before running tests.
---
gnu/packages/django.scm | 3 +++
1 file changed, 3 insertions(+)
(limited to 'gnu/packages/django.scm')
diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index a8e0277e95..7cd4c3f784 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -695,6 +695,9 @@ (define-public python-django-pipeline
(or
(not tests?)
(begin
+ (setenv "PYTHONPATH"
+ (string-append (getcwd) ":"
+ (getenv "PYTHONPATH")))
(setenv "DJANGO_SETTINGS_MODULE" "tests.settings")
(invoke "django-admin" "test" "tests"))))))))
(propagated-inputs
--
cgit v1.2.3
From 854d4d40fd9bbc41c23bee11f3f25aff95ea863f Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Tue, 26 Nov 2019 20:25:10 +0200
Subject: gnu: python-django-debug-toolbar: Don't use unstable tarball.
* gnu/packages/django.scm (python-django-debug-toolbar)[source]:
Download using git-fetch.
---
gnu/packages/django.scm | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
(limited to 'gnu/packages/django.scm')
diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 7cd4c3f784..c47ea44fd4 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com>
-;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2016, 2019 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017 ng0 <ng0@n0.is>
;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
@@ -348,14 +348,14 @@ (define-public python-django-debug-toolbar
(version "1.10.1")
(source
(origin
- (method url-fetch)
- (uri (string-append
- "https://github.com/jazzband/django-debug-toolbar/archive/"
- version ".tar.gz"))
- (file-name (string-append name "-" version ".tar.gz"))
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/jazzband/django-debug-toolbar.git")
+ (commit version)))
+ (file-name (git-file-name name version))
(sha256
(base32
- "1rww056hyzks8spbgf4h7kf6ybxlc5p08a2b6gn1nqrrzs4yx9sy"))))
+ "0zr6yjsms97wlvvd17rdbrx01irkg887dn9x70c1hzfjmfvp9afk"))))
(build-system python-build-system)
(propagated-inputs
`(("python-sqlparse" ,python-sqlparse)
--
cgit v1.2.3
From 9f00d13d5dc720dbbe1ec95c48a2c8a15c0b40c4 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Tue, 26 Nov 2019 20:27:24 +0200
Subject: gnu: python-django-jinja: Don't use unstable tarball.
* gnu/packages/django.scm (python-django-jinja)[source]: Download using
git-fetch.
---
gnu/packages/django.scm | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
(limited to 'gnu/packages/django.scm')
diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index c47ea44fd4..7e7bc5d002 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -456,14 +456,14 @@ (define-public python-django-jinja
(version "2.4.1")
(source
(origin
- (method url-fetch)
- (uri (string-append
- "https://github.com/niwinz/django-jinja/archive/"
- version ".tar.gz"))
- (file-name (string-append name "-" version ".tar.gz"))
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/niwinz/django-jinja.git")
+ (commit version)))
+ (file-name (git-file-name name version))
(sha256
(base32
- "0bzrb4m6wx9ph5cpvz7wpvg5k6ksvj0dnxlg0nhhqskhvp46brs1"))))
+ "1fcrxlznlq1xvl26y3j1r22vvy6m08r5l97xi2wj50rdmxhfvhis"))))
(build-system python-build-system)
(propagated-inputs
`(("python-django" ,python-django)
--
cgit v1.2.3