[Python-modules-commits] [python-django-treebeard] 07/12: merge patched into master
Michael Fladischer
fladi at moszumanska.debian.org
Thu May 5 13:11:25 UTC 2016
This is an automated email from the git hooks/post-receive script.
fladi pushed a commit to branch master
in repository python-django-treebeard.
commit f1780f06251100f86daf57d598558488efe10b69
Merge: 58c2206 19d9c33
Author: Michael Fladischer <fladi at debian.org>
Date: Thu May 5 12:39:30 2016 +0200
merge patched into master
CHANGES | 6 ++++++
PKG-INFO | 2 +-
debian/.git-dpm | 6 +++---
...move-version-infromation-from-jquery-ui-filename.patch | 6 +++---
...ialize-django-in-sphinx-configuration-to-prevent.patch | 4 ++--
...-intersphinx-use-local-copies-of-objects.inv-fil.patch | 4 ++--
...ve-djangodocs-extension-from-sphinx-configuratio.patch | 4 ++--
django_treebeard.egg-info/PKG-INFO | 2 +-
docs/admin.rst | 15 +++++++++++++++
docs/conf.py | 6 +++---
setup.py | 2 +-
treebeard/forms.py | 3 ++-
treebeard/tests/test_treebeard.py | 13 +++++++++++++
13 files changed, 54 insertions(+), 19 deletions(-)
diff --cc debian/.git-dpm
index 8fe2e3c,0000000..ca894b7
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
+# see git-dpm(1) from git-dpm package
- ac598b973bbd8033ad7e4f8275922c0528dc9931
- ac598b973bbd8033ad7e4f8275922c0528dc9931
- 02d1914271cd7f1807f85bfc1db0632cc5fe3133
++19d9c333399a35e0ee51654ea0f7da7144516bbf
++19d9c333399a35e0ee51654ea0f7da7144516bbf
++764fc8eb98e339e3e9582755ef459ea340088584
+764fc8eb98e339e3e9582755ef459ea340088584
+python-django-treebeard_4.0.1+dfsg.orig.tar.gz
+431f4828689d08f23471e8ab5bb6160fcd9cb003
+74349
diff --cc debian/patches/0001-Remove-version-infromation-from-jquery-ui-filename.patch
index 184b45b,0000000..bccfc3f
mode 100644,000000..100644
--- a/debian/patches/0001-Remove-version-infromation-from-jquery-ui-filename.patch
+++ b/debian/patches/0001-Remove-version-infromation-from-jquery-ui-filename.patch
@@@ -1,43 -1,0 +1,43 @@@
- From 802b81aecc7da82a4058bf2b78ae9b8e84b6947d Mon Sep 17 00:00:00 2001
++From 3a53969fe63274ca3032774d12a62ed348b25142 Mon Sep 17 00:00:00 2001
+From: Michael Fladischer <fladi at debian.org>
+Date: Wed, 30 Dec 2015 19:37:26 +0100
+Subject: Remove version infromation from jquery-ui filename
+
+ This package uses a symlink to the jquery-ui.min.js file provided by the
+ libjs-jquery-ui package. Removing the version information from the filename
+ makes it clearer that a system library is used and avoids confusion if the
+ version in the filename would diverge from the actual file version maintained
+ by the package.
+Last-Update: 2015-09-08
+Forwarded: not-needed
+---
+ treebeard/templatetags/admin_tree.py | 2 +-
+ treebeard/tests/test_treebeard.py | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/treebeard/templatetags/admin_tree.py b/treebeard/templatetags/admin_tree.py
+index 9794ac6..90cf6e2 100644
+--- a/treebeard/templatetags/admin_tree.py
++++ b/treebeard/templatetags/admin_tree.py
+@@ -285,7 +285,7 @@ def treebeard_js():
+ """
+ path = get_static_url()
+ js_file = urljoin(path, 'treebeard/treebeard-admin.js')
+- jquery_ui = urljoin(path, 'treebeard/jquery-ui-1.8.5.custom.min.js')
++ jquery_ui = urljoin(path, 'treebeard/jquery-ui.min.js')
+
+ # Jquery UI is needed to call disableSelection() on drag and drop so
+ # text selections arent marked while dragging a table row
+diff --git a/treebeard/tests/test_treebeard.py b/treebeard/tests/test_treebeard.py
- index 65c9bb5..335e5a2 100644
++index 0817848..fbd6276 100644
+--- a/treebeard/tests/test_treebeard.py
++++ b/treebeard/tests/test_treebeard.py
- @@ -2328,7 +2328,7 @@ class TestAdminTreeTemplateTags(TestCase):
++@@ -2341,7 +2341,7 @@ class TestAdminTreeTemplateTags(TestCase):
+ 'jQuery = $.noConflict(true);'
+ '})(django.jQuery);</script>'
+ '<script type="text/javascript" '
+- 'src="/treebeard/jquery-ui-1.8.5.custom.min.js"></script>')
++ 'src="/treebeard/jquery-ui.min.js"></script>')
+ assert expected == rendered
+
+ def test_get_static_url(self):
diff --cc debian/patches/0002-Initialize-django-in-sphinx-configuration-to-prevent.patch
index c6a3c9a,0000000..5f34ac7
mode 100644,000000..100644
--- a/debian/patches/0002-Initialize-django-in-sphinx-configuration-to-prevent.patch
+++ b/debian/patches/0002-Initialize-django-in-sphinx-configuration-to-prevent.patch
@@@ -1,24 -1,0 +1,24 @@@
- From d955fcf84c4cc7f1ecacd65eb3da8c8f4f6e9713 Mon Sep 17 00:00:00 2001
++From 376524653582e91be67285c4da2da50262b821ed Mon Sep 17 00:00:00 2001
+From: Michael Fladischer <fladi at debian.org>
+Date: Wed, 30 Dec 2015 20:36:42 +0100
+Subject: Initialize django in sphinx configuration to prevent
+ AppRegistryNotReady exception.
+
+---
+ docs/conf.py | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/docs/conf.py b/docs/conf.py
- index 689155d..a869995 100644
++index 8b7e369..a026163 100644
+--- a/docs/conf.py
++++ b/docs/conf.py
+@@ -23,6 +23,9 @@ for directory in ('_ext', '..'):
+
+ os.environ['DJANGO_SETTINGS_MODULE'] = 'treebeard.tests.settings'
+
++import django
++django.setup()
++
+ extensions = [
+ 'djangodocs',
+ 'sphinx.ext.autodoc',
diff --cc debian/patches/0003-Make-intersphinx-use-local-copies-of-objects.inv-fil.patch
index c74a695,0000000..359bd46
mode 100644,000000..100644
--- a/debian/patches/0003-Make-intersphinx-use-local-copies-of-objects.inv-fil.patch
+++ b/debian/patches/0003-Make-intersphinx-use-local-copies-of-objects.inv-fil.patch
@@@ -1,46 -1,0 +1,46 @@@
- From 25be55710dc9aac26bbeecff4a898fa00fdf1647 Mon Sep 17 00:00:00 2001
++From 778357c3a82728f65cf16e642e4ee19ab2e4d180 Mon Sep 17 00:00:00 2001
+From: Michael Fladischer <fladi at debian.org>
+Date: Wed, 30 Dec 2015 20:43:47 +0100
+Subject: Make intersphinx use local copies of objects.inv files.
+
+---
+ docs/conf.py | 29 ++++++++++++++++++++++-------
+ 1 file changed, 22 insertions(+), 7 deletions(-)
+
+diff --git a/docs/conf.py b/docs/conf.py
- index a869995..4bed276 100644
++index a026163..3a516d0 100644
+--- a/docs/conf.py
++++ b/docs/conf.py
+@@ -53,10 +53,25 @@ latex_documents = [(
+ 'django-treebeard Documentation',
+ 'Gustavo Picon',
+ 'manual')]
+-intersphinx_mapping = {
+- 'python': ('http://docs.python.org/3', None),
+- 'django': (
+- 'https://docs.djangoproject.com/en/1.7/',
+- 'https://docs.djangoproject.com/en/1.7/_objects/'
+- ),
+-}
++
++
++def check_object_path(key, url, path):
++ if os.path.isfile(path):
++ return {key: (url, path)}
++ return {}
++
++intersphinx_mapping = {}
++intersphinx_mapping.update(
++ check_object_path(
++ 'python',
++ 'http://docs.python.org/',
++ '/usr/share/doc/python' + '.'.join([str(x) for x in sys.version_info[0:2]]) + '/html/objects.inv'
++ )
++)
++intersphinx_mapping.update(
++ check_object_path(
++ 'django',
++ 'https://docs.djangoproject.com/en/' + django.get_version() + '/',
++ '/usr/share/doc/python-django-doc/html/objects.inv'
++ )
++)
diff --cc debian/patches/0004-Remove-djangodocs-extension-from-sphinx-configuratio.patch
index 3c9c49c,0000000..69fae85
mode 100644,000000..100644
--- a/debian/patches/0004-Remove-djangodocs-extension-from-sphinx-configuratio.patch
+++ b/debian/patches/0004-Remove-djangodocs-extension-from-sphinx-configuratio.patch
@@@ -1,21 -1,0 +1,21 @@@
- From ac598b973bbd8033ad7e4f8275922c0528dc9931 Mon Sep 17 00:00:00 2001
++From 19d9c333399a35e0ee51654ea0f7da7144516bbf Mon Sep 17 00:00:00 2001
+From: Michael Fladischer <fladi at debian.org>
+Date: Wed, 30 Dec 2015 20:54:45 +0100
+Subject: Remove djangodocs extension from sphinx configuration.
+
+---
+ docs/conf.py | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/docs/conf.py b/docs/conf.py
- index 4bed276..35aea9b 100644
++index 3a516d0..fa49b7d 100644
+--- a/docs/conf.py
++++ b/docs/conf.py
+@@ -27,7 +27,6 @@ import django
+ django.setup()
+
+ extensions = [
+- 'djangodocs',
+ 'sphinx.ext.autodoc',
+ 'sphinx.ext.coverage',
+ 'sphinx.ext.graphviz',
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-django-treebeard.git
More information about the Python-modules-commits
mailing list