Skip to content

Commit 2274887

Browse files
committed
SDK-442: Add prerequisite instructions to README, move Django & Flask requirements to their respective requirements files, bump version
1 parent a4c1c8e commit 2274887

File tree

8 files changed

+57
-67
lines changed

8 files changed

+57
-67
lines changed

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,9 @@ To run the Flask or Django container:
234234

235235
### Running Locally
236236

237-
Both example applications utilise the env variables described in [Configuration](#configuration), make sure they are accessible.
237+
1. Both example applications utilise the env variables described in [Configuration](#configuration), make sure they are accessible.
238+
1. Ensure pip is up to date: `easy_install --upgrade pip`
239+
1. Ensure setuptools and wheel are up to date: `python -m pip install --upgrade setuptools wheel`
238240

239241
#### Flask
240242

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
Django>=1.11
2-
yoti
2+
yoti>=2.4.0
33
python-dotenv>=0.7.1
44
django-sslserver
Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
1-
#
2-
# This file is autogenerated by pip-compile
3-
# To update, run:
4-
#
5-
# pip-compile --output-file requirements.txt requirements.in
6-
#
7-
asn1crypto==0.24.0 # via cryptography
8-
certifi==2018.4.16 # via requests
9-
cffi==1.11.5 # via cryptography
10-
chardet==3.0.4 # via requests
11-
cryptography==2.2.2 # via yoti
12-
django-sslserver==0.20
13-
django==1.11
14-
future==0.16.0 # via yoti
15-
idna==2.7 # via cryptography, requests
16-
protobuf==3.6.0 # via yoti
17-
pycparser==2.18 # via cffi
18-
python-dotenv==0.8.2
19-
pytz==2018.4 # via django
20-
requests==2.19.1 # via yoti
21-
six==1.11.0 # via cryptography, protobuf
22-
urllib3==1.23 # via requests
23-
yoti==2.2.0
1+
#
2+
# This file is autogenerated by pip-compile
3+
# To update, run:
4+
#
5+
# pip-compile --output-file requirements.txt requirements.in
6+
#
7+
asn1crypto==0.24.0 # via cryptography
8+
certifi==2018.4.16 # via requests
9+
cffi==1.11.5 # via cryptography
10+
chardet==3.0.4 # via requests
11+
cryptography==2.2.2 # via yoti
12+
django-sslserver==0.20
13+
django==1.11
14+
future==0.16.0 # via yoti
15+
idna==2.7 # via cryptography, requests
16+
protobuf==3.6.0 # via yoti
17+
pycparser==2.18 # via cffi
18+
python-dotenv==0.8.2
19+
pytz==2018.4 # via django
20+
requests==2.19.1 # via yoti
21+
six==1.11.0 # via cryptography, protobuf
22+
urllib3==1.23 # via requests
23+
yoti==2.4.0
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
flask>=0.10
2-
yoti
2+
yoti>=2.4.0
33
python-dotenv>=0.7.1
44
pyopenssl
Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
1-
#
2-
# This file is autogenerated by pip-compile
3-
# To update, run:
4-
#
5-
# pip-compile --output-file requirements.txt requirements.in
6-
#
7-
asn1crypto==0.24.0 # via cryptography
8-
certifi==2018.4.16 # via requests
9-
cffi==1.11.5 # via cryptography
10-
chardet==3.0.4 # via requests
11-
click==6.7 # via flask
12-
cryptography==2.2.2 # via pyopenssl, yoti
13-
flask==1.0.2
14-
future==0.16.0 # via yoti
15-
idna==2.7 # via cryptography, requests
16-
itsdangerous==0.24 # via flask
17-
jinja2==2.10 # via flask
18-
markupsafe==1.0 # via jinja2
19-
protobuf==3.6.0 # via yoti
20-
pycparser==2.18 # via cffi
21-
pyopenssl==18.0.0
22-
python-dotenv==0.8.2
23-
requests==2.19.1 # via yoti
24-
six==1.11.0 # via cryptography, protobuf, pyopenssl
25-
urllib3==1.23 # via requests
26-
werkzeug==0.14.1 # via flask
27-
yoti==2.2.0
1+
#
2+
# This file is autogenerated by pip-compile
3+
# To update, run:
4+
#
5+
# pip-compile --output-file requirements.txt requirements.in
6+
#
7+
asn1crypto==0.24.0 # via cryptography
8+
certifi==2018.4.16 # via requests
9+
cffi==1.11.5 # via cryptography
10+
chardet==3.0.4 # via requests
11+
click==6.7 # via flask
12+
cryptography==2.2.2 # via pyopenssl, yoti
13+
flask==1.0.2
14+
future==0.16.0 # via yoti
15+
idna==2.7 # via cryptography, requests
16+
itsdangerous==0.24 # via flask
17+
jinja2==2.10 # via flask
18+
markupsafe==1.0 # via jinja2
19+
protobuf==3.6.0 # via yoti
20+
pycparser==2.18 # via cffi
21+
pyopenssl==18.0.0
22+
python-dotenv==0.8.2
23+
requests==2.19.1 # via yoti
24+
six==1.11.0 # via cryptography, protobuf, pyopenssl
25+
urllib3==1.23 # via requests
26+
werkzeug==0.14.1 # via flask
27+
yoti==2.4.0

requirements.in

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,14 @@
11
asn1==2.2.0
22
click==6.6
33
cryptography>=2.2.1
4-
Django==1.11
5-
flask==0.11.1
64
itsdangerous==0.24
7-
Jinja2==2.8
8-
MarkupSafe==0.23
95
mock==2.0.0
106
pbr==1.10.0
117
protobuf==3.1.0.post1
128
pyopenssl==18.0.0
139
pytest==3.3.2
1410
requests>=2.11.1
15-
six==1.10.0
1611
tox>=1.7.2
1712
virtualenv==13.1.2
1813
future==0.15.2
19-
Werkzeug==0.11.15
2014
wheel==0.24.0

requirements.txt

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,9 @@ cffi==1.11.5 # via cryptography
1111
click==6.6
1212
colorama==0.3.9 # via pytest
1313
cryptography==2.2.2
14-
django==1.11
15-
flask==0.11.1
1614
future==0.15.2
1715
idna==2.7 # via cryptography
1816
itsdangerous==0.24
19-
jinja2==2.8
20-
markupsafe==0.23
2117
mock==2.0.0
2218
pbr==1.10.0
2319
pluggy==0.6.0 # via pytest, tox
@@ -26,10 +22,8 @@ py==1.5.3 # via pytest, tox
2622
pycparser==2.18 # via cffi
2723
pyopenssl==18.0.0
2824
pytest==3.3.2
29-
pytz==2018.4 # via django
3025
requests==2.11.1
31-
six==1.10.0
26+
six==1.10.0 # via cryptography, mock, protobuf, pyopenssl, pytest, tox
3227
tox==3.0.0
3328
virtualenv==13.1.2
34-
werkzeug==0.11.15
3529
wheel==0.24.0

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# -*- coding: utf-8 -*-
22
from setuptools import setup, find_packages
33

4-
VERSION = '2.3.0'
4+
VERSION = '2.4.0'
55
long_description = 'This package contains the tools you need to quickly ' \
66
'integrate your Python back-end with Yoti, so that your ' \
77
'users can share their identity details with your ' \

0 commit comments

Comments
 (0)