diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2016-11-01 15:32:06 +0000 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2016-11-01 14:02:01 -0400 |
| commit | bac3d6095d58b6b52b9fccc3cbc9fa8e748af67a (patch) | |
| tree | 458bf77d44a80a89b4b23f1d20f20e3ed554bde8 | |
| parent | b56d9ce304c16479e495bc2ef1b35f4280c867c1 (diff) | |
| download | guix-bac3d6095d58b6b52b9fccc3cbc9fa8e748af67a.tar.gz | |
gnu: python-django: Update to 1.10.3 [fixes CVE-2016-{9013,9014}].
* gnu/packages/django.scm (python-django, python2-django): Update to 1.10.3. [source]: Remove patch. * gnu/packages/patches/python-django-fix-testcase.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it.
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/django.scm | 5 | ||||
| -rw-r--r-- | gnu/packages/patches/python-django-fix-testcase.patch | 42 |
3 files changed, 2 insertions, 46 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 24013a52be..5fe6be5190 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -804,7 +804,6 @@ dist_patch_DATA = \ %D%/packages/patches/python-3-search-paths.patch \ %D%/packages/patches/python-dendropy-exclude-failing-tests.patch \ %D%/packages/patches/python-disable-ssl-test.patch \ - %D%/packages/patches/python-django-fix-testcase.patch \ %D%/packages/patches/python-fix-tests.patch \ %D%/packages/patches/python-ipython-inputhook-ctype.patch \ %D%/packages/patches/python-rarfile-fix-tests.patch \ diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm index 8d4a7e4753..e7bd7f4994 100644 --- a/gnu/packages/django.scm +++ b/gnu/packages/django.scm @@ -29,14 +29,13 @@ (define-public python-django (package (name "python-django") - (version "1.10") + (version "1.10.3") (source (origin (method url-fetch) (uri (pypi-uri "Django" version)) (sha256 (base32 - "01bh5yra6zyxcpqacahbwfbn0y4ivw07j2jsw3crvmjzivb6if26")) - (patches (search-patches "python-django-fix-testcase.patch")))) + "0c4c8zs7kzb0bdlpy4vlzv6va26dbazr32h91rldf6waxs6z14kg")))) (build-system python-build-system) (arguments '(#:phases diff --git a/gnu/packages/patches/python-django-fix-testcase.patch b/gnu/packages/patches/python-django-fix-testcase.patch deleted file mode 100644 index 4c1f9806d7..0000000000 --- a/gnu/packages/patches/python-django-fix-testcase.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 24123c31362b5f3783d84d133c160e9fe16805fe Mon Sep 17 00:00:00 2001 -From: Tim Graham <timograham@gmail.com> -Date: Mon, 1 Aug 2016 15:40:46 -0400 -Subject: [PATCH] Fixed admin_utils test failures due to translation updates. - -https://github.com/django/django/commit/24123c31362b5f3783d84d133c160e9fe16805fe - ---- - tests/admin_utils/test_logentry.py | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/tests/admin_utils/test_logentry.py b/tests/admin_utils/test_logentry.py -index 7798373..8259bf0 100644 ---- a/tests/admin_utils/test_logentry.py -+++ b/tests/admin_utils/test_logentry.py -@@ -59,7 +59,7 @@ class LogEntryTests(TestCase): - logentry = LogEntry.objects.filter(content_type__model__iexact='article').latest('id') - self.assertEqual(logentry.get_change_message(), 'Changed title and hist.') - with translation.override('fr'): -- self.assertEqual(logentry.get_change_message(), 'Modification de title et hist.') -+ self.assertEqual(logentry.get_change_message(), 'Title et hist modifié(s).') - - add_url = reverse('admin:admin_utils_article_add') - post_data['title'] = 'New' -@@ -117,11 +117,12 @@ class LogEntryTests(TestCase): - 'Changed domain. Added article "Article object". ' - 'Changed title for article "Article object". Deleted article "Article object".' - ) -+ - with translation.override('fr'): - self.assertEqual( - logentry.get_change_message(), -- 'Modification de domain. Article « Article object » ajouté. ' -- 'Modification de title pour l\'objet article « Article object ». Article « Article object » supprimé.' -+ "Domain modifié(s). Article « Article object » ajouté. " -+ "Title modifié(s) pour l'objet article « Article object ». Article « Article object » supprimé." - ) - - def test_logentry_get_edited_object(self): --- -2.7.4 - |