[Python-modules-commits] [python-django-otp] 06/08: merge patched into master
Michael Fladischer
fladi at moszumanska.debian.org
Thu Mar 16 10:48:35 UTC 2017
This is an automated email from the git hooks/post-receive script.
fladi pushed a commit to branch master
in repository python-django-otp.
commit fb7d6c69817ecfc4f2c0b9f26257a17042aab9d2
Merge: 620ce41 c03db8b
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date: Thu Mar 16 11:37:50 2017 +0100
merge patched into master
CHANGES | 7 ++++---
MANIFEST.in | 2 ++
PKG-INFO | 4 ++--
debian/.git-dpm | 6 +++---
...0001-Use-local-objects.inv-file-for-intersphinx.patch | 4 ++--
...02-Call-django.setup-to-initialize-app-registry.patch | 4 ++--
...ependencies-to-INSTALLED_APPS-for-sphinx-autodo.patch | 4 ++--
django_otp.egg-info/PKG-INFO | 4 ++--
django_otp.egg-info/SOURCES.txt | 1 -
django_otp.egg-info/requires.txt | 3 +++
django_otp/plugins/otp_hotp/admin.py | 4 ++--
django_otp/plugins/otp_totp/admin.py | 4 ++--
django_otp/templates/otp/.DS_Store | Bin 6148 -> 0 bytes
docs/source/conf.py | 2 +-
setup.py | 7 +++++--
15 files changed, 32 insertions(+), 24 deletions(-)
diff --cc debian/.git-dpm
index d91ce44,0000000..a21cc78
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
+# see git-dpm(1) from git-dpm package
- e24a1ee92989ffea2846822a09e0dc7faabd9fc6
- e24a1ee92989ffea2846822a09e0dc7faabd9fc6
- 418274d75dc81df5f55be32a4250e98f3de35c3e
++c03db8b6c785d29f0e94af510d2dcafd2f26bf94
++c03db8b6c785d29f0e94af510d2dcafd2f26bf94
++2caee170874f032099c3a7d2a2b54ab755841ecb
+2caee170874f032099c3a7d2a2b54ab755841ecb
+python-django-otp_0.3.11.orig.tar.gz
+7fcc084848aa1b673988dcd5fb42d01a0e9f784a
+44076
diff --cc debian/patches/0001-Use-local-objects.inv-file-for-intersphinx.patch
index 469bb2c,0000000..4575895
mode 100644,000000..100644
--- a/debian/patches/0001-Use-local-objects.inv-file-for-intersphinx.patch
+++ b/debian/patches/0001-Use-local-objects.inv-file-for-intersphinx.patch
@@@ -1,56 -1,0 +1,56 @@@
- From 6a7677b529ef421ff06f9cacea35037aa03247a3 Mon Sep 17 00:00:00 2001
++From 32f24987c57fcdeb55e3fc5cb9848b626adbb1b7 Mon Sep 17 00:00:00 2001
+From: Michael Fladischer <FladischerMichael at fladi.at>
+Date: Sun, 26 Feb 2017 17:19:06 +0100
+Subject: Use local objects.inv file for intersphinx.
+
+This makes sure that no online resources are used during package build.
+---
+ docs/source/conf.py | 28 +++++++++++++++++++++++-----
+ 1 file changed, 23 insertions(+), 5 deletions(-)
+
+diff --git a/docs/source/conf.py b/docs/source/conf.py
- index 6ef1601..fb78208 100644
++index d152d2c..d6464aa 100644
+--- a/docs/source/conf.py
++++ b/docs/source/conf.py
+@@ -36,6 +36,7 @@ extensions = [
+ ]
+
+ # autodoc and viewcode need valid settings in order to process Django modules.
++import django
+ import django.conf
+ django.conf.settings.configure(
+ DATABASES={
+@@ -46,11 +47,28 @@ django.conf.settings.configure(
+ }
+ )
+
+-intersphinx_mapping = {
+- 'python': ('http://docs.python.org/2/', None),
+- 'django': ('https://docs.djangoproject.com/en/1.10/',
+- 'https://docs.djangoproject.com/en/1.10/_objects/'),
+-}
++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',
++ 'https://docs.python.org/{v}/'.format(
++ v='.'.join(map(str, sys.version_info[0:2]))
++ ),
++ '/usr/share/doc/python{v}/html/objects.inv'.format(
++ v='.'.join(map(str, sys.version_info[0: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'
++))
+
+ # Add any paths that contain templates here, relative to this directory.
+ templates_path = ['_templates']
diff --cc debian/patches/0002-Call-django.setup-to-initialize-app-registry.patch
index fccfefc,0000000..8c6b6ff
mode 100644,000000..100644
--- a/debian/patches/0002-Call-django.setup-to-initialize-app-registry.patch
+++ b/debian/patches/0002-Call-django.setup-to-initialize-app-registry.patch
@@@ -1,22 -1,0 +1,22 @@@
- From 38ee1fd79b4ef3efcaf93a1f1112bd7a5fb12d49 Mon Sep 17 00:00:00 2001
++From 58cb03bb1d495cdbd5f48e5bdc01ac61b8491e06 Mon Sep 17 00:00:00 2001
+From: Michael Fladischer <FladischerMichael at fladi.at>
+Date: Wed, 1 Mar 2017 08:38:17 +0100
+Subject: Call `django.setup()` to initialize app registry.
+
+---
+ docs/source/conf.py | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/docs/source/conf.py b/docs/source/conf.py
- index fb78208..06491ae 100644
++index d6464aa..3f29a86 100644
+--- a/docs/source/conf.py
++++ b/docs/source/conf.py
+@@ -47,6 +47,8 @@ django.conf.settings.configure(
+ }
+ )
+
++django.setup()
++
+ def check_object_path(key, url, path):
+ if os.path.isfile(path):
+ return {key: (url, path)}
diff --cc debian/patches/0003-Add-dependencies-to-INSTALLED_APPS-for-sphinx-autodo.patch
index 30d6e9c,0000000..d1e5a13
mode 100644,000000..100644
--- a/debian/patches/0003-Add-dependencies-to-INSTALLED_APPS-for-sphinx-autodo.patch
+++ b/debian/patches/0003-Add-dependencies-to-INSTALLED_APPS-for-sphinx-autodo.patch
@@@ -1,31 -1,0 +1,31 @@@
- From e24a1ee92989ffea2846822a09e0dc7faabd9fc6 Mon Sep 17 00:00:00 2001
++From c03db8b6c785d29f0e94af510d2dcafd2f26bf94 Mon Sep 17 00:00:00 2001
+From: Michael Fladischer <FladischerMichael at fladi.at>
+Date: Wed, 1 Mar 2017 08:59:24 +0100
+Subject: Add dependencies to INSTALLED_APPS for sphinx autodoc.
+
+---
+ docs/source/conf.py | 11 ++++++++++-
+ 1 file changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/docs/source/conf.py b/docs/source/conf.py
- index 06491ae..f85756e 100644
++index 3f29a86..cd032c3 100644
+--- a/docs/source/conf.py
++++ b/docs/source/conf.py
+@@ -44,7 +44,16 @@ django.conf.settings.configure(
+ 'ENGINE': 'django.db.backends.sqlite3',
+ 'NAME': '/tmp/django_otp.sqlite',
+ }
+- }
++ },
++ INSTALLED_APPS=[
++ 'django.contrib.auth',
++ 'django.contrib.contenttypes',
++ 'django_otp',
++ 'django_otp.plugins.otp_email',
++ 'django_otp.plugins.otp_static',
++ 'django_otp.plugins.otp_totp',
++ 'django_otp.plugins.otp_hotp',
++ ]
+ )
+
+ django.setup()
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-django-otp.git
More information about the Python-modules-commits
mailing list