Merge branch 'fix/dependencies-flask-requests'

kawa-kokosowa · Nov 11, 2018 · 90e151f · 90e151f
2 parents f0fe253 + 7827bcd
commit 90e151f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/bubblebbs/moderate.py b/bubblebbs/moderate.py
@@ -6,12 +6,13 @@
 import typing
 
 from flask import Flask, url_for, redirect, render_template, request
-from flask.ext.sqlalchemy import SQLAlchemy
+from flask_sqlalchemy import SQLAlchemy
 from wtforms import form, fields, validators
-from flask.ext import admin, login
+import flask_admin as admin
+import flask_login as login
 from sqlalchemy.exc import IntegrityError
-from flask.ext.admin.contrib import sqla
-from flask.ext.admin import helpers, expose
+from flask_admin.contrib import sqla
+from flask_admin import helpers, expose
 from werkzeug.security import generate_password_hash, check_password_hash
 from jinja2 import Markup
 

diff --git a/requirements.txt b/requirements.txt
@@ -5,7 +5,7 @@ bleach==2.1.3
 bs4==0.0.1
 click==6.7
 colorhash==1.0.2
-Flask==0.12.2
+Flask==1.0.2
 Flask-Admin==1.5.1
 Flask-Limiter==1.0.1
 Flask-Login==0.4.1
@@ -26,7 +26,7 @@ py==1.5.3
 pymojihash==0.4.0
 pytest==3.5.0
 redis==2.10.6
-requests==2.6.0
+requests==2.20.1
 scrypt==0.8.6
 six==1.9.0
 SQLAlchemy==1.2.5