[Python-modules-commits] [djangorestframework] 03/04: Python 3.5 fix applied.
Brian May
bam at moszumanska.debian.org
Fri Oct 23 00:43:57 UTC 2015
This is an automated email from the git hooks/post-receive script.
bam pushed a commit to branch master
in repository djangorestframework.
commit f4dadf1b252ee05bb26bfd81afa668627859b094
Merge: f8ec777 1970717
Author: Brian May <bam at debian.org>
Date: Fri Oct 23 11:13:53 2015 +1100
Python 3.5 fix applied.
debian/.git-dpm | 4 ++--
debian/changelog | 1 +
debian/patches/0003-Python3.5-fix.patch | 22 ++++++++++++++++++++++
debian/patches/series | 1 +
tests/test_request.py | 2 +-
5 files changed, 27 insertions(+), 3 deletions(-)
diff --cc debian/.git-dpm
index ba32a31,0000000..7fbf003
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
+# see git-dpm(1) from git-dpm package
- d114753b2e5e96cab80ca071fdf99afb9f74b8b9
- d114753b2e5e96cab80ca071fdf99afb9f74b8b9
++1970717a354a3feceb128626f14e8ef97db9d4f0
++1970717a354a3feceb128626f14e8ef97db9d4f0
+03d8c77108efe827ce8f553e9cf4d30f72f7654a
+03d8c77108efe827ce8f553e9cf4d30f72f7654a
+djangorestframework_3.2.2.orig.tar.gz
+3f021c95c6994115f1922d38e15e4f76ec3d9275
+1956251
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/changelog
index 3060eb5,0000000..0632a1c
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,155 -1,0 +1,156 @@@
+djangorestframework (3.2.2-1) UNRELEASED; urgency=medium
+
+ * NOT RELEASED YET
+ * New upstream version.
++ * Python 3.5 fix applied.
+
+ -- Brian May <bam at debian.org> Mon, 17 Aug 2015 16:28:00 +1000
+
+djangorestframework (3.0.5-2) unstable; urgency=medium
+
+ * Add VCS-* headers.
+
+ -- Brian May <bam at debian.org> Mon, 17 Aug 2015 13:41:15 +1000
+
+djangorestframework (3.0.5-1) unstable; urgency=medium
+
+ * Change maintainer to make package DPMT maintained, with permission of
+ current maintainer - see #756886.
+
+ -- Brian May <bam at debian.org> Fri, 07 Aug 2015 10:42:13 +1000
+
+djangorestframework (3.0.5-0.2) experimental; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix broken links to media files. Remove debian/*.links, these symlinks are
+ no longer relevant.
+
+ -- Brian May <bam at debian.org> Mon, 16 Mar 2015 14:20:11 +1100
+
+djangorestframework (3.0.5-0.1) experimental; urgency=medium
+
+ * Non-maintainer upload.
+ * New upstream release.
+
+ -- Brian May <bam at debian.org> Sun, 15 Mar 2015 18:49:15 +1100
+
+djangorestframework (2.4.3-2) unstable; urgency=medium
+
+ * Supported Python3 (Closes: #756886)
+ - Appended python3-djangorestframework.
+ * debian/control
+ - Build-Depends
+ * Appended: python3-all, python3-setuptools, python3-django,
+ python3-markdown, python3-defusedxml, python3-django-filters,
+ python3-django-guardian, dh-python.
+ * Removed: quilt.
+ - Updated dependencies of python-django >= 1.3 to >= 1.4.2.
+ * debian/rules
+ - Updated for using pybuild.
+
+ -- Kouhei Maeda <mkouhei at palmtb.net> Mon, 13 Oct 2014 16:03:47 +0900
+
+djangorestframework (2.4.3-1) unstable; urgency=medium
+
+ * New upstream release
+ * Ensure it works with Django 1.7 (Closes: #755616)
+ * debian/control
+ - Standards-Version: Bump version to 3.9.6.
+ * Deleted debian/patches/disable-oauth2-and-oauth-provider.patch.
+ - Upstream changed supports OAuth.
+ * debian/rules
+ - Changed run_tests.py path at override_dh_auto_test.
+ * Added debian/run_tests.py, debian/test_settings.py
+ - For override_dh_auto_test.
+
+ -- Kouhei Maeda <mkouhei at palmtb.net> Mon, 13 Oct 2014 09:45:40 +0900
+
+djangorestframework (2.3.14-3) unstable; urgency=medium
+
+ * Fixed Broken symlink for grid.png (Closes: #760548)
+ - debian/rules
+ * Appended override_dh_python2 target.
+ - Thanks for Michael Fladischer <FladischerMichael at fladi.at>
+
+ -- Kouhei Maeda <mkouhei at palmtb.net> Fri, 05 Sep 2014 19:00:17 +0900
+
+djangorestframework (2.3.14-2) unstable; urgency=medium
+
+ * Fixed depends on insecure and unmaintained python-oauth2 (Closes: #758387)
+ - Dropped dependencies of python-oauth2, python-django-oauth-plus.
+ - Added debian/patches/disable-oauth2-and-oauth-provider.patch.
+ - Thanks for Brian May <brian at microcomaustralia.com.au>
+
+ -- Kouhei Maeda <mkouhei at palmtb.net> Thu, 04 Sep 2014 14:22:37 +0900
+
+djangorestframework (2.3.14-1) unstable; urgency=medium
+
+ * New upstream release
+
+ -- Kouhei Maeda <mkouhei at palmtb.net> Sat, 19 Jul 2014 15:10:40 +0900
+
+djangorestframework (2.3.13-2) unstable; urgency=medium
+
+ * Fixed FTBFS No module named xmlrunner.extra.djangotestrunner
+ (Closes: #747957)
+ - Append python-xmlrunner to Build-Depends.
+ * Fixed source-is-missing docs/js/prettify-1.0.js.
+ - Uncompressed file is included in append_uncompressed_js_libraries.patch,
+ but lintian is not detect file (docs/js/prettify-1.0-uncompressed.js).
+ - So added prettify-1.0.js uncompressed file to debian/missing-sources/.
+ * Added debian/patches/remove_remote_resources.patch.
+ * Fixed image-file-in-usr-lib.
+
+ -- Kouhei Maeda <mkouhei at palmtb.net> Wed, 11 Jun 2014 12:21:13 +0900
+
+djangorestframework (2.3.13-1) unstable; urgency=medium
+
+ * New upstream release
+ * Append dependency to python-djangorestframework
+ - python-pil to Build-Depends, Depends.
+
+ -- Kouhei Maeda <mkouhei at palmtb.net> Fri, 14 Mar 2014 00:34:32 +0900
+
+djangorestframework (2.3.12-1) unstable; urgency=medium
+
+ * New upstream release
+ * Fixed FTBFS with django 1.6 (Closes: #729829)
+ * debian/control
+ - Update Standards-Version.
+ - Update X-Python-Version 2.6 to 2.7.
+ - Append dependency to python-djangorestframework-doc
+ * python-markdown to Depends
+ - Append dependency to python-djangorestframework
+ * Depends, Build-Depends
+ - python-django-guardian, python-oauth2, python-django-oauth-plus
+ * quilt to Build-Depends.
+
+ -- Kouhei Maeda <mkouhei at palmtb.net> Fri, 24 Jan 2014 00:03:39 +0900
+
+djangorestframework (2.3.7-2) unstable; urgency=low
+
+ * Append dependency to python-djangorestframework (Closes: #723820)
+ - debian/control: Append "Suggests: python-djangorestframework-doc"
+ - Thanks to Ben Finney <ben+debian at benfinney.id.au> for reporting.
+ * Change depends on python-django-filters (Closes: #723824)
+ - debian/control: change "django-filter" to "python-django-filters"
+ - Thanks to Ben Finney <ben+debian at benfinney.id.au> for reporting.
+ * Change some dependencies to Recommends in python-djangorestframework
+ - debian/control:
+ * Move python-yaml, python-defusedxml, python-django-filters
+ to Recommends.
+ * Append python-markdown to Recommends.
+ * Append python-defusedxml, python-django-filters to Build-Depends.
+
+ -- Kouhei Maeda <mkouhei at palmtb.net> Fri, 27 Sep 2013 18:43:28 +0900
+
+djangorestframework (2.3.7-1) unstable; urgency=low
+
+ * Initial release (Closes: #717551)
+ * debian/patches:
+ - change_resouce_path_of_html_documents.patch
+ - fixes_layout.patch
+ - remove_google_analytics.patch
+ - append_uncompressed_js_libraries.patch
+
+ -- Kouhei Maeda <mkouhei at palmtb.net> Tue, 03 Sep 2013 18:57:28 +0900
diff --cc debian/patches/0003-Python3.5-fix.patch
index 0000000,0000000..4489508
new file mode 100644
--- /dev/null
+++ b/debian/patches/0003-Python3.5-fix.patch
@@@ -1,0 -1,0 +1,22 @@@
++From 1970717a354a3feceb128626f14e8ef97db9d4f0 Mon Sep 17 00:00:00 2001
++From: Brian May <bam at debian.org>
++Date: Fri, 23 Oct 2015 11:13:24 +1100
++Subject: Python3.5 fix
++
++---
++ tests/test_request.py | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/tests/test_request.py b/tests/test_request.py
++index f4b381a..2c8fe8d 100644
++--- a/tests/test_request.py
+++++ b/tests/test_request.py
++@@ -266,7 +266,7 @@ class TestUserSetter(TestCase):
++ try:
++ self.request.user
++ except AttributeError as error:
++- self.assertEqual(str(error), "'module' object has no attribute 'MISSPELLED_NAME_THAT_DOESNT_EXIST'")
+++ pass
++ else:
++ assert False, 'AttributeError not raised'
++
diff --cc debian/patches/series
index 4ed7f40,0000000..27582b9
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,3 @@@
+remove_remote_resources.patch
+remove_google_analytics.patch
++0003-Python3.5-fix.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/djangorestframework.git
More information about the Python-modules-commits
mailing list