[Python-modules-commits] [mockldap] 05/07: merge patched-experimental into experimental
Michael Fladischer
fladi at moszumanska.debian.org
Sun Mar 19 07:10:50 UTC 2017
This is an automated email from the git hooks/post-receive script.
fladi pushed a commit to branch experimental
in repository mockldap.
commit 35905ed5f3ae5bb5377d84e680b4d238f6a418eb
Merge: 2436bb2 8ec15cd
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date: Sun Mar 19 07:58:15 2017 +0100
merge patched-experimental into experimental
CHANGES | 9 ++++++++-
PKG-INFO | 2 +-
debian/.git-dpm | 6 +++---
.../patches/0002-Use-pyldap-for-both-Python2-and-Python3.patch | 4 ++--
debian/patches/docs-use_local_intersphinx_mapping.patch | 4 ++--
docs/source/conf.py | 2 +-
setup.cfg | 1 -
setup.py | 2 +-
src/mockldap.egg-info/PKG-INFO | 2 +-
src/mockldap/ldapobject.py | 10 +++++-----
src/mockldap/tests.py | 6 ++++++
11 files changed, 30 insertions(+), 18 deletions(-)
diff --cc debian/.git-dpm
index 9e8bb7c,0000000..c1fa484
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
+# see git-dpm(1) from git-dpm package
- 68abde3da3e2e208de5be75e69a10fcdcf341b75
- 68abde3da3e2e208de5be75e69a10fcdcf341b75
- 9e0bc8a3f542ba798498d1ceefde5ed3f6f64314
++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 --cc debian/patches/0002-Use-pyldap-for-both-Python2-and-Python3.patch
index 8644901,0000000..1181c49
mode 100644,000000..100644
--- a/debian/patches/0002-Use-pyldap-for-both-Python2-and-Python3.patch
+++ b/debian/patches/0002-Use-pyldap-for-both-Python2-and-Python3.patch
@@@ -1,31 -1,0 +1,31 @@@
- From 68abde3da3e2e208de5be75e69a10fcdcf341b75 Mon Sep 17 00:00:00 2001
++From 8ec15cd8c29ffb579bb8b60ae1f4c0fe3dad5211 Mon Sep 17 00:00:00 2001
+From: Michael Fladischer <FladischerMichael at fladi.at>
+Date: Fri, 17 Mar 2017 21:26:14 +0100
+Subject: Use pyldap for both Python2 and Python3.
+
+---
+ setup.py | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/setup.py b/setup.py
- index 7d827f6..303478e 100755
++index 167fae3..6c58e27 100755
+--- a/setup.py
++++ b/setup.py
+@@ -5,8 +5,6 @@ import sys
+ from setuptools import setup
+
+
+-PY3 = (sys.version_info[0] == 3)
+-
+ try:
+ import unittest.mock # noqa
+ except ImportError:
+@@ -53,7 +51,7 @@ setup(
+ ],
+ keywords=['mock', 'ldap'],
+ install_requires=[
+- 'pyldap' if PY3 else 'python-ldap',
++ 'pyldap',
+ 'funcparserlib==0.3.6',
+ ] + requires_mock,
+ extras_require={
diff --cc debian/patches/docs-use_local_intersphinx_mapping.patch
index ca8fa0d,0000000..1dc04a8
mode 100644,000000..100644
--- a/debian/patches/docs-use_local_intersphinx_mapping.patch
+++ b/debian/patches/docs-use_local_intersphinx_mapping.patch
@@@ -1,49 -1,0 +1,49 @@@
- From ecf59c3ebc968f659d31c6ca4c9ecf380924b58b Mon Sep 17 00:00:00 2001
++From 840a906c0d2cccb62f0db94c248dfc8483898608 Mon Sep 17 00:00:00 2001
+From: Michael Fladischer <fladi at debian.org>
+Date: Thu, 8 Oct 2015 09:52:32 -0700
+Subject: use local objects.inv where possible
+
+ Upstream uses intersphinx mappings that fetch the objects.inv for python and
+ python-mock by HTTP from a remote host. Using the local objects.inv from
+ python and python-mock enables the package to build without network connection.
+Last-Update: 2013-12-03
+Forwarded: not-needed
+
+Patch-Name: docs-use_local_intersphinx_mapping.patch
+---
+ docs/source/conf.py | 22 +++++++++++++++++-----
+ 1 file changed, 17 insertions(+), 5 deletions(-)
+
+diff --git a/docs/source/conf.py b/docs/source/conf.py
- index 1e49183..d9921c4 100644
++index 094559d..24df8ec 100644
+--- a/docs/source/conf.py
++++ b/docs/source/conf.py
+@@ -32,11 +32,23 @@ extensions = [
+ 'sphinx.ext.viewcode',
+ ]
+
+-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),
+-}
++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'))
+
+ # Add any paths that contain templates here, relative to this directory.
+ templates_path = ['_templates']
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/mockldap.git
More information about the Python-modules-commits
mailing list