Browse Source

Add support for Flask 2.0 and update some dependencies

Click 8 is not supported due to celery pinning click < 8
SQLAlchemy 1.4 is at the moment not supported by Flask-Whooshee
Peter Justin 3 years ago
parent
commit
ff04cb17d9
3 changed files with 39 additions and 28 deletions
  1. 6 1
      flaskbb/cli/main.py
  2. 32 26
      requirements.txt
  3. 1 1
      setup.py

+ 6 - 1
flaskbb/cli/main.py

@@ -74,7 +74,12 @@ class FlaskBBGroup(FlaskGroup):
         return super(FlaskBBGroup, self).list_commands(ctx)
         return super(FlaskBBGroup, self).list_commands(ctx)
 
 
 
 
-def make_app(script_info):
+def make_app():
+    ctx = click.get_current_context(silent=True)
+    script_info = None
+    if ctx is not None:
+        script_info = ctx.obj
+
     config_file = getattr(script_info, "config_file", None)
     config_file = getattr(script_info, "config_file", None)
     instance_path = getattr(script_info, "instance_path", None)
     instance_path = getattr(script_info, "instance_path", None)
     return create_app(config_file, instance_path)
     return create_app(config_file, instance_path)

+ 32 - 26
requirements.txt

@@ -1,19 +1,22 @@
-alembic==1.5.8
-amqp==5.0.5
-attrs==20.3.0
-Babel==2.9.0
-billiard==3.6.3.0
+alembic==1.6.5
+amqp==5.0.6
+attrs==21.2.0
+Babel==2.9.1
+billiard==3.6.4.0
 blinker==1.4
 blinker==1.4
-celery==5.0.5
-certifi==2020.12.5
-chardet==3.0.4
+celery==5.1.2
+certifi==2021.5.30
+chardet==4.0.0
 click==7.1.2
 click==7.1.2
+click-didyoumean==0.0.3
 click-log==0.3.2
 click-log==0.3.2
+click-plugins==1.1.1
+click-repl==0.2.0
 dnspython==2.1.0
 dnspython==2.1.0
-email-validator==1.1.2
-Flask==1.1.2
+email-validator==1.1.3
+Flask==2.0.1
 Flask-Alembic==2.0.1
 Flask-Alembic==2.0.1
-git+https://github.com/justanr/flask-allows.git@f/Cut-down-on-warnings#egg=flask-allows
+git+https://github.com/flaskbb/flask-allows.git@master#egg=flask-allows
 Flask-BabelPlus==2.2.0
 Flask-BabelPlus==2.2.0
 Flask-Caching==1.10.1
 Flask-Caching==1.10.1
 Flask-DebugToolbar==0.11.0
 Flask-DebugToolbar==0.11.0
@@ -25,36 +28,39 @@ flask-redis==0.4.0
 Flask-SQLAlchemy==2.5.1
 Flask-SQLAlchemy==2.5.1
 Flask-Themes2==0.1.5
 Flask-Themes2==0.1.5
 flask-whooshee==0.7.0
 flask-whooshee==0.7.0
-Flask-WTF==0.14.3
+Flask-WTF==0.15.1
 flaskbb-plugin-conversations==1.0.7
 flaskbb-plugin-conversations==1.0.7
 flaskbb-plugin-portal==1.1.3
 flaskbb-plugin-portal==1.1.3
 future==0.18.2
 future==0.18.2
+greenlet==1.1.0
 idna==2.10
 idna==2.10
-itsdangerous==1.1.0
-Jinja2==2.11.3
-kombu==5.0.2
+itsdangerous==2.0.1
+Jinja2==3.0.1
+kombu==5.1.0
 limits==1.5.1
 limits==1.5.1
 Mako==1.1.4
 Mako==1.1.4
-MarkupSafe==1.1.1
+MarkupSafe==2.0.1
 mistune==0.8.4
 mistune==0.8.4
 olefile==0.46
 olefile==0.46
-Pillow==8.1.2
+Pillow==8.2.0
 pluggy==0.13.1
 pluggy==0.13.1
-Pygments==2.8.1
+prompt-toolkit==3.0.19
+Pygments==2.9.0
 python-dateutil==2.8.1
 python-dateutil==2.8.1
 python-editor==1.0.4
 python-editor==1.0.4
-pytz==2020.4
+pytz==2021.1
 redis==3.5.3
 redis==3.5.3
-requests==2.25.0
+requests==2.25.1
 simplejson==3.17.2
 simplejson==3.17.2
-six==1.15.0
+six==1.16.0
 speaklater==1.3
 speaklater==1.3
-SQLAlchemy==1.3.20
-SQLAlchemy-Utils==0.36.8
-Unidecode==1.1.1
-urllib3==1.26.4
+SQLAlchemy==1.3.24
+SQLAlchemy-Utils==0.37.8
+Unidecode==1.2.0
+urllib3==1.26.6
 vine==5.0.0
 vine==5.0.0
-Werkzeug==1.0.1
+wcwidth==0.2.5
+Werkzeug==2.0.1
 Whoosh==2.7.4
 Whoosh==2.7.4
 WTForms==2.3.3
 WTForms==2.3.3
 WTForms-SQLAlchemy==0.2
 WTForms-SQLAlchemy==0.2

+ 1 - 1
setup.py

@@ -29,7 +29,7 @@ install_requires = [
     "email-validator>=1.1.2",
     "email-validator>=1.1.2",
     "Flask>=1.1.2",
     "Flask>=1.1.2",
     "Flask-Alembic>=2.0.1",
     "Flask-Alembic>=2.0.1",
-    "flask-allows @ git+https://github.com/justanr/flask-allows.git@f/Cut-down-on-warnings#egg=flask-allows",
+    "flask-allows @ git+https://github.com/flaskbb/flask-allows.git@master#egg=flask-allows",
     "Flask-BabelPlus>=2.2.0",
     "Flask-BabelPlus>=2.2.0",
     "Flask-Caching>=1.9.0",
     "Flask-Caching>=1.9.0",
     "Flask-DebugToolbar>=0.11.0",
     "Flask-DebugToolbar>=0.11.0",