[Python-modules-commits] [mockldap] 10/13: Refresh patches for 0.3.0.

[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 8f3a823fdb8cbde84c8db3a3787715070d16b4e3
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Wed Nov 1 18:36:58 2017 +0100

    Refresh patches for 0.3.0.
---
 debian/changelog                                   |  1 +
 ...2-Use-pyldap-for-both-Python2-and-Python3.patch | 30 +++++++++-------------
 .../docs-use_local_intersphinx_mapping.patch       | 14 ++++------
 3 files changed, 18 insertions(+), 27 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8c5415a..b236a45 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ mockldap (0.3.0-1) UNRELEASED; urgency=low
   * Bump Standards-Version to 4.1.1.
   * Raise minimum Python3 version to 3.4.
   * Use https:// for uscan URL.
+  * Refresh patches for 0.3.0.
 
  -- Michael Fladischer <fladi at debian.org>  Wed, 01 Nov 2017 18:31:50 +0100
 
diff --git a/debian/patches/0002-Use-pyldap-for-both-Python2-and-Python3.patch b/debian/patches/0002-Use-pyldap-for-both-Python2-and-Python3.patch
index bd13dc9..21f3606 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
@@ -3,28 +3,22 @@ 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(-)
+ setup.py | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
 
 diff --git a/setup.py b/setup.py
-index 167fae3..6c58e27 100755
+index fd80003..b82c1c5 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(
-     ],
+@@ -40,10 +40,7 @@ setup(
      keywords=['mock', 'ldap'],
      install_requires=[
--        'pyldap' if PY3 else 'python-ldap',
+         'funcparserlib == 0.3.6',
+-
+-        'pyldap; python_version >= "3.0"',
+-        'python-ldap >= 2.0; python_version < "3.0"',
+-
 +        'pyldap',
-         'funcparserlib==0.3.6',
-     ] + requires_mock,
-     extras_require={
+         'mock; python_version < "3.0"',
+     ],
+     setup_requires=[
diff --git a/debian/patches/docs-use_local_intersphinx_mapping.patch b/debian/patches/docs-use_local_intersphinx_mapping.patch
index cdde36b..3ede670 100644
--- a/debian/patches/docs-use_local_intersphinx_mapping.patch
+++ b/debian/patches/docs-use_local_intersphinx_mapping.patch
@@ -10,21 +10,20 @@ Forwarded: not-needed
 
 Patch-Name: docs-use_local_intersphinx_mapping.patch
 ---
- docs/source/conf.py | 22 +++++++++++++++++-----
- 1 file changed, 17 insertions(+), 5 deletions(-)
+ docs/source/conf.py | 18 ++++++++++++++----
+ 1 file changed, 14 insertions(+), 4 deletions(-)
 
 diff --git a/docs/source/conf.py b/docs/source/conf.py
-index 094559d..24df8ec 100644
+index 9dfe26c..2efe164 100644
 --- a/docs/source/conf.py
 +++ b/docs/source/conf.py
-@@ -32,11 +32,23 @@ extensions = [
+@@ -32,10 +32,20 @@ extensions = [
      'sphinx.ext.viewcode',
  ]
  
 -intersphinx_mapping = {
--    'python': ('http://docs.python.org/2/', 'http://docs.python.org/2/objects.inv'),
+-    'python': ('http://docs.python.org/3/', 'http://docs.python.org/3/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):
@@ -40,9 +39,6 @@ index 094559d..24df8ec 100644
 +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