Update to Flask 1.0

diff --git a/app/__init__.py b/app/__init__.py
index b7913f54a11b77794a541060cda0301d1c637a9a..6993952e656060aeaa43796ba98d7c7f0d89164e 100644 (file)
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -20,7 +20,7 @@ from flask_user import *
 from flask_gravatar import Gravatar
 import flask_menu as menu
 from flask_mail import Mail
-from flask.ext import markdown
+from flaskext.markdown import Markdown
 from flask_github import GitHub
 from flask_wtf.csrf import CsrfProtect
 from flask_flatpages import FlatPages
@@ -32,7 +32,7 @@ app.config["FLATPAGES_EXTENSION"] = ".md"
 app.config.from_pyfile(os.environ["FLASK_CONFIG"])
 
 menu.Menu(app=app)
-markdown.Markdown(app, extensions=["fenced_code"], safe_mode=True, output_format="html5")
+Markdown(app, extensions=["fenced_code"], safe_mode=True, output_format="html5")
 github = GitHub(app)
 csrf = CsrfProtect(app)
 mail = Mail(app)

diff --git a/app/tasks/__init__.py b/app/tasks/__init__.py
index 8fa75aae6234fb2a5b36b3c69ac8a5e14c56f297..fb62cb08398af0461f081c867facba315cd2d785 100644 (file)
--- a/app/tasks/__init__.py
+++ b/app/tasks/__init__.py
@@ -16,7 +16,7 @@
 
 
 import flask
-from flask.ext.sqlalchemy import SQLAlchemy
+from flask_sqlalchemy import SQLAlchemy
 from celery import Celery
 from celery.schedules import crontab
 from app import app

diff --git a/app/tasks/forumtasks.py b/app/tasks/forumtasks.py
index 8327a17eba67c2648fa600d76481a04038b9e41c..1df6d2bd25c5a8c5b0a92f4963a99a71d73a2e54 100644 (file)
--- a/app/tasks/forumtasks.py
+++ b/app/tasks/forumtasks.py
@@ -16,7 +16,7 @@
 
 
 import flask, json, re
-from flask.ext.sqlalchemy import SQLAlchemy
+from flask_sqlalchemy import SQLAlchemy
 from app import app
 from app.models import *
 from app.tasks import celery

diff --git a/app/tasks/importtasks.py b/app/tasks/importtasks.py
index c3f865750ba106b27acaff834dc0c74ea9706dbb..dc46f46212721d18858de475a5e4444978781fa9 100644 (file)
--- a/app/tasks/importtasks.py
+++ b/app/tasks/importtasks.py
@@ -17,7 +17,7 @@
 
 import flask, json, os, git, tempfile, shutil
 from git import GitCommandError
-from flask.ext.sqlalchemy import SQLAlchemy
+from flask_sqlalchemy import SQLAlchemy
 from urllib.error import HTTPError
 import urllib.request
 from urllib.parse import urlparse, quote_plus, urlsplit

diff --git a/app/views/__init__.py b/app/views/__init__.py
index 6b4f37ff3e9e0a744d5c12a887431c0b540d7fe9..4f45909d2aaea337ee8441d25893fb082e060b2c 100644 (file)
--- a/app/views/__init__.py
+++ b/app/views/__init__.py
@@ -18,11 +18,8 @@
 from app import app, pages
 from flask import *
 from flask_user import *
-from flask_login import login_user, logout_user
 from app.models import *
 import flask_menu as menu
-from flask.ext import markdown
-from sqlalchemy import func
 from werkzeug.contrib.cache import SimpleCache
 from urllib.parse import urlparse
 cache = SimpleCache()

diff --git a/app/views/admin.py b/app/views/admin.py
index 029d4c98a1dc38891c78f7556c9f845827540496..d370b693637e794add13ac7c5888017172c7d85a 100644 (file)
--- a/app/views/admin.py
+++ b/app/views/admin.py
@@ -17,7 +17,7 @@
 
 from flask import *
 from flask_user import *
-from flask.ext import menu
+import flask_menu as menu
 from app import app
 from app.models import *
 from celery import uuid

diff --git a/app/views/packages/__init__.py b/app/views/packages/__init__.py
index d8bebfbd118aa95d7d9e15a5b484d8d704042579..acd69a8677932ba7d5ddc5d7885c760c504a91e2 100644 (file)
--- a/app/views/packages/__init__.py
+++ b/app/views/packages/__init__.py
@@ -17,7 +17,7 @@
 
 from flask import *
 from flask_user import *
