global: package compatibility improvements

Signed-off-by: Jiri Kuncar <jiri.kuncar@cern.ch>

MANIFEST.in

@@ -27,8 +27,6 @@ include *.sh
 include *.txt
 include .dockerignore
 include .editorconfig
-include .tx/config
-include babel.ini
 include LICENSE
 include pytest.ini
 recursive-include docs *.bat
@@ -38,7 +36,6 @@ recursive-include docs Makefile
 recursive-include examples *.json
 recursive-include examples *.py
 recursive-include examples *.sh
-recursive-include invenio_indexer *.po *.pot *.mo
 recursive-include invenio_indexer *.py
 recursive-include tests *.json
 recursive-include tests *.py

docs/conf.py

@@ -328,7 +328,9 @@
 
 
 # Example configuration for intersphinx: refer to the Python standard library.
-intersphinx_mapping = {'https://docs.python.org/': None}
-
+intersphinx_mapping = {
+    'python': ('https://docs.python.org/', None),
+    'kombu': ('http://docs.celeryproject.org/projects/kombu/en/latest/', None),
+}
 # Autodoc configuraton.
 autoclass_content = 'both'

examples/app.py

@@ -48,7 +48,6 @@
 
 from flask import Flask
 from flask_celeryext import FlaskCeleryExt
-from flask_cli import FlaskCLI
 from invenio_db import InvenioDB, db
 from invenio_records import InvenioRecords
 from invenio_records.api import Record
@@ -71,7 +70,6 @@
                                       'sqlite:///app.db'),
 )
 
-FlaskCLI(app)
 FlaskCeleryExt(app)
 InvenioDB(app)
 InvenioRecords(app)

invenio_indexer/__init__.py

@@ -33,14 +33,11 @@
 
 Initialization
 --------------
-First create a Flask application (Flask-CLI is not needed for Flask
-version 1.0+):
+First create a Flask application:
 
 >>> from flask import Flask
->>> from flask_cli import FlaskCLI
 >>> app = Flask('myapp')
 >>> app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite://'
->>> ext_cli = FlaskCLI(app)
 
 You initialize Indexer like a normal Flask extension, however
 Invenio-Indexer is dependent on Invenio-Records and Invenio-Search so you

invenio_indexer/cli.py

@@ -29,7 +29,7 @@
 import click
 from celery.messaging import establish_connection
 from flask import current_app
-from flask_cli import with_appcontext
+from flask.cli import with_appcontext
 from invenio_records.models import RecordMetadata
 from invenio_search.cli import index
 

setup.cfg

@@ -33,21 +33,3 @@ all_files = 1
 
 [bdist_wheel]
 universal = 1
-
-[compile_catalog]
-directory = invenio_indexer/translations/
-
-[extract_messages]
-copyright_holder = CERN
-msgid_bugs_address = info@inveniosoftware.org
-mapping-file = babel.ini
-output-file = invenio_indexer/translations/messages.pot
-add-comments = NOTE
-
-[init_catalog]
-input-file = invenio_indexer/translations/messages.pot
-output-dir = invenio_indexer/translations/
-
-[update_catalog]
-input-file = invenio_indexer/translations/messages.pot
-output-dir = invenio_indexer/translations/

setup.py

@@ -25,10 +25,8 @@
 """Indexer for Invenio."""
 
 import os
-import sys
 
 from setuptools import find_packages, setup
-from setuptools.command.test import test as TestCommand
 
 readme = open('README.rst').read()
 history = open('CHANGES.rst').read()
@@ -63,6 +61,7 @@
 ]
 
 install_requires = [
+    'Flask>=0.11.1',
     'celery>=3.1.19',
     'invenio-records>=1.0.0a8',
     'invenio-search>=1.0.0a4',
@@ -71,12 +70,6 @@
 
 packages = find_packages()
 
-
-
-
-
-
-
 # Get the version string. Cannot be done with import!
 g = {}
 with open(os.path.join('invenio_indexer', 'version.py'), 'rt') as fp:
@@ -110,6 +103,7 @@
     },
     extras_require=extras_require,
     install_requires=install_requires,
+    setup_requires=setup_requires,
     tests_require=tests_require,
     classifiers=[
         'Environment :: Web Environment',

tests/conftest.py

@@ -33,8 +33,8 @@
 import pytest
 from celery.messaging import establish_connection
 from flask import Flask
+from flask.cli import ScriptInfo
 from flask_celeryext import FlaskCeleryExt
-from flask_cli import FlaskCLI, ScriptInfo
 from invenio_db import InvenioDB, db
 from invenio_records import InvenioRecords
 from invenio_search import InvenioSearch
@@ -62,7 +62,6 @@ def app(request):
         SQLALCHEMY_TRACK_MODIFICATIONS=True,
         TESTING=True,
     )
-    FlaskCLI(app)
     FlaskCeleryExt(app)
     InvenioDB(app)
     InvenioRecords(app)

tests/test_utils.py

@@ -28,7 +28,7 @@
 from __future__ import absolute_import, print_function
 
 from click.testing import CliRunner
-from flask_cli import ScriptInfo
+from flask.cli import ScriptInfo
 from flask_sqlalchemy import models_committed
 from invenio_db import db
 from invenio_search.cli import index as cmd