[Python-modules-commits] [python-django-treebeard] 06/11: merge patched into master
Michael Fladischer
fladi at moszumanska.debian.org
Wed Jul 12 20:44:04 UTC 2017
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 a4fb9ffd0c036522442fc1be6e264a85d32683e6
Merge: a55fe8f 63f62d7
Author: Michael Fladischer <fladi at debian.org>
Date: Fri Jun 23 11:35:38 2017 +0200
merge patched into master
CHANGES | 14 ++
MANIFEST.in | 1 +
PKG-INFO | 21 +-
README.rst | 19 +-
debian/.git-dpm | 6 +-
...rsion-infromation-from-jquery-ui-filename.patch | 2 +-
...phinx-use-local-copies-of-objects.inv-fil.patch | 2 +-
...godocs-extension-from-sphinx-configuratio.patch | 2 +-
django_treebeard.egg-info/PKG-INFO | 21 +-
django_treebeard.egg-info/SOURCES.txt | 5 +
docs/README.md | 23 ++
docs/make.bat | 263 +++++++++++++++++++++
docs/source/_ext/djangodocs.py | 10 +
docs/source/_static/treebeard-admin-advanced.png | Bin 0 -> 116531 bytes
docs/source/_static/treebeard-admin-basic.png | Bin 0 -> 96077 bytes
docs/source/tutorial.rst | 12 +-
setup.cfg | 1 -
treebeard/__init__.py | 2 +-
treebeard/mp_tree.py | 99 +++++---
.../templates/admin/tree_change_list_results.html | 62 ++---
treebeard/templates/admin/tree_list_results.html | 1 -
treebeard/tests/settings.py | 13 +
22 files changed, 500 insertions(+), 79 deletions(-)
diff --cc debian/.git-dpm
index b93d401,0000000..fd59731
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
- 8fed25adac89a03083e07933d6b803d76e3b3245
- 8fed25adac89a03083e07933d6b803d76e3b3245
- bfd674a5ef5a3d303367da7a20850304a26e06ea
++63f62d765bd9ef7f48019b94b2915823ef16441d
++63f62d765bd9ef7f48019b94b2915823ef16441d
++fa17de54982188d431a9b41c73231cf5392aa235
+fa17de54982188d431a9b41c73231cf5392aa235
+python-django-treebeard_4.1.2+dfsg.orig.tar.gz
+c38d0f45b9cc94b94ce5d56a1af43c46cef2d351
+290056
diff --cc debian/patches/0001-Remove-version-infromation-from-jquery-ui-filename.patch
index d8a44dc,0000000..a8aff4b
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 e87c351cc909b5888694a4ab42d7533adead99ed Mon Sep 17 00:00:00 2001
++From f7adcb2b13298c66cdfcab581b306bda1eba4946 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 0817848..fbd6276 100644
+--- a/treebeard/tests/test_treebeard.py
++++ b/treebeard/tests/test_treebeard.py
+@@ -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-Make-intersphinx-use-local-copies-of-objects.inv-fil.patch
index 091a76a,0000000..9c9ec9b
mode 100644,000000..100644
--- a/debian/patches/0002-Make-intersphinx-use-local-copies-of-objects.inv-fil.patch
+++ b/debian/patches/0002-Make-intersphinx-use-local-copies-of-objects.inv-fil.patch
@@@ -1,42 -1,0 +1,42 @@@
- From d06055e0a28b5ae2381cbe368a7a4b3c8b6da0e0 Mon Sep 17 00:00:00 2001
++From d6623cb1913c12071f2965401297308f98f4f51c 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/source/conf.py | 25 +++++++++++++++++++++----
+ 1 file changed, 21 insertions(+), 4 deletions(-)
+
+diff --git a/docs/source/conf.py b/docs/source/conf.py
+index a999d36..6c3e0f3 100644
+--- a/docs/source/conf.py
++++ b/docs/source/conf.py
+@@ -297,7 +297,24 @@ texinfo_documents = [
+ # If true, do not generate a @detailmenu in the "Top" node's menu.
+ #texinfo_no_detailmenu = False
+
+-intersphinx_mapping = {
+- 'django': ('https://docs.djangoproject.com/en/stable/', 'https://docs.djangoproject.com/en/stable/_objects/'),
+- 'python': ('https://docs.python.org/3.5', None),
+-}
++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',
++ 'https://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/0003-Remove-djangodocs-extension-from-sphinx-configuratio.patch
index 91c756f,0000000..b67ca27
mode 100644,000000..100644
--- a/debian/patches/0003-Remove-djangodocs-extension-from-sphinx-configuratio.patch
+++ b/debian/patches/0003-Remove-djangodocs-extension-from-sphinx-configuratio.patch
@@@ -1,21 -1,0 +1,21 @@@
- From 8fed25adac89a03083e07933d6b803d76e3b3245 Mon Sep 17 00:00:00 2001
++From 63f62d765bd9ef7f48019b94b2915823ef16441d 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/source/conf.py | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/docs/source/conf.py b/docs/source/conf.py
+index 6c3e0f3..348d65b 100644
+--- a/docs/source/conf.py
++++ b/docs/source/conf.py
+@@ -36,7 +36,6 @@ django.setup()
+ # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
+ # ones.
+ 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