[Python-modules-commits] [python-django-treebeard] 06/11: merge patched into master
Michael Fladischer
fladi at moszumanska.debian.org
Tue Nov 29 09:31:37 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 c3821cdd5a5614c992c76a9a3c4cc94941089e6d
Merge: 2bd15ce 8fed25a
Author: Michael Fladischer <fladi at debian.org>
Date: Mon Nov 28 13:27:09 2016 +0100
merge patched into master
CHANGES | 10 +
MANIFEST.in | 6 +-
PKG-INFO | 31 +-
README.rst | 25 +-
debian/.git-dpm | 6 +-
...rsion-infromation-from-jquery-ui-filename.patch | 2 +-
...django-in-sphinx-configuration-to-prevent.patch | 24 --
...hinx-use-local-copies-of-objects.inv-fil.patch} | 34 +--
...godocs-extension-from-sphinx-configuratio.patch | 21 ++
...godocs-extension-from-sphinx-configuratio.patch | 21 --
...05-Add-basic-settings.TEMPLATES-for-tests.patch | 41 ---
...est-context-processor-in-settings.TEMPLAT.patch | 56 ----
...Do-not-load-templatetag-cycle-from-future.patch | 21 --
...-compat.-Error-on-MoveNodeForm-render.-Pa.patch | 32 ---
...lace-django.conf.urls.patterns-with-lists.patch | 64 -----
debian/patches/series | 10 +-
django_treebeard.egg-info/PKG-INFO | 31 +-
django_treebeard.egg-info/SOURCES.txt | 43 ++-
docs/Makefile | 136 +++++++--
docs/changes.rst | 4 -
docs/conf.py | 76 -----
docs/{ => source}/admin.rst | 0
docs/{ => source}/al_tree.rst | 0
docs/{ => source}/api.rst | 0
docs/{ => source}/caveats.rst | 0
docs/source/changes.rst | 4 +
docs/source/conf.py | 319 +++++++++++++++++++++
docs/{ => source}/exceptions.rst | 0
docs/{ => source}/forms.rst | 0
docs/{ => source}/index.rst | 0
docs/{ => source}/install.rst | 0
docs/{ => source}/mp_tree.rst | 0
docs/{ => source}/ns_tree.rst | 0
docs/{ => source}/tests.rst | 9 +-
docs/{ => source}/tutorial.rst | 0
setup.py | 40 +--
treebeard/__init__.py | 21 +-
treebeard/admin.py | 6 +-
treebeard/locale/es/LC_MESSAGES/django.mo | Bin 0 -> 732 bytes
treebeard/locale/es/LC_MESSAGES/django.po | 78 +++++
treebeard/locale/es/LC_MESSAGES/djangojs.mo | Bin 0 -> 374 bytes
treebeard/locale/es/LC_MESSAGES/djangojs.po | 24 ++
treebeard/locale/nl/LC_MESSAGES/django.mo | Bin 0 -> 1512 bytes
treebeard/locale/nl/LC_MESSAGES/django.po | 80 ++++++
treebeard/locale/nl/LC_MESSAGES/djangojs.mo | Bin 0 -> 532 bytes
treebeard/locale/nl/LC_MESSAGES/djangojs.po | 24 ++
treebeard/locale/pl/LC_MESSAGES/django.mo | Bin 0 -> 783 bytes
treebeard/locale/pl/LC_MESSAGES/django.po | 44 +++
treebeard/locale/ru/LC_MESSAGES/django.mo | Bin 0 -> 874 bytes
treebeard/locale/ru/LC_MESSAGES/django.po | 79 +++++
treebeard/locale/ru/LC_MESSAGES/djangojs.mo | Bin 0 -> 445 bytes
treebeard/locale/ru/LC_MESSAGES/djangojs.po | 25 ++
treebeard/mp_tree.py | 15 +-
treebeard/tests/conftest.py | 60 +---
treebeard/tests/settings.py | 92 +++---
55 files changed, 1041 insertions(+), 573 deletions(-)
diff --cc debian/.git-dpm
index 6a25c60,0000000..99a61d5
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
- 534fffd9f8425027cdb2730880af75ce0a7efc41
- 534fffd9f8425027cdb2730880af75ce0a7efc41
- 764fc8eb98e339e3e9582755ef459ea340088584
++8fed25adac89a03083e07933d6b803d76e3b3245
++8fed25adac89a03083e07933d6b803d76e3b3245
++bfd674a5ef5a3d303367da7a20850304a26e06ea
+bfd674a5ef5a3d303367da7a20850304a26e06ea
+python-django-treebeard_4.1.0+dfsg.orig.tar.gz
+e4fe53bab36ee2bf20864d990af5824261520b4d
+82395
diff --cc debian/patches/0001-Remove-version-infromation-from-jquery-ui-filename.patch
index bccfc3f,0000000..d8a44dc
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 3a53969fe63274ca3032774d12a62ed348b25142 Mon Sep 17 00:00:00 2001
++From e87c351cc909b5888694a4ab42d7533adead99ed 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 359bd46,0000000..091a76a
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,46 -1,0 +1,42 @@@
- From 778357c3a82728f65cf16e642e4ee19ab2e4d180 Mon Sep 17 00:00:00 2001
++From d06055e0a28b5ae2381cbe368a7a4b3c8b6da0e0 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(-)
++ docs/source/conf.py | 25 +++++++++++++++++++++----
++ 1 file changed, 21 insertions(+), 4 deletions(-)
+
- diff --git a/docs/conf.py b/docs/conf.py
- index a026163..3a516d0 100644
- --- a/docs/conf.py
- +++ b/docs/conf.py
- @@ -53,10 +53,25 @@ latex_documents = [(
- 'django-treebeard Documentation',
- 'Gustavo Picon',
- 'manual')]
++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 = {
- - 'python': ('http://docs.python.org/3', None),
- - 'django': (
- - 'https://docs.djangoproject.com/en/1.7/',
- - 'https://docs.djangoproject.com/en/1.7/_objects/'
- - ),
++- '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',
- + 'http://docs.python.org/',
+++ '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 0000000,0000000..91c756f
new file mode 100644
--- /dev/null
+++ b/debian/patches/0003-Remove-djangodocs-extension-from-sphinx-configuratio.patch
@@@ -1,0 -1,0 +1,21 @@@
++From 8fed25adac89a03083e07933d6b803d76e3b3245 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',
diff --cc debian/patches/series
index a93259c,0000000..5a4d355
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,9 -1,0 +1,3 @@@
+0001-Remove-version-infromation-from-jquery-ui-filename.patch
- 0002-Initialize-django-in-sphinx-configuration-to-prevent.patch
- 0003-Make-intersphinx-use-local-copies-of-objects.inv-fil.patch
- 0004-Remove-djangodocs-extension-from-sphinx-configuratio.patch
- 0005-Add-basic-settings.TEMPLATES-for-tests.patch
- 0006-Search-request-context-processor-in-settings.TEMPLAT.patch
- 0007-Do-not-load-templatetag-cycle-from-future.patch
- 0008-Django-1.10-compat.-Error-on-MoveNodeForm-render.-Pa.patch
- 0009-Replace-django.conf.urls.patterns-with-lists.patch
++0002-Make-intersphinx-use-local-copies-of-objects.inv-fil.patch
++0003-Remove-djangodocs-extension-from-sphinx-configuratio.patch
--
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