[Python-modules-commits] [mockldap] 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 mockldap.

commit 5838efff9199d7f87f1253b07dfbac304c72c2b1
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Wed Nov 1 18:30:37 2017 +0100

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

diff --git a/debian/.git-dpm b/debian/.git-dpm
deleted file mode 100644
index c1fa484..0000000
--- a/debian/.git-dpm
+++ /dev/null
@@ -1,11 +0,0 @@
-# see git-dpm(1) from git-dpm package
-8ec15cd8c29ffb579bb8b60ae1f4c0fe3dad5211
-8ec15cd8c29ffb579bb8b60ae1f4c0fe3dad5211
-2aca990d7187d5be78a88e82c4277706919cc2c1
-2aca990d7187d5be78a88e82c4277706919cc2c1
-mockldap_0.2.8.orig.tar.gz
-a6e05da61f135b63f0cca287f6632c83b9390f4f
-23016
-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 24df8ec..094559d 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -32,23 +32,11 @@ extensions = [
     'sphinx.ext.viewcode',
 ]
 
-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('ldap',
-                                             'http://python-ldap.org/doc/html/',
-                                             ''))
-intersphinx_mapping.update(check_object_path('mock',
-                                             'http://www.voidspace.org.uk/python/mock/',
-                                             '/usr/share/doc/python-mock-doc/html/objects.inv'))
+intersphinx_mapping = {
+    'python': ('http://docs.python.org/2/', 'http://docs.python.org/2/objects.inv'),
+    'ldap': ('http://python-ldap.org/doc/html/', None),
+    'mock': ('http://www.voidspace.org.uk/python/mock/', None),
+}
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
diff --git a/setup.py b/setup.py
index 6c58e27..167fae3 100755
--- a/setup.py
+++ b/setup.py
@@ -5,6 +5,8 @@ import sys
 from setuptools import setup
 
 
+PY3 = (sys.version_info[0] == 3)
+
 try:
     import unittest.mock    # noqa
 except ImportError:
@@ -51,7 +53,7 @@ setup(
     ],
     keywords=['mock', 'ldap'],
     install_requires=[
-        'pyldap',
+        'pyldap' if PY3 else 'python-ldap',
         'funcparserlib==0.3.6',
     ] + requires_mock,
     extras_require={

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