From 1bbdf45731c82f5406a181f920d4d3ebfd1764df Mon Sep 17 00:00:00 2001 From: arielleoren <51782951+arielleoren@users.noreply.github.com> Date: Tue, 7 Jan 2020 17:42:29 +0200 Subject: [PATCH 1/3] Update requirements.txt --- requirements.txt | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/requirements.txt b/requirements.txt index 0382aa2..d4fb3bc 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,16 @@ -Flask==0.9 -Jinja2==2.6 -Werkzeug==0.8.3 -wsgiref==0.1.2 + +astroid==2.2.5 +bottle==0.12.18 +Click==7.0 +Flask==1.1.1 +isort==4.3.21 +itsdangerous==1.1.0 +Jinja2==2.10.3 +lazy-object-proxy==1.4.2 +MarkupSafe==1.1.1 +mccabe==0.6.1 +pylint==2.3.1 +six==1.12.0 +typed-ast==1.4.0 +Werkzeug==0.16.0 +wrapt==1.11.2 From bfa6262241db6cdfa117c986f258bcc68410cbc0 Mon Sep 17 00:00:00 2001 From: arielle Date: Tue, 7 Jan 2020 17:46:51 +0200 Subject: [PATCH 2/3] Update requirements.txt --- requirements.txt | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/requirements.txt b/requirements.txt index 0382aa2..3087cdb 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,15 @@ -Flask==0.9 -Jinja2==2.6 -Werkzeug==0.8.3 -wsgiref==0.1.2 +astroid==2.2.5 +bottle==0.12.18 +Click==7.0 +Flask==1.1.1 +isort==4.3.21 +itsdangerous==1.1.0 +Jinja2==2.10.3 +lazy-object-proxy==1.4.2 +MarkupSafe==1.1.1 +mccabe==0.6.1 +pylint==2.3.1 +six==1.12.0 +typed-ast==1.4.0 +Werkzeug==0.16.0 +wrapt==1.11.2 From 227ef0b2884a6e36ab272a2b5b5ce7a82900e31b Mon Sep 17 00:00:00 2001 From: arielle Date: Tue, 7 Jan 2020 17:51:08 +0200 Subject: [PATCH 3/3] update requirements --- requirements.txt | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/requirements.txt b/requirements.txt index e540a39..29baf29 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,19 +1,3 @@ -<<<<<<< HEAD -======= - ->>>>>>> 1bbdf45731c82f5406a181f920d4d3ebfd1764df -astroid==2.2.5 -bottle==0.12.18 -Click==7.0 Flask==1.1.1 -isort==4.3.21 -itsdangerous==1.1.0 Jinja2==2.10.3 -lazy-object-proxy==1.4.2 -MarkupSafe==1.1.1 -mccabe==0.6.1 -pylint==2.3.1 -six==1.12.0 -typed-ast==1.4.0 Werkzeug==0.16.0 -wrapt==1.11.2