[Python-modules-commits] [python-django-otp] 06/09: merge patched into master
Michael Fladischer
fladi at moszumanska.debian.org
Mon Mar 6 10:15:37 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 f09a9bd9aa539d63fdcc05bae1a2598d02ca3f25
Merge: 9faadfb e24a1ee
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date: Mon Mar 6 11:04:42 2017 +0100
merge patched into master
CHANGES | 13 ++++
MANIFEST.in | 2 +
PKG-INFO | 3 +-
debian/.git-dpm | 6 +-
...se-local-objects.inv-file-for-intersphinx.patch | 4 +-
...l-django.setup-to-initialize-app-registry.patch | 4 +-
...ncies-to-INSTALLED_APPS-for-sphinx-autodo.patch | 4 +-
django_otp.egg-info/PKG-INFO | 3 +-
django_otp.egg-info/SOURCES.txt | 2 +
django_otp.egg-info/requires.txt | 2 +-
django_otp/plugins/otp_hotp/admin.py | 71 ++++++++++++++++++
django_otp/plugins/otp_hotp/models.py | 31 ++++++++
.../otp_hotp/templates/otp_hotp/admin/config.html | 16 ++++
django_otp/plugins/otp_hotp/tests.py | 28 +++++++
.../plugins/otp_static/migrations/0001_initial.py | 2 +-
django_otp/plugins/otp_static/models.py | 2 +-
django_otp/plugins/otp_totp/admin.py | 71 ++++++++++++++++++
django_otp/plugins/otp_totp/models.py | 30 ++++++++
.../otp_totp/templates/otp_totp/admin/config.html | 16 ++++
django_otp/plugins/otp_totp/tests.py | 38 +++++++---
docs/source/conf.py | 2 +-
docs/source/overview.rst | 87 +++++++++++++++-------
setup.py | 5 +-
23 files changed, 386 insertions(+), 56 deletions(-)
diff --cc debian/.git-dpm
index 5f71173,0000000..92b1b11
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
- 6be891feb9e8cd95b08d4a1ce4ead179719caea5
- 6be891feb9e8cd95b08d4a1ce4ead179719caea5
- 005ed8efc70304aec1ed83ead75ebe646e4528f2
++e24a1ee92989ffea2846822a09e0dc7faabd9fc6
++e24a1ee92989ffea2846822a09e0dc7faabd9fc6
++418274d75dc81df5f55be32a4250e98f3de35c3e
+418274d75dc81df5f55be32a4250e98f3de35c3e
+python-django-otp_0.3.10.orig.tar.gz
+bbe065379335b9f38977bdaffd382e1d2bf9b3f8
+44474
diff --cc debian/patches/0001-Use-local-objects.inv-file-for-intersphinx.patch
index 3da6b5c,0000000..469bb2c
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 d24462c2315b37f8ba3351308a138fd31cd50c4f Mon Sep 17 00:00:00 2001
++From 6a7677b529ef421ff06f9cacea35037aa03247a3 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 24a7a03..ec9e146 100644
++index 6ef1601..fb78208 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 e965800,0000000..fccfefc
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 96db3cb616fb99ec017249166a19f0cbd2f0ce02 Mon Sep 17 00:00:00 2001
++From 38ee1fd79b4ef3efcaf93a1f1112bd7a5fb12d49 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 ec9e146..e394cb9 100644
++index fb78208..06491ae 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 e45f545,0000000..30d6e9c
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 6be891feb9e8cd95b08d4a1ce4ead179719caea5 Mon Sep 17 00:00:00 2001
++From e24a1ee92989ffea2846822a09e0dc7faabd9fc6 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 e394cb9..b6bdfca 100644
++index 06491ae..f85756e 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