[Python-modules-commits] [python-django-treebeard] 01/13: Convert from git-dpm to patches unapplied format

[Michael Fladischer]

This is an automated email from the git hooks/post-receive script.

fladi pushed a commit to branch debian/master
in repository python-django-treebeard.

commit 01d3c1974c2e924bb020b81b200bac026ff7589f
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Sat Jan 13 18:56:34 2018 +0100

    Convert from git-dpm to patches unapplied format
---
 debian/.git-dpm                      |  8 --------
 debian/gbp.conf                      |  2 ++
 docs/source/conf.py                  | 26 +++++---------------------
 treebeard/templatetags/admin_tree.py |  2 +-
 treebeard/tests/settings.py          | 20 ++++++++++----------
 treebeard/tests/test_treebeard.py    |  2 +-
 6 files changed, 19 insertions(+), 41 deletions(-)

diff --git a/debian/.git-dpm b/debian/.git-dpm
deleted file mode 100644
index 5f2780f..0000000
--- a/debian/.git-dpm
+++ /dev/null
@@ -1,8 +0,0 @@
-# see git-dpm(1) from git-dpm package
-ac2b1ca04126e5af7c43a60c6ca822832dec32ea
-ac2b1ca04126e5af7c43a60c6ca822832dec32ea
-fa17de54982188d431a9b41c73231cf5392aa235
-fa17de54982188d431a9b41c73231cf5392aa235
-python-django-treebeard_4.1.2+dfsg.orig.tar.gz
-c38d0f45b9cc94b94ce5d56a1af43c46cef2d351
-290056
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 0000000..3879982
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,2 @@
+[DEFAULT]
+debian-branch=debian/master
diff --git a/docs/source/conf.py b/docs/source/conf.py
index 348d65b..a999d36 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -36,6 +36,7 @@ django.setup()
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
 extensions = [
+    'djangodocs',
     'sphinx.ext.autodoc',
     'sphinx.ext.coverage',
     'sphinx.ext.graphviz',
@@ -296,24 +297,7 @@ texinfo_documents = [
 # If true, do not generate a @detailmenu in the "Top" node's menu.
 #texinfo_no_detailmenu = False
 
-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'
-    )
-)
-
+intersphinx_mapping = {
+    'django': ('https://docs.djangoproject.com/en/stable/', 'https://docs.djangoproject.com/en/stable/_objects/'),
+    'python': ('https://docs.python.org/3.5', None),
+}
diff --git a/treebeard/templatetags/admin_tree.py b/treebeard/templatetags/admin_tree.py
index 90cf6e2..9794ac6 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.min.js')
+    jquery_ui = urljoin(path, 'treebeard/jquery-ui-1.8.5.custom.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/settings.py b/treebeard/tests/settings.py
index 422da86..9b26215 100644
--- a/treebeard/tests/settings.py
+++ b/treebeard/tests/settings.py
@@ -56,16 +56,16 @@ SECRET_KEY = '7r33b34rd'
 # This little hacks forces Django into the old syncdb behaviour,
 # creating models without migrations.
 
-# class DisableMigrations(object):
-#
-#     def __contains__(self, item):
-#         return True
-#
-#     def __getitem__(self, item):
-#         return "notmigrations"
-#
-#
-# MIGRATION_MODULES = DisableMigrations()
+class DisableMigrations(object):
+
+    def __contains__(self, item):
+        return True
+
+    def __getitem__(self, item):
+        return "notmigrations"
+
+
+MIGRATION_MODULES = DisableMigrations()
 
 INSTALLED_APPS = [
     'django.contrib.auth',
diff --git a/treebeard/tests/test_treebeard.py b/treebeard/tests/test_treebeard.py
index fbd6276..0817848 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.min.js"></script>')
+                    'src="/treebeard/jquery-ui-1.8.5.custom.min.js"></script>')
         assert expected == rendered
 
     def test_get_static_url(self):

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-django-treebeard.git