Skip to content

Commit cbfe2ef

Browse files
committed
Merge branch 'master' into development
# Conflicts: # .github/workflows/tests.yaml # .pre-commit-config.yaml # examples/yoti_example_flask/requirements.in # examples/yoti_example_flask/requirements.txt # requirements.in # requirements.txt # setup.py # sonar-project.properties # yoti_python_sdk/version.py
2 parents 3094dd4 + 8f019e3 commit cbfe2ef

File tree

5 files changed

+14
-10
lines changed

5 files changed

+14
-10
lines changed

.github/workflows/tests.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
strategy:
1414
fail-fast: false
1515
matrix:
16-
python-version: [3.6, 3.7, 3.8, 3.9, "3.10"]
16+
python-version: [3.7, 3.8, 3.9, "3.10"]
1717

1818
steps:
1919
- uses: actions/checkout@v2

.pre-commit-config.yaml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
exclude: protobuf/
22
repos:
33
- repo: https://github.com/ambv/black
4-
rev: 847d468b828faff7daae297d8a20d899d2259824
4+
rev: 22.3.0
55
hooks:
66
- id: black
7-
- repo: https://github.com/pre-commit/pre-commit-hooks
8-
rev: v1.2.3
7+
8+
- repo: https://github.com/PyCQA/flake8
9+
rev: 4.0.1
910
hooks:
1011
- id: flake8
1112
args:
12-
- --ignore=E501,W5
13+
- --ignore=E501,W5

examples/yoti_example_flask/requirements.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
click>=7
12
cffi>=1.15.0
23
flask>=1.0.4
34
jinja2>=3.0.3

examples/yoti_example_flask/requirements.txt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# This file is autogenerated by pip-compile with python 3.10
2+
# This file is autogenerated by pip-compile with python 3.9
33
# To update, run:
44
#
55
# pip-compile --output-file=requirements.txt requirements.in
@@ -14,8 +14,10 @@ cffi==1.15.0
1414
# cryptography
1515
chardet==3.0.4
1616
# via requests
17-
click==6.7
18-
# via flask
17+
click==8.1.2
18+
# via
19+
# -r requirements.in
20+
# flask
1921
cryptography==3.2
2022
# via
2123
# pyopenssl

setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@
2020
install_requires=[
2121
"deprecated==1.2.13",
2222
"cryptography>=2.2.1",
23-
"protobuf>=3.1.0",
23+
"protobuf==3.13.0",
2424
"requests>=2.11.1",
2525
"future>=0.18.2",
2626
"asn1==2.2.0",
2727
"pyopenssl>=18.0.0",
2828
"iso8601==1.0.2",
2929
"wheel==0.37.1",
30-
"pytz==2021.3",
30+
"pytz==2022.1",
3131
],
3232
extras_require={
3333
"examples": [

0 commit comments

Comments
 (0)