Update to Flask 1.0

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)

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

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

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

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()

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

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

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 *
 

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

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 *
 

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

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

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