global: flask_cli dependency removal

Signed-off-by: Krzysztof Nowak <k.nowak@cern.ch>
inveniosoftware · Nov 1, 2016 · 0d738c4 · 0d738c4
1 parent 476658d
commit 0d738c4
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 10 deletions.
diff --git a/examples/app.py b/examples/app.py
@@ -37,7 +37,6 @@
 
 from flask import Flask
 from flask_babelex import Babel
-from flask_cli import FlaskCLI
 from invenio_db import InvenioDB, db
 from invenio_pidstore import InvenioPIDStore
 from invenio_records import InvenioRecords
@@ -48,7 +47,6 @@
 # Create Flask application
 app = Flask(__name__)
 Babel(app)
-FlaskCLI(app)
 InvenioDB(app)
 InvenioRecords(app)
 InvenioPIDStore(app)

diff --git a/examples/harvest.py b/examples/harvest.py
@@ -38,7 +38,6 @@
 from flask import Flask
 from flask_babelex import Babel
 from flask_celeryext import create_celery_app
-from flask_cli import FlaskCLI
 from invenio_celery import InvenioCelery
 from invenio_db import InvenioDB, db
 from invenio_jsonschemas import InvenioJSONSchemas
@@ -53,7 +52,6 @@
 # Create Flask application
 app = Flask(__name__)
 Babel(app)
-FlaskCLI(app)
 InvenioDB(app)
 InvenioRecords(app)
 InvenioCelery(app)

diff --git a/invenio_openaire/cli.py b/invenio_openaire/cli.py
@@ -29,7 +29,7 @@
 import os
 
 import click
-from flask_cli import with_appcontext
+from flask.cli import with_appcontext
 
 from invenio_openaire.loaders import OAIREDumper
 from invenio_openaire.tasks import harvest_fundref, harvest_openaire_projects

diff --git a/tests/conftest.py b/tests/conftest.py
@@ -35,7 +35,7 @@
 import pytest
 from elasticsearch.exceptions import RequestError
 from flask import Flask
-from flask_cli import FlaskCLI, ScriptInfo
+from flask.cli import ScriptInfo
 from flask_login import LoginManager
 from invenio_celery import InvenioCelery
 from invenio_db import db as db_
@@ -103,7 +103,6 @@ def app(request):
     app.url_map.converters['pid'] = PIDConverter
     app.url_map.converters['pidpath'] = PIDPathConverter
 
-    FlaskCLI(app)
     LoginManager(app)
     InvenioDB(app)
     InvenioIndexer(app)

diff --git a/tests/test_invenio_openaire.py b/tests/test_invenio_openaire.py
@@ -27,7 +27,6 @@
 from __future__ import absolute_import, print_function
 
 from flask import Flask
-from flask_cli import FlaskCLI
 
 from invenio_openaire import InvenioOpenAIRE
 
@@ -41,12 +40,10 @@ def test_version():
 def test_init():
     """Test extension initialization."""
     app = Flask('testapp')
-    FlaskCLI(app)
     ext = InvenioOpenAIRE(app)
     assert 'invenio-openaire' in app.extensions
 
     app = Flask('testapp')
-    FlaskCLI(app)
     ext = InvenioOpenAIRE()
     assert 'invenio-openaire' not in app.extensions
     ext.init_app(app)