Skip to content

Commit

Permalink
Merge bb7a9d9 into a2ff192
Browse files Browse the repository at this point in the history
  • Loading branch information
cenouralm committed Aug 18, 2020
2 parents a2ff192 + bb7a9d9 commit 43945bf
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions pytest.ini
Expand Up @@ -9,3 +9,4 @@
[pytest]
pep8ignore = docs/conf.py ALL
addopts = --pep8 --doctest-glob="*.rst" --doctest-modules --cov=invenio_app --cov-report=term-missing
filterwarnings = ignore::pytest.PytestDeprecationWarning
2 changes: 1 addition & 1 deletion run-tests.sh
Expand Up @@ -10,7 +10,7 @@
export PYTEST_ADDOPTS='docs tests invenio_app'

pydocstyle invenio_app tests docs && \
isort -rc -c -df && \
isort invenio_app/*.py tests/*.py . --recursive --check-only --diff && \
check-manifest --ignore ".travis-*" && \
sphinx-build -qnNW docs docs/_build/html && \
python setup.py test
2 changes: 1 addition & 1 deletion tests/conftest.py
Expand Up @@ -86,8 +86,8 @@ def app(base_app):
@pytest.fixture()
def wsgi_apps():
"""Wsgi app fixture."""
from invenio_base.wsgi import create_wsgi_factory, wsgi_proxyfix
from invenio_base.app import create_app_factory
from invenio_base.wsgi import create_wsgi_factory, wsgi_proxyfix

def _config(app, **kwargs):
app.config.update(
Expand Down

0 comments on commit 43945bf

Please sign in to comment.