[Python-modules-commits] [python-django-otp] 05/07: merge patched into master
Michael Fladischer
fladi at moszumanska.debian.org
Sat Jul 22 13:30:40 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 917c108673bc60182578d3538a5e8bc9fdfba43a
Merge: 7c230f3 79ad3d9
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date: Sat Jul 22 14:39:15 2017 +0200
merge patched into master
CHANGES | 8 ++
PKG-INFO | 15 ++--
README.rst | 10 +--
debian/.git-dpm | 6 +-
...se-local-objects.inv-file-for-intersphinx.patch | 23 ++---
...l-django.setup-to-initialize-app-registry.patch | 10 +--
...ncies-to-INSTALLED_APPS-for-sphinx-autodo.patch | 31 -------
debian/patches/series | 1 -
django_otp.egg-info/PKG-INFO | 15 ++--
django_otp.egg-info/SOURCES.txt | 9 --
django_otp.egg-info/requires.txt | 2 +-
.../otp_email/south_migrations/0001_initial.py | 74 ---------------
.../plugins/otp_email/south_migrations/__init__.py | 0
.../otp_hotp/south_migrations/0001_initial.py | 80 -----------------
.../plugins/otp_hotp/south_migrations/__init__.py | 0
.../management/commands/addstatictoken.py | 13 ++-
.../otp_static/south_migrations/0001_initial.py | 100 ---------------------
.../otp_static/south_migrations/__init__.py | 0
.../otp_totp/south_migrations/0001_initial.py | 91 -------------------
.../otp_totp/south_migrations/0002_last_t.py | 82 -----------------
.../plugins/otp_totp/south_migrations/__init__.py | 0
docs/source/conf.py | 21 +++--
setup.cfg | 1 -
setup.py | 5 +-
24 files changed, 58 insertions(+), 539 deletions(-)
diff --cc debian/.git-dpm
index 8034f9c,0000000..4a9a831
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
- 6092842c5275caa50bc3040cab4b2284d17bb3ef
- 6092842c5275caa50bc3040cab4b2284d17bb3ef
- 3f17e7d34fdb8f8327e4858255ee7580bd86a337
++79ad3d9a54984fd172f2e1bae8a5b62f0e635338
++79ad3d9a54984fd172f2e1bae8a5b62f0e635338
++3170ba75d6fa22a5f4b03a90e016a93d4e2b61a6
+3170ba75d6fa22a5f4b03a90e016a93d4e2b61a6
+python-django-otp_0.4.0.1.orig.tar.gz
+1864bf71de7224767038bf89c474cab68528a3e1
+40129
diff --cc debian/patches/0001-Use-local-objects.inv-file-for-intersphinx.patch
index 6c0eb42,0000000..ac33862
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,49 @@@
- From 49dcbfca88e5e2561372ad7cf140ba5c31c28f9c Mon Sep 17 00:00:00 2001
++From 0b6866e4bfe367cbe52aaf80b30bf11511d2a4c4 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 0358063..07d0adb 100644
++index 73d0c10..0b183fa 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(
- }
++@@ -60,11 +60,29 @@ django.conf.settings.configure(
+ )
++ django.setup()
+
+-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/'),
++- 'python': ('http://docs.python.org/3/', None),
++- 'django': ('https://docs.djangoproject.com/en/1.11/',
++- 'https://docs.djangoproject.com/en/1.11/_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 43aff96,0000000..b35cccf
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 2aedae2d3ab06b91a90916e7470af9c8e0d2395c Mon Sep 17 00:00:00 2001
++From 79ad3d9a54984fd172f2e1bae8a5b62f0e635338 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 07d0adb..652345c 100644
++index 0b183fa..ffeeddc 100644
+--- a/docs/source/conf.py
++++ b/docs/source/conf.py
- @@ -47,6 +47,8 @@ django.conf.settings.configure(
- }
- )
++@@ -61,6 +61,8 @@ django.conf.settings.configure(
++ django.setup()
++
+
++django.setup()
++
+ def check_object_path(key, url, path):
+ if os.path.isfile(path):
+ return {key: (url, path)}
diff --cc debian/patches/series
index 93ca8c5,0000000..6be236e
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,3 -1,0 +1,2 @@@
+0001-Use-local-objects.inv-file-for-intersphinx.patch
+0002-Call-django.setup-to-initialize-app-registry.patch
- 0003-Add-dependencies-to-INSTALLED_APPS-for-sphinx-autodo.patch
--
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