* [PATCH] gnu: python-django: Update to 1.10.3 [fixes CVE-2016-{9013, 9014}].
@ 2016-11-01 15:32 Marius Bakke
2016-11-01 16:58 ` Leo Famulari
0 siblings, 1 reply; 4+ messages in thread
From: Marius Bakke @ 2016-11-01 15:32 UTC (permalink / raw
To: guix-devel; +Cc: Marius Bakke
* gnu/packages/django.scm (python-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.
---
gnu/local.mk | 1 -
gnu/packages/django.scm | 5 ++-
.../patches/python-django-fix-testcase.patch | 42 ----------------------
3 files changed, 2 insertions(+), 46 deletions(-)
delete mode 100644 gnu/packages/patches/python-django-fix-testcase.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index 24013a5..5fe6be5 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 8d4a7e4..e7bd7f4 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 4c1f980..0000000
--- 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
-
--
2.10.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] gnu: python-django: Update to 1.10.3 [fixes CVE-2016-{9013, 9014}].
2016-11-01 15:32 [PATCH] gnu: python-django: Update to 1.10.3 [fixes CVE-2016-{9013, 9014}] Marius Bakke
@ 2016-11-01 16:58 ` Leo Famulari
2016-11-01 18:02 ` Leo Famulari
0 siblings, 1 reply; 4+ messages in thread
From: Leo Famulari @ 2016-11-01 16:58 UTC (permalink / raw
To: Marius Bakke; +Cc: guix-devel
On Tue, Nov 01, 2016 at 03:32:06PM +0000, Marius Bakke wrote:
> * gnu/packages/django.scm (python-django): Update to 1.10.3.
Please also mention the update to python2-django here. Otherwise, looks
good. Please push!
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] gnu: python-django: Update to 1.10.3 [fixes CVE-2016-{9013, 9014}].
2016-11-01 16:58 ` Leo Famulari
@ 2016-11-01 18:02 ` Leo Famulari
2016-11-01 19:01 ` Marius Bakke
0 siblings, 1 reply; 4+ messages in thread
From: Leo Famulari @ 2016-11-01 18:02 UTC (permalink / raw
To: Marius Bakke; +Cc: guix-devel
On Tue, Nov 01, 2016 at 12:58:49PM -0400, Leo Famulari wrote:
> On Tue, Nov 01, 2016 at 03:32:06PM +0000, Marius Bakke wrote:
> > * gnu/packages/django.scm (python-django): Update to 1.10.3.
>
> Please also mention the update to python2-django here. Otherwise, looks
> good. Please push!
Someone pointed out the new release on #guix, so I made that change and
committed the patch myself. Thanks again!
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] gnu: python-django: Update to 1.10.3 [fixes CVE-2016-{9013, 9014}].
2016-11-01 18:02 ` Leo Famulari
@ 2016-11-01 19:01 ` Marius Bakke
0 siblings, 0 replies; 4+ messages in thread
From: Marius Bakke @ 2016-11-01 19:01 UTC (permalink / raw
To: Leo Famulari; +Cc: guix-devel
[-- Attachment #1: Type: text/plain, Size: 547 bytes --]
Leo Famulari <leo@famulari.name> writes:
> On Tue, Nov 01, 2016 at 12:58:49PM -0400, Leo Famulari wrote:
>> On Tue, Nov 01, 2016 at 03:32:06PM +0000, Marius Bakke wrote:
>> > * gnu/packages/django.scm (python-django): Update to 1.10.3.
>>
>> Please also mention the update to python2-django here. Otherwise, looks
>> good. Please push!
>
> Someone pointed out the new release on #guix, so I made that change and
> committed the patch myself. Thanks again!
Thanks for covering! I need to get back in the IRC game one of these days.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 454 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-11-01 19:01 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-11-01 15:32 [PATCH] gnu: python-django: Update to 1.10.3 [fixes CVE-2016-{9013, 9014}] Marius Bakke
2016-11-01 16:58 ` Leo Famulari
2016-11-01 18:02 ` Leo Famulari
2016-11-01 19:01 ` Marius Bakke
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.