Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Resolve some Warnings from unit tests #575

Merged
merged 2 commits into from
Mar 1, 2022
Merged

Resolve some Warnings from unit tests #575

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9dc8e6e
Resolve DeprecationWarnings by Flask
juhoinkinen Feb 21, 2022
bfb7a1a
Resolve DeprecationWarning by pkg_resources by switching to importlib…
juhoinkinen Feb 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion annif/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
3 changes: 2 additions & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,8 @@ def read(fname):
'pytest-flask',
'pytest-flake8',
'bumpversion',
'autopep8'
'autopep8',
'importlib_metadata'
]
},
entry_points={
Expand Down
4 changes: 2 additions & 2 deletions tests/test_cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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()