From e37c90b1db408f9d4ae1bd29714224fa08b9f436 Mon Sep 17 00:00:00 2001 From: Boldizs Peter Date: Wed, 30 Mar 2022 14:07:50 +0200 Subject: [PATCH 1/5] update deps --- Dockerfile | 2 +- app/requirements.txt | 18 ++++++++---------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index a738bd2..e561422 100755 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3-alpine +FROM python:3.10-alpine MAINTAINER Peter Fisher diff --git a/app/requirements.txt b/app/requirements.txt index e10d0f4..7f42ea2 100644 --- a/app/requirements.txt +++ b/app/requirements.txt @@ -3,27 +3,25 @@ attrs==18.2.0 blinker==1.4 certifi==2018.10.15 chardet==3.0.4 -Click==7.0 dominate==2.3.4 -Flask==1.0.2 Flask-Bootstrap==3.3.7.1 Flask-Login==0.4.1 Flask-SQLAlchemy==2.3.2 Flask-WTF==0.14.2 idna==2.7 -ItsDangerous==1.1.0 -MarkupSafe==1.1.1 -Jinja2==2.10.1 more-itertools==4.3.0 mysql-connector==2.2.9 -passlib==1.7.1 -pluggy==0.8.0 -py==1.7.0 +flask-swagger-ui==3.18.0 pytest==3.9.1 requests==2.20.0 six==1.11.0 -SQLAlchemy==1.3.0 +SQLAlchemy==1.2.8 urllib3==1.24.2 visitor==0.1.3 -Werkzeug==0.16.1 WTForms==2.1 +click==8.0.4 +Flask==2.0.3 +itsdangerous==2.1.2 +Jinja2==3.1.1 +MarkupSafe==2.1.1 +Werkzeug==2.0.3 From c884431e742f37bee601b54ebd347a17b0a4cc74 Mon Sep 17 00:00:00 2001 From: Boldizs Peter Date: Wed, 30 Mar 2022 15:32:05 +0200 Subject: [PATCH 2/5] updated and fixed dependencies --- app/frontend/forms.py | 2 +- app/requirements.txt | 45 +++++++++++++++++++++++-------------------- 2 files changed, 25 insertions(+), 22 deletions(-) diff --git a/app/frontend/forms.py b/app/frontend/forms.py index 998d317..00655cd 100644 --- a/app/frontend/forms.py +++ b/app/frontend/forms.py @@ -1,5 +1,5 @@ from flask_wtf import FlaskForm -from wtforms import StringField, PasswordField, SubmitField, HiddenField, IntegerField, SelectField +from wtforms import StringField, PasswordField, SubmitField, HiddenField, IntegerField from wtforms.validators import DataRequired, Email diff --git a/app/requirements.txt b/app/requirements.txt index 7f42ea2..a92e27b 100644 --- a/app/requirements.txt +++ b/app/requirements.txt @@ -1,27 +1,30 @@ -atomicwrites==1.2.1 -attrs==18.2.0 +atomicwrites==1.4.0 +attrs==21.4.0 blinker==1.4 -certifi==2018.10.15 -chardet==3.0.4 -dominate==2.3.4 -Flask-Bootstrap==3.3.7.1 -Flask-Login==0.4.1 -Flask-SQLAlchemy==2.3.2 -Flask-WTF==0.14.2 -idna==2.7 -more-itertools==4.3.0 +certifi==2021.10.8 +chardet==4.0.0 +dominate==2.6.0 +Flask-Login==0.5.0 +Flask-SQLAlchemy==2.5.1 +flask-swagger-ui==3.36.0 +Flask-Bootstrap>=3.3 +Flask-WTF>=0.14 +wtforms[email]==2.3.1 +idna==3.3 +more-itertools==8.12.0 mysql-connector==2.2.9 -flask-swagger-ui==3.18.0 -pytest==3.9.1 -requests==2.20.0 -six==1.11.0 -SQLAlchemy==1.2.8 -urllib3==1.24.2 +passlib==1.7.4 +pluggy==1.0.0 +py==1.11.0 +pytest==7.1.1 +requests==2.27.1 +six==1.16.0 +SQLAlchemy==1.4.32 +urllib3==1.26.9 visitor==0.1.3 -WTForms==2.1 -click==8.0.4 -Flask==2.0.3 +click==8.1.0 +Flask==2.1.0 itsdangerous==2.1.2 Jinja2==3.1.1 MarkupSafe==2.1.1 -Werkzeug==2.0.3 +Werkzeug~=2.0.0 From ee8d080b656e061c5af4afdf314b17bae3cbfd61 Mon Sep 17 00:00:00 2001 From: Boldizs Peter Date: Thu, 31 Mar 2022 12:34:02 +0200 Subject: [PATCH 3/5] Downgraded to Flask-Login==0.4.1 --- app/app.py | 6 ++---- app/requirements.txt | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/app/app.py b/app/app.py index fef71f9..c4a025e 100644 --- a/app/app.py +++ b/app/app.py @@ -1,4 +1,4 @@ -from flask import Blueprint, Flask +from flask import Flask from flask_login import LoginManager from flask_bootstrap import Bootstrap from frontend import frontend_blueprint @@ -11,14 +11,12 @@ bootstrap = Bootstrap(app) - app.config.update(dict( SECRET_KEY="powerful secretkey", WTF_CSRF_SECRET_KEY="a csrf secret key", - PRODUCT_SERVICE= 'http://192.168.99.100:8081' + PRODUCT_SERVICE='http://0.0.0.0:8081' )) app.register_blueprint(frontend_blueprint) app.run(debug=True, host='0.0.0.0') - diff --git a/app/requirements.txt b/app/requirements.txt index a92e27b..2770d3f 100644 --- a/app/requirements.txt +++ b/app/requirements.txt @@ -4,7 +4,7 @@ blinker==1.4 certifi==2021.10.8 chardet==4.0.0 dominate==2.6.0 -Flask-Login==0.5.0 +Flask-Login==0.4.1 Flask-SQLAlchemy==2.5.1 flask-swagger-ui==3.36.0 Flask-Bootstrap>=3.3 From 52e542b1da482464d447bde4b8bc52e68980a206 Mon Sep 17 00:00:00 2001 From: Boldizs Peter Date: Thu, 31 Mar 2022 12:42:38 +0200 Subject: [PATCH 4/5] fix .gitignore files --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 719aa17..b65f591 100755 --- a/.gitignore +++ b/.gitignore @@ -2,5 +2,5 @@ venv/* env/ **/*.pytest_cache -**/__pycache__ +app/__pycache__ **/.DS_Store \ No newline at end of file From 9d423fffc6f1f3e78d9a307d111b11877cba0731 Mon Sep 17 00:00:00 2001 From: Boldizs Peter Date: Thu, 31 Mar 2022 12:46:07 +0200 Subject: [PATCH 5/5] fix .gitignore files - 2 --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index b65f591..d75cb60 100755 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,6 @@ venv/* env/ **/*.pytest_cache app/__pycache__ +app/frontend/__pycache__/ +app/frontend/api/__pycache__/ **/.DS_Store \ No newline at end of file