-from flask.ext import menu
+import flask_menu as menu
 from app import app
 from app.models import *
 from app.tasks.importtasks import importRepoScreenshot, makeVCSRelease

diff --git a/app/views/packages/editrequests.py b/app/views/packages/editrequests.py
index e071745cdaf1b91b5a253ce0ef90dbae77dc1738..7b52184d28023eaa8a32a81a7223093a6cf5228b 100644 (file)
--- a/app/views/packages/editrequests.py
+++ b/app/views/packages/editrequests.py
@@ -17,7 +17,6 @@
 
 from flask import *
 from flask_user import *
-from flask.ext import menu
 from app import app
 from app.models import *
 

diff --git a/app/views/packages/releases.py b/app/views/packages/releases.py
index 2aeca24bbdf00837350f70bc2ffefc45f1dbd132..b314b810c2d6d5b8670f0d6d4dd20f4c30ebbc24 100644 (file)
--- a/app/views/packages/releases.py
+++ b/app/views/packages/releases.py
@@ -17,7 +17,6 @@
 
 from flask import *
 from flask_user import *
-from flask.ext import menu
 from app import app
 from app.models import *
 from app.tasks.importtasks import makeVCSRelease

diff --git a/app/views/packages/todo.py b/app/views/packages/todo.py
index 314c3741bda378c4402dcb2315b25dcb926ec6ff..746ca61da9bd9d7b073593a7915ebe864fd0a659 100644 (file)
--- a/app/views/packages/todo.py
+++ b/app/views/packages/todo.py
@@ -17,7 +17,7 @@
 
 from flask import *
 from flask_user import *
-from flask.ext import menu
+import flask_menu as menu
 from app import app
 from app.models import *
 

diff --git a/app/views/tasks.py b/app/views/tasks.py
index acfa93018c01270231907084abf87972ab4ebd90..20eaef567c332e9057783e0c737bdc4362fc5cf1 100644 (file)
--- a/app/views/tasks.py
+++ b/app/views/tasks.py
@@ -17,7 +17,7 @@
 
 from flask import *
 from flask_user import *
-from flask.ext import menu
+import flask_menu as menu
 from app import app, csrf
 from app.models import *
 from app.tasks import celery, TaskError

diff --git a/app/views/users.py b/app/views/users.py
index a96fce2f63db71acee6982e408c475bdbbc45cb3..7c8cfddf386f35eca2850f0e51dce117b948c2c6 100644 (file)
--- a/app/views/users.py
+++ b/app/views/users.py
@@ -18,14 +18,12 @@
 from flask import *
 from flask_user import *
 from flask_login import login_user, logout_user
-from flask.ext import menu
 from app import app
 from app.models import *
 from flask_wtf import FlaskForm
-from flask_user.forms import RegisterForm
 from wtforms import *
 from wtforms.validators import *
-from app.utils import rank_required, randomString, loginUser
+from app.utils import randomString, loginUser
 from app.tasks.forumtasks import checkForumAccount
 from app.tasks.emails import sendVerifyEmail
 from app.tasks.phpbbparser import getProfile

diff --git a/requirements.txt b/requirements.txt
index 2564d6db22854bcd178484cbb983ac89474b0995..622232a8b720a1ca83a7b37548f3e56e181c1546 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,17 +1,18 @@
-Flask>=0.12.2,<1.0
-Flask-SQLAlchemy>=2.3
-Flask-Login>=0.4.1
-Flask-User==0.6.19
-Flask-Menu>=0.7.0
-Flask-Markdown>=0.3
-GitHub-Flask>=3.2.0
-pyScss==1.3.4
-celery==4.1.1
-redis==2.10.6
-beautifulsoup4==4.6.0
-lxml==4.2.1
-Flask-FlatPages==0.6
-Flask-Migrate==2.1.1
-pillow==5.1.0
-GitPython==2.1.10
-Flask-Gravatar=0.5.0
+Flask~=1.0
+Flask-FlatPages~=0.7
+Flask-Gravatar~=0.5
+Flask-Login~=0.4.1
+Flask-Markdown~=0.3
+Flask-Menu~=0.7
+Flask-Migrate~=2.3
+Flask-SQLAlchemy~=2.3
+Flask-User~=0.6
+GitHub-Flask~=3.2
+
+beautifulsoup4~=4.6
+celery~=4.2
+GitPython~=2.1
+lxml~=4.2
+pillow~=5.3
+pyScss~=1.3
+redis~=3.0