Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit930b547

Browse files
Merge branch 'master' into master
2 parents13ebce9 +8f0e701 commit930b547

File tree

7 files changed

+56
-57
lines changed

7 files changed

+56
-57
lines changed
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
from __future__importunicode_literals
2+
3+
fromdjango.dbimportmigrations
4+
fromdjango.dbimportmodels
5+
6+
7+
classMigration(migrations.Migration):
8+
9+
dependencies= [
10+
('django_mfa','0002_auto_20160706_1421'),
11+
]
12+
13+
operations= [
14+
migrations.AlterField(
15+
model_name='UserRecoveryCodes',
16+
name='secret_code',
17+
field=models.CharField(max_length=16),
18+
),
19+
]

‎django_mfa/models.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ class UserRecoveryCodes(models.Model):
2929
secret_code=models.CharField(max_length=MFA_RECOVERY_CODE_LENGTH)
3030

3131

32+
3233
classU2FKey(models.Model):
3334
user=models.ForeignKey(settings.AUTH_USER_MODEL,related_name='u2f_keys',
3435
on_delete=models.CASCADE)

‎django_mfa/static/django_u2f/u2f-api.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ var js_api_version;
3737

3838

3939
/**
40-
* Message types formesssages to/from the extension
40+
* Message types formessages to/from the extension
4141
*@const
4242
*@enum {string}
4343
*/

‎docs/conf.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@
5757
# built documents.
5858
#
5959
# The short X.Y version.
60-
version='2.0'
60+
version='2.1'
6161
# The full version, including alpha/beta/rc tags.
62-
release='2.0'
62+
release='2.1'
6363

6464
# The language for content autogenerated by Sphinx. Refer to documentation
6565
# for a list of supported languages.
@@ -346,9 +346,9 @@
346346
# built documents.
347347
#
348348
# The short X.Y version.
349-
version='2.0'
349+
version='2.1'
350350
# The full version, including alpha/beta/rc tags.
351-
release='2.0'
351+
release='2.1'
352352

353353
# The language for content autogenerated by Sphinx. Refer to documentation
354354
# for a list of supported languages.

‎requirements.txt‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1-
Django==2.1.5
2-
-rsandbox/requirements.txt
1+
Django>=2.2.19
2+
black==20.8b1
3+
-rsandbox/requirements.txt

‎sandbox/requirements.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
asn1crypto==0.24.0
22
cffi==1.12.2
3-
cryptography==2.6.1
3+
cryptography==3.3.2
44
dj-database-url==0.4.1
55
Django==2.1.5
66
django-argonauts==1.2.0

‎setup.py‎

Lines changed: 27 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,71 +1,49 @@
11
importos
22
fromsetuptoolsimportsetup
33

4-
withopen(os.path.join(os.path.dirname(__file__),'README.rst'))asreadme:
4+
withopen(os.path.join(os.path.dirname(__file__),"README.rst"))asreadme:
55
README=readme.read()
66

77
# allow setup.py to be run from any path
88
os.chdir(os.path.normpath(os.path.join(os.path.abspath(__file__),os.pardir)))
9-
PROJECT_NAME='django-mfa'
9+
PROJECT_NAME="django-mfa"
1010

1111
data_files= []
1212
fordirpath,dirnames,filenamesinos.walk(PROJECT_NAME):
1313
fori,dirnameinenumerate(dirnames):
14-
ifdirname.startswith('.'):
14+
ifdirname.startswith("."):
1515
deldirnames[i]
16-
if'__init__.py'infilenames:
16+
if"__init__.py"infilenames:
1717
continue
1818
eliffilenames:
1919
forfinfilenames:
20-
data_files.append(os.path.join(
21-
dirpath[len(PROJECT_NAME)+1:],f))
22-
23-
install_requires= [
24-
'asn1crypto==0.24.0',
25-
'cffi==1.12.2',
26-
'cryptography==2.6.1',
27-
'dj-database-url==0.4.1',
28-
'Django<=2.1.5',
29-
'django-argonauts==1.2.0',
30-
'django-debug-toolbar==1.11',
31-
'gunicorn==19.6.0',
32-
'psycopg2==2.7',
33-
'pycparser==2.19',
34-
'python-u2flib-server==5.0.0',
35-
'pytz==2018.9',
36-
'qrcode==6.1',
37-
'six==1.12.0',
38-
'sqlparse==0.3.0',
39-
'whitenoise==3.1',
40-
]
20+
data_files.append(os.path.join(dirpath[len(PROJECT_NAME)+1 :],f))
4121

4222
setup(
43-
name='django-mfa',
44-
version='2.0',
45-
packages=['django_mfa','django_mfa.templatetags','django_mfa.migrations'],
23+
name="django-mfa",
24+
version="2.1",
25+
packages=["django_mfa","django_mfa.templatetags","django_mfa.migrations"],
4626
include_package_data=True,
47-
description='A Django deployment package for all hosting types.',
27+
description="A Django deployment package for all hosting types.",
4828
long_description=README,
49-
url='https://github.com/MicroPyramid/django-mfa',
50-
author='Micropyramid',
51-
author_email='hello@micropyramid.com',
52-
install_requires=install_requires,
29+
url="https://github.com/MicroPyramid/django-mfa",
30+
author="Micropyramid",
31+
author_email="hello@micropyramid.com",
5332
classifiers=[
54-
'Environment :: Web Environment',
55-
'Framework :: Django',
56-
'Intended Audience :: Developers',
57-
'Operating System :: OS Independent',
58-
'License :: OSI Approved :: MIT License',
59-
'Programming Language :: Python',
60-
'Programming Language :: Python :: 2.7',
61-
'Programming Language :: Python :: 3',
62-
'Programming Language :: Python :: 3.2',
63-
'Programming Language :: Python :: 3.3',
64-
'Topic :: Internet :: WWW/HTTP',
65-
'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
66-
'Framework :: Django',
67-
'Framework :: Django :: 1.11',
68-
'Framework :: Django :: 2.0',
69-
'Framework :: Django :: 2.1',
33+
"Environment :: Web Environment",
34+
"Framework :: Django",
35+
"Intended Audience :: Developers",
36+
"Operating System :: OS Independent",
37+
"License :: OSI Approved :: MIT License",
38+
"Programming Language :: Python",
39+
"Programming Language :: Python :: 2.7",
40+
"Programming Language :: Python :: 3",
41+
"Programming Language :: Python :: 3.2",
42+
"Programming Language :: Python :: 3.3",
43+
"Topic :: Internet :: WWW/HTTP",
44+
"Topic :: Internet :: WWW/HTTP :: Dynamic Content",
45+
],
46+
install_requires=[
47+
"Django>=2.2.19",
7048
],
7149
)

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp