[Python-modules-commits] [python-django-otp] 01/08: Import python-django-otp_0.3.11.orig.tar.gz
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 2caee170874f032099c3a7d2a2b54ab755841ecb
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date: Thu Mar 16 11:37:34 2017 +0100
Import python-django-otp_0.3.11.orig.tar.gz
---
CHANGES | 7 ++++---
MANIFEST.in | 2 ++
PKG-INFO | 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 +++++--
11 files changed, 23 insertions(+), 15 deletions(-)
diff --git a/CHANGES b/CHANGES
index 433eec8..315f432 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,8 +1,9 @@
-v0.3.10 - March 4, 2017 - Built-in QR Code support
+v0.3.11 - March 8, 2017 - Built-in QR Code support
--------------------------------------------------
-- `#20`_: Generate HOTP and TOTP otpauth URLs and corresponding QR Codes. You
- need the `qrcode`_ package installed for this feature.
+- `#20`_: Generate HOTP and TOTP otpauth URLs and corresponding QR Codes. To
+ enable this feature, install ``django_otp[qrcode]`` or just install the
+ `qrcode`_ package.
- Support for Python 2.6 and Django 1.4 were dropped in this version (long
overdue).
diff --git a/MANIFEST.in b/MANIFEST.in
index 1f57ad3..94f502f 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -7,3 +7,5 @@ recursive-include django_otp/plugins/otp_email/templates *
recursive-include django_otp/plugins/otp_hotp/templates *
recursive-include django_otp/plugins/otp_totp/templates *
recursive-include django_otp/templates *
+
+global-exclude .DS_Store
diff --git a/PKG-INFO b/PKG-INFO
index 0bcf992..a86bb0e 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,10 +1,10 @@
Metadata-Version: 1.1
Name: django-otp
-Version: 0.3.10
+Version: 0.3.11
Summary: A pluggable framework for adding two-factor authentication to Django using one-time passwords.
Home-page: https://bitbucket.org/psagers/django-otp
Author: Peter Sagerson
-Author-email: psagersDjwublJf at ignorare.net
+Author-email: psagers at ignorare.net
License: BSD
Description: This project makes it easy to add support for `one-time passwords
<http://en.wikipedia.org/wiki/One-time_password>`_ (OTPs) to Django. It can be
diff --git a/django_otp.egg-info/PKG-INFO b/django_otp.egg-info/PKG-INFO
index 0bcf992..a86bb0e 100644
--- a/django_otp.egg-info/PKG-INFO
+++ b/django_otp.egg-info/PKG-INFO
@@ -1,10 +1,10 @@
Metadata-Version: 1.1
Name: django-otp
-Version: 0.3.10
+Version: 0.3.11
Summary: A pluggable framework for adding two-factor authentication to Django using one-time passwords.
Home-page: https://bitbucket.org/psagers/django-otp
Author: Peter Sagerson
-Author-email: psagersDjwublJf at ignorare.net
+Author-email: psagers at ignorare.net
License: BSD
Description: This project makes it easy to add support for `one-time passwords
<http://en.wikipedia.org/wiki/One-time_password>`_ (OTPs) to Django. It can be
diff --git a/django_otp.egg-info/SOURCES.txt b/django_otp.egg-info/SOURCES.txt
index a7841df..97f81d3 100644
--- a/django_otp.egg-info/SOURCES.txt
+++ b/django_otp.egg-info/SOURCES.txt
@@ -63,7 +63,6 @@ django_otp/plugins/otp_totp/south_migrations/0001_initial.py
django_otp/plugins/otp_totp/south_migrations/0002_last_t.py
django_otp/plugins/otp_totp/south_migrations/__init__.py
django_otp/plugins/otp_totp/templates/otp_totp/admin/config.html
-django_otp/templates/otp/.DS_Store
django_otp/templates/otp/admin14/login.html
django_otp/templates/otp/admin15/login.html
django_otp/templates/otp/admin16/login.html
diff --git a/django_otp.egg-info/requires.txt b/django_otp.egg-info/requires.txt
index 7232fe7..3d48ba4 100644
--- a/django_otp.egg-info/requires.txt
+++ b/django_otp.egg-info/requires.txt
@@ -1 +1,4 @@
django >= 1.5.12
+
+[qrcode]
+qrcode
diff --git a/django_otp/plugins/otp_hotp/admin.py b/django_otp/plugins/otp_hotp/admin.py
index 99be38e..54acab2 100644
--- a/django_otp/plugins/otp_hotp/admin.py
+++ b/django_otp/plugins/otp_hotp/admin.py
@@ -47,10 +47,10 @@ class HOTPDeviceAdmin(admin.ModelAdmin):
#
def qrcode_link(self, device):
- if device is not None:
+ try:
href = reverse('admin:otp_hotp_hotpdevice_config', kwargs={'pk': device.pk})
link = format_html('<a href="{}">qrcode</a>', href)
- else:
+ except Exception:
link = ''
return link
diff --git a/django_otp/plugins/otp_totp/admin.py b/django_otp/plugins/otp_totp/admin.py
index 003ca91..53d547d 100644
--- a/django_otp/plugins/otp_totp/admin.py
+++ b/django_otp/plugins/otp_totp/admin.py
@@ -47,10 +47,10 @@ class TOTPDeviceAdmin(admin.ModelAdmin):
#
def qrcode_link(self, device):
- if device is not None:
+ try:
href = reverse('admin:otp_totp_totpdevice_config', kwargs={'pk': device.pk})
link = format_html('<a href="{}">qrcode</a>', href)
- else:
+ except Exception:
link = ''
return link
diff --git a/django_otp/templates/otp/.DS_Store b/django_otp/templates/otp/.DS_Store
deleted file mode 100644
index 2d35954..0000000
Binary files a/django_otp/templates/otp/.DS_Store and /dev/null differ
diff --git a/docs/source/conf.py b/docs/source/conf.py
index 6ef1601..d152d2c 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -75,7 +75,7 @@ copyright = u'2012, Peter Sagerson'
# The short X.Y version.
version = '0.3'
# The full version, including alpha/beta/rc tags.
-release = '0.3.10'
+release = '0.3.11'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/setup.py b/setup.py
index 8c24d6d..9fe8be2 100755
--- a/setup.py
+++ b/setup.py
@@ -5,11 +5,11 @@ from setuptools import setup, find_packages
setup(
name='django-otp',
- version='0.3.10',
+ version='0.3.11',
description='A pluggable framework for adding two-factor authentication to Django using one-time passwords.',
long_description=open('README.rst').read(),
author='Peter Sagerson',
- author_email='psagersDjwublJf at ignorare.net',
+ author_email='psagers at ignorare.net',
packages=find_packages(),
include_package_data=True,
zip_safe=False,
@@ -18,6 +18,9 @@ setup(
install_requires=[
'django >= 1.5.12'
],
+ extras_require={
+ 'qrcode': ['qrcode'],
+ },
classifiers=[
"Development Status :: 5 - Production/Stable",
"Framework :: Django",
--
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