Merge pull request #271 from kinow/imports

Remove unused imports and declare dependencies used

annif/backend/__init__.py

@@ -1,7 +1,5 @@
 """Registry of backend types for Annif"""
 
-import configparser
-from flask import current_app
 from . import dummy
 from . import ensemble
 from . import http

annif/corpus/__init__.py

@@ -7,3 +7,7 @@
 from .skos import SubjectFileSKOS
 from .types import Document
 from .combine import CombinedCorpus
+
+__all__ = [DocumentDirectory, DocumentFile, DocumentList, Subject,
+           SubjectDirectory, SubjectFileTSV, SubjectIndex, SubjectSet,
+           SubjectFileSKOS, Document, CombinedCorpus]

setup.py

@@ -21,16 +21,19 @@ def read(fname):
     install_requires=[
         'connexion[swagger-ui]',
         'swagger_ui_bundle',
+        'flask',
         'flask-cors',
+        'click',
         'click-log',
         'nltk',
         'gensim',
         'sklearn',
         'rdflib'],
+    tests_require=['py', 'pytest', 'requests'],
     extras_require={
-        'fasttext': ['fasttextmirror'],
+        'fasttext': ['fasttext', 'fasttextmirror'],
         'voikko': ['voikko'],
-        'vw': ['vowpalwabbit'],
+        'vw': ['vowpalwabbit', 'numpy'],
     },
     entry_points={
         'console_scripts': ['annif=annif.cli:cli']},

tests/test_backend.py

@@ -1,6 +1,5 @@
 """Unit tests for backends in Annif"""
 
-import os
 import pytest
 import annif
 import annif.backend

tests/test_cli.py

@@ -4,8 +4,6 @@
 import random
 import re
 import os.path
-import shutil
-import pytest
 from click.testing import CliRunner
 import annif.cli
 

tests/test_project.py

@@ -1,6 +1,5 @@
 """Unit tests for projects in Annif"""
 
-import os
 import pytest
 import annif.project
 import annif.backend.dummy

tests/test_rest.py

@@ -1,6 +1,5 @@
 """Unit tests for REST API backend code in Annif"""
 
-import connexion
 import annif.rest