[Python-modules-commits] [python-django-otp] 06/09: merge patched into master
Michael Fladischer
fladi at moszumanska.debian.org
Tue Jun 20 08:15:44 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 7ae56b750e9616efdb3d0a2ce1735ac959c244e8
Merge: 2d43133 6092842
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date: Tue Jun 20 10:10:34 2017 +0200
merge patched into master
CHANGES | 6 ++++++
PKG-INFO | 3 ++-
debian/.git-dpm | 6 +++---
.../patches/0001-Use-local-objects.inv-file-for-intersphinx.patch | 4 ++--
.../patches/0002-Call-django.setup-to-initialize-app-registry.patch | 4 ++--
.../0003-Add-dependencies-to-INSTALLED_APPS-for-sphinx-autodo.patch | 4 ++--
django_otp.egg-info/PKG-INFO | 3 ++-
django_otp/plugins/otp_static/management/commands/addstatictoken.py | 2 +-
docs/source/conf.py | 2 +-
setup.py | 3 ++-
10 files changed, 23 insertions(+), 14 deletions(-)
diff --cc debian/.git-dpm
index e947869,0000000..f024bf9
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
- 7a173ca1d81d67d579de0a219389e2766ddb4609
- 7a173ca1d81d67d579de0a219389e2766ddb4609
- 005240302b4cd9ccd4ce1a68918268b4c6b01906
++6092842c5275caa50bc3040cab4b2284d17bb3ef
++6092842c5275caa50bc3040cab4b2284d17bb3ef
++3f17e7d34fdb8f8327e4858255ee7580bd86a337
+3f17e7d34fdb8f8327e4858255ee7580bd86a337
+python-django-otp_0.3.14.orig.tar.gz
+5ccd785afe7c809796c795505744140db7d2212b
+44302
diff --cc debian/patches/0001-Use-local-objects.inv-file-for-intersphinx.patch
index 1dcae98,0000000..6c0eb42
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 7c4ca5eb3d453f84c47db59fffbf1b652fba716a Mon Sep 17 00:00:00 2001
++From 49dcbfca88e5e2561372ad7cf140ba5c31c28f9c 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 b7504d0..77cc4fc 100644
++index 0358063..07d0adb 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 bd65cec,0000000..43aff96
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 7b9c41c9e73769356abe13655ef31e139129fc1b Mon Sep 17 00:00:00 2001
++From 2aedae2d3ab06b91a90916e7470af9c8e0d2395c 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 77cc4fc..b628097 100644
++index 07d0adb..652345c 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 66fc36f,0000000..1784778
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 7a173ca1d81d67d579de0a219389e2766ddb4609 Mon Sep 17 00:00:00 2001
++From 6092842c5275caa50bc3040cab4b2284d17bb3ef 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 b628097..c3cf322 100644
++index 652345c..a97d8cc 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