From 340121b967f3bc8e942ee947bbce7fd332ba93d9 Mon Sep 17 00:00:00 2001 From: Guillaume Viger Date: Thu, 10 Sep 2020 14:48:44 -0500 Subject: [PATCH] dependencies: fix breaking change in nbconvert by capping it --- pytest.ini | 2 ++ run-tests.sh | 6 ++++-- setup.py | 11 +++-------- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/pytest.ini b/pytest.ini index c553981..b58a487 100644 --- a/pytest.ini +++ b/pytest.ini @@ -2,9 +2,11 @@ # # This file is part of Invenio. # Copyright (C) 2016-2019 CERN. +# Copyright (C) 2020 Northwestern University. # # Invenio is free software; you can redistribute it and/or modify it # under the terms of the MIT License; see LICENSE file for more details. [pytest] addopts = --pep8 --ignore=docs --cov=invenio_previewer --cov-report=term-missing +filterwarnings = ignore::pytest.PytestDeprecationWarning diff --git a/run-tests.sh b/run-tests.sh index 2d3110e..5cbb44c 100755 --- a/run-tests.sh +++ b/run-tests.sh @@ -1,15 +1,17 @@ +#!/usr/bin/env bash # -*- coding: utf-8 -*- # # This file is part of Invenio. # Copyright (C) 2016-2019 CERN. +# Copyright (C) 2020 Northwestern University. # # Invenio is free software; you can redistribute it and/or modify it # under the terms of the MIT License; see LICENSE file for more details. pydocstyle invenio_previewer && \ -isort -rc -c -df **/*.py && \ +isort invenio_previewer tests --check-only --diff && \ check-manifest --ignore ".travis-*" && \ sphinx-build -qnNW docs docs/_build/html && \ -python setup.py test && \ +pytest && \ sphinx-build -qnNW -b doctest docs docs/_build/doctest diff --git a/setup.py b/setup.py index 57bdd42..f79acef 100644 --- a/setup.py +++ b/setup.py @@ -17,17 +17,11 @@ history = open('CHANGES.rst').read() tests_require = [ - 'check-manifest>=0.25', - 'coverage>=4.5.3', 'invenio-config>=1.0.2', 'invenio-theme>=1.3.0a10', 'invenio-db[versioning]>=1.0.2', - 'isort>=4.3.4', 'mock>=1.3.0', - 'pydocstyle>=1.0.0', - 'pytest-cov>=2.7.1', - 'pytest-pep8>=1.0.6', - 'pytest>=4.6.4,<5.0.0', + 'pytest-invenio>=1.3.2', ] extras_require = { @@ -60,7 +54,8 @@ 'invenio-records-ui>=1.1.0', 'ipython>=4.1.0', 'mistune>=0.7.2', - 'nbconvert[execute]>=4.1.0', + # NOTE: nbclient package provides execute in nbconvert >= 6.X + 'nbconvert[execute]>=4.1.0,<6.0.0', 'nbformat>=4.0.1', 'tornado>=4.1,<=5.1.1', # required by nbconvert -> jupyter-client ]