[Python-modules-commits] [django-auth-ldap] 01/07: 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 django-auth-ldap.

commit 28af0fb779961c1a4b4911cc42325cbe5531562f
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Fri Jul 28 11:32:23 2017 +0200

    Convert from git-dpm to patches unapplied format
---
 debian/.git-dpm     | 11 -----------
 debian/gbp.conf     |  2 ++
 docs/source/conf.py | 25 +++++++------------------
 setup.py            |  5 ++++-
 4 files changed, 13 insertions(+), 30 deletions(-)

diff --git a/debian/.git-dpm b/debian/.git-dpm
deleted file mode 100644
index bc6a820..0000000
--- a/debian/.git-dpm
+++ /dev/null
@@ -1,11 +0,0 @@
-# see git-dpm(1) from git-dpm package
-359c7222f79c1c37a46f5ee1b092db29c5104ba6
-359c7222f79c1c37a46f5ee1b092db29c5104ba6
-058058d4997149c3ae278a2ff7812814d62c02d2
-058058d4997149c3ae278a2ff7812814d62c02d2
-django-auth-ldap_1.2.13+dfsg.orig.tar.gz
-df4bb8f2910e87b97e88b8b07ddd45fd96dab3da
-110136
-debianTag="debian/%e%v"
-patchedTag="patched/%e%v"
-upstreamTag="upstream/%e%u"
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 5bdb7a1..fd0d8bc 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -29,23 +29,12 @@ extensions = [
     'daldocs',
 ]
 
-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/dev/',
-                                             '/usr/share/doc/python-django-doc/html/objects.inv'))
-intersphinx_mapping.update(check_object_path('pythonldap',
-                                             'http://python-ldap.org/doc/html/',
-                                             ''))
+intersphinx_mapping = {
+    'python': ('http://docs.python.org/', None),
+    'django': ('https://docs.djangoproject.com/en/dev/',
+               'https://docs.djangoproject.com/en/dev/_objects/'),
+    'pythonldap': ('http://python-ldap.org/doc/html/', None),
+}
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['../_templates']
@@ -145,7 +134,7 @@ html_theme_options = {
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-#html_static_path = ['../archive']
+html_static_path = ['../archive']
 
 # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
 # using the given strftime format.
diff --git a/setup.py b/setup.py
index 82f2511..6397eff 100644
--- a/setup.py
+++ b/setup.py
@@ -5,6 +5,9 @@ import sys
 from setuptools import setup
 
 
+PY3 = (sys.version_info[0] == 3)
+
+
 setup(
     name="django-auth-ldap",
     version="1.2.13",
@@ -44,7 +47,7 @@ setup(
     keywords=["django", "ldap", "authentication", "auth"],
     install_requires=[
         "django",
-        "pyldap",
+        "pyldap" if PY3 else "python-ldap >= 2.0",
     ],
     setup_requires=[
         "setuptools >= 0.6c11",

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