[Python-modules-commits] [django-auth-ldap] 06/08: merge patched into master
Michael Fladischer
fladi at moszumanska.debian.org
Thu Jul 6 20:41:27 UTC 2017
This is an automated email from the git hooks/post-receive script.
fladi pushed a commit to branch master
in repository django-auth-ldap.
commit 0f1eb6a6274c1ae38b674fb5dcda81a8edfe69a8
Merge: 4b772ab 359c722
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date: Thu Jul 6 21:00:47 2017 +0200
merge patched into master
CHANGES | 11 ++
PKG-INFO | 4 +-
debian/.git-dpm | 6 +-
...3-Use-pyldap-for-both-Python2-and-Python3.patch | 8 +-
debian/patches/docs-do_not_install_archive.patch | 4 +-
.../docs-use_local_intersphinx_mapping.patch | 4 +-
django_auth_ldap.egg-info/PKG-INFO | 4 +-
django_auth_ldap.egg-info/SOURCES.txt | 1 +
django_auth_ldap.egg-info/requires.txt | 2 +-
django_auth_ldap/__init__.py | 2 +-
django_auth_ldap/backend.py | 84 +++++++++++-
django_auth_ldap/config.py | 4 +
django_auth_ldap/tests.py | 149 +++++++++++++++++++--
docs/source/.conf.py.swp | Bin 0 -> 16384 bytes
docs/source/conf.py | 2 +-
docs/source/permissions.rst | 39 +++---
docs/source/reference.rst | 26 +++-
setup.py | 4 +-
test/settings.py | 5 +
tox.ini | 6 +-
20 files changed, 303 insertions(+), 62 deletions(-)
diff --cc debian/.git-dpm
index 18deea4,0000000..bc6a820
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
- c3d26b77b517efcad75e1bdb84f327391c339497
- c3d26b77b517efcad75e1bdb84f327391c339497
- eb4338e4d7a8bd0af8b130f75a9d3ad09cca4612
++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 --cc debian/patches/0003-Use-pyldap-for-both-Python2-and-Python3.patch
index b1541d1,0000000..00c293e
mode 100644,000000..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
@@@ -1,32 -1,0 +1,32 @@@
- From c3d26b77b517efcad75e1bdb84f327391c339497 Mon Sep 17 00:00:00 2001
++From 359c7222f79c1c37a46f5ee1b092db29c5104ba6 Mon Sep 17 00:00:00 2001
+From: Michael Fladischer <FladischerMichael at fladi.at>
+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(-)
+
+diff --git a/setup.py b/setup.py
- index c32174e..a9f9418 100644
++index 6397eff..82f2511 100644
+--- a/setup.py
++++ b/setup.py
+@@ -5,9 +5,6 @@ import sys
+ from setuptools import setup
+
+
+-PY3 = (sys.version_info[0] == 3)
+-
+-
+ setup(
+ name="django-auth-ldap",
- version="1.2.12",
- @@ -49,7 +46,7 @@ setup(
++ version="1.2.13",
++@@ -47,7 +44,7 @@ setup(
+ keywords=["django", "ldap", "authentication", "auth"],
+ install_requires=[
+ "django",
+- "pyldap" if PY3 else "python-ldap >= 2.0",
++ "pyldap",
+ ],
+ setup_requires=[
+ "setuptools >= 0.6c11",
diff --cc debian/patches/docs-do_not_install_archive.patch
index 4f1ded1,0000000..c43644e
mode 100644,000000..100644
--- a/debian/patches/docs-do_not_install_archive.patch
+++ b/debian/patches/docs-do_not_install_archive.patch
@@@ -1,29 -1,0 +1,29 @@@
- From 766037071ff755566cbc895d9f8958fd0d68b0d8 Mon Sep 17 00:00:00 2001
++From c2564cbb900a78df48983fabbc6ff0005ebaddd4 Mon Sep 17 00:00:00 2001
+From: Michael Fladischer <fladi at debian.org>
+Date: Thu, 8 Oct 2015 08:49:53 -0700
+Subject: Do not include a static copy of "archive"
+
+ Upstream configured sphinx to do a static copy of the "archive" directory,
+ which is useless in the contet of the Debian package as it only contains
+ outdated versions of the documentation.
+Last-Update: 2013-11-26
+Forwarded: not-needed
+
+Patch-Name: docs-do_not_install_archive.patch
+---
+ docs/source/conf.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/docs/source/conf.py b/docs/source/conf.py
- index e0ac649..2916eee 100644
++index fd0d8bc..b2b8089 100644
+--- a/docs/source/conf.py
++++ b/docs/source/conf.py
+@@ -134,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 --cc debian/patches/docs-use_local_intersphinx_mapping.patch
index d30c371,0000000..0bb8105
mode 100644,000000..100644
--- a/debian/patches/docs-use_local_intersphinx_mapping.patch
+++ b/debian/patches/docs-use_local_intersphinx_mapping.patch
@@@ -1,50 -1,0 +1,50 @@@
- From 93daa2d804b92c6d10f04c9ceb6d1b4855074e5d Mon Sep 17 00:00:00 2001
++From ec1e22dfe3d6407497b6d2be0bccf86695c74a42 Mon Sep 17 00:00:00 2001
+From: Michael Fladischer <fladi at debian.org>
+Date: Thu, 8 Oct 2015 08:49:54 -0700
+Subject: use local objects.inv where possible
+
+ Upstream uses intersphinx mappings that fetch the objects.inv for python and
+ python-django by HTTP from a remote host. Using the local objects.inv from
+ python and kombu enables the package to build without network connection.
+Last-Update: 2013-11-26
+Forwarded: not-needed
+
+Patch-Name: docs-use_local_intersphinx_mapping.patch
+---
+ docs/source/conf.py | 23 +++++++++++++++++------
+ 1 file changed, 17 insertions(+), 6 deletions(-)
+
+diff --git a/docs/source/conf.py b/docs/source/conf.py
- index 2916eee..9316546 100644
++index b2b8089..5bdb7a1 100644
+--- a/docs/source/conf.py
++++ b/docs/source/conf.py
+@@ -29,12 +29,23 @@ 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/',
++ ''))
+
+ # 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/django-auth-ldap.git
More information about the Python-modules-commits
mailing list