diff --git a/annif/__init__.py b/annif/__init__.py index 5f0e2ceea..d3ad2aa1d 100644 --- a/annif/__init__.py +++ b/annif/__init__.py @@ -11,7 +11,7 @@ import annif.backend # noqa -def create_app(script_info=None, config_name=None): +def create_app(config_name=None): # 'cxapp' here is the Connexion application that has a normal Flask app # as a property (cxapp.app) diff --git a/setup.py b/setup.py index 7cd924ee2..d998e78aa 100644 --- a/setup.py +++ b/setup.py @@ -56,7 +56,8 @@ def read(fname): 'pytest-flask', 'pytest-flake8', 'bumpversion', - 'autopep8' + 'autopep8', + 'importlib_metadata' ] }, entry_points={ diff --git a/tests/test_cli.py b/tests/test_cli.py index 9ade22941..aa5c38539 100644 --- a/tests/test_cli.py +++ b/tests/test_cli.py @@ -4,7 +4,7 @@ import random import re import os.path -import pkg_resources +import importlib_metadata import json from click.testing import CliRunner import annif.cli @@ -806,5 +806,5 @@ def test_version_option(): annif.cli.cli, ['--version']) assert not result.exception assert result.exit_code == 0 - version = pkg_resources.require('annif')[0].version + version = importlib_metadata.version('annif') assert result.output.strip() == version.strip()