[Python-modules-commits] [django-auth-ldap] 05/12: Refresh patches.

[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 7aede8f56f9a9a8a4ec5d1467dd3b295a66cdd7e
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Fri Nov 24 11:10:16 2017 +0100

    Refresh patches.
---
 debian/changelog                                   |  1 +
 ...3-Use-pyldap-for-both-Python2-and-Python3.patch | 25 ++++-----
 .../docs-use_local_intersphinx_mapping.patch       | 62 ++++++++++++++--------
 3 files changed, 49 insertions(+), 39 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index de53327..083d362 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ django-auth-ldap (1.3.0-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * Move upstream signing key to debian/upstream/signing-key.asc.
+  * Refresh patches.
 
  -- Michael Fladischer <fladi at debian.org>  Fri, 24 Nov 2017 10:59:09 +0100
 
diff --git a/debian/patches/0003-Use-pyldap-for-both-Python2-and-Python3.patch b/debian/patches/0003-Use-pyldap-for-both-Python2-and-Python3.patch
index c163ef1..8ec285e 100644
--- a/debian/patches/0003-Use-pyldap-for-both-Python2-and-Python3.patch
+++ b/debian/patches/0003-Use-pyldap-for-both-Python2-and-Python3.patch
@@ -3,28 +3,21 @@ Date: Fri, 17 Mar 2017 20:24:08 +0100
 Subject: Use pyldap for both Python2 and Python3.
 
 ---
- setup.py | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
+ setup.py | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
 
 diff --git a/setup.py b/setup.py
-index dc7dd6a..6312c56 100644
+index 8402d46..fd80bdf 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -7,9 +7,6 @@ from setuptools import setup
- import django_auth_ldap
- 
- 
--PY3 = (sys.version_info[0] == 3)
--
--
- setup(
-     name="django-auth-ldap",
-     version=django_auth_ldap.version_string,
-@@ -49,7 +46,7 @@ setup(
+@@ -112,9 +112,8 @@ setup(
+     ],
      keywords=["django", "ldap", "authentication", "auth"],
      install_requires=[
-         "django",
--        "pyldap" if PY3 else "python-ldap >= 2.0",
+-        'django >= 1.8',
+-        'pyldap; python_version >= "3.0"',
+-        'python-ldap >= 2.0; python_version < "3.0"',
++        "django >= 1.8",
 +        "pyldap",
      ],
      setup_requires=[
diff --git a/debian/patches/docs-use_local_intersphinx_mapping.patch b/debian/patches/docs-use_local_intersphinx_mapping.patch
index eaccb77..62e065d 100644
--- a/debian/patches/docs-use_local_intersphinx_mapping.patch
+++ b/debian/patches/docs-use_local_intersphinx_mapping.patch
@@ -10,40 +10,56 @@ Forwarded: not-needed
 
 Patch-Name: docs-use_local_intersphinx_mapping.patch
 ---
- docs/source/conf.py | 23 +++++++++++++++++------
- 1 file changed, 17 insertions(+), 6 deletions(-)
+ docs/source/conf.py | 32 ++++++++++++++++++++++++++++++++
+ 1 file changed, 32 insertions(+)
 
 diff --git a/docs/source/conf.py b/docs/source/conf.py
-index 7098158..96695b3 100644
+index a644bb2..1ac727a 100644
 --- a/docs/source/conf.py
 +++ b/docs/source/conf.py
-@@ -29,12 +29,23 @@ extensions = [
+@@ -19,6 +19,7 @@
+ 
+ import os
+ import sys
++import django
+ 
+ sys.path.insert(0, os.path.abspath('../ext'))
+ 
+@@ -38,6 +39,37 @@ extensions = [
      'daldocs',
  ]
  
--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),
--}
++
 +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.update(
++    check_object_path(
++        'python',
++        'http://docs.python.org/',
++        '/usr/share/doc/python{v}/html/objects.inv'.format(map(str, sys.version_info[:2]))
++    )
++)
++intersphinx_mapping.update(
++    check_object_path(
++        'django',
++        'https://docs.djangoproject.com/en/{v}/'.format(v='.'.join(map(str, django.VERSION[:2]))),
++        '/usr/share/doc/python-django-doc/html/objects.inv'
++    )
++)
++intersphinx_mapping.update(
++    check_object_path(
++        'pythonldap',
++        'http://python-ldap.org/doc/html/',
++        ''
++    )
++)
++
++
  # Add any paths that contain templates here, relative to this directory.
- templates_path = ['../_templates']
+ # templates_path = ['_templates']
+ 

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