diff --git a/MANIFEST.in b/MANIFEST.in index 970adee..721eded 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -3,9 +3,7 @@ include COPYING.rst include LICENSE include setupbase.py include MANIFEST.in -include pytest.ini include py.typed -include mypy.ini include .mailmap include .flake8 include .pre-commit-config.yaml diff --git a/pyproject.toml b/pyproject.toml index 8d4e4a6..f8eac8a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,7 @@ [build-system] requires = ["setuptools >= 51.0.0"] build-backend = "setuptools.build_meta" + [tool.mypy] python_version = 3.8 ignore_missing_imports = true @@ -28,5 +29,53 @@ exclude = [ 'IPython/utils/path.py', 'IPython/utils/timing.py', 'IPython/utils/text.py' - ] +] +[tool.pytest.ini_options] +addopts = [ + "--durations=10", + "-pIPython.testing.plugin.pytest_ipdoctest", + "--ipdoctest-modules", + "--ignore=docs", + "--ignore=examples", + "--ignore=htmlcov", + "--ignore=ipython_kernel", + "--ignore=ipython_parallel", + "--ignore=results", + "--ignore=tmp", + "--ignore=tools", + "--ignore=traitlets", + "--ignore=IPython/core/tests/daft_extension", + "--ignore=IPython/sphinxext", + "--ignore=IPython/terminal/pt_inputhooks", + "--ignore=IPython/__main__.py", + "--ignore=IPython/external/qt_for_kernel.py", + "--ignore=IPython/html/widgets/widget_link.py", + "--ignore=IPython/html/widgets/widget_output.py", + "--ignore=IPython/terminal/console.py", + "--ignore=IPython/utils/_process_cli.py", + "--ignore=IPython/utils/_process_posix.py", + "--ignore=IPython/utils/_process_win32.py", + "--ignore=IPython/utils/_process_win32_controller.py", + "--ignore=IPython/utils/daemonize.py", + "--ignore=IPython/utils/eventful.py", + "--ignore=IPython/kernel", + "--ignore=IPython/consoleapp.py", + "--ignore=IPython/core/inputsplitter.py", + "--ignore=IPython/lib/kernel.py", + "--ignore=IPython/utils/jsonutil.py", + "--ignore=IPython/utils/localinterfaces.py", + "--ignore=IPython/utils/log.py", + "--ignore=IPython/utils/signatures.py", + "--ignore=IPython/utils/traitlets.py", + "--ignore=IPython/utils/version.py" +] +doctest_optionflags = [ + "NORMALIZE_WHITESPACE", + "ELLIPSIS" +] +ipdoctest_optionflags = [ + "NORMALIZE_WHITESPACE", + "ELLIPSIS" +] +asyncio_mode = "strict" diff --git a/pytest.ini b/pytest.ini deleted file mode 100644 index 5cc9776..0000000 --- a/pytest.ini +++ /dev/null @@ -1,40 +0,0 @@ -[pytest] -addopts = --durations=10 - -p IPython.testing.plugin.pytest_ipdoctest --ipdoctest-modules - --ignore=docs - --ignore=examples - --ignore=htmlcov - --ignore=ipython_kernel - --ignore=ipython_parallel - --ignore=results - --ignore=tmp - --ignore=tools - --ignore=traitlets - --ignore=IPython/core/tests/daft_extension - --ignore=IPython/sphinxext - --ignore=IPython/terminal/pt_inputhooks - --ignore=IPython/__main__.py - --ignore=IPython/external/qt_for_kernel.py - --ignore=IPython/html/widgets/widget_link.py - --ignore=IPython/html/widgets/widget_output.py - --ignore=IPython/terminal/console.py - --ignore=IPython/utils/_process_cli.py - --ignore=IPython/utils/_process_posix.py - --ignore=IPython/utils/_process_win32.py - --ignore=IPython/utils/_process_win32_controller.py - --ignore=IPython/utils/daemonize.py - --ignore=IPython/utils/eventful.py - - --ignore=IPython/kernel - --ignore=IPython/consoleapp.py - --ignore=IPython/core/inputsplitter.py - --ignore=IPython/lib/kernel.py - --ignore=IPython/utils/jsonutil.py - --ignore=IPython/utils/localinterfaces.py - --ignore=IPython/utils/log.py - --ignore=IPython/utils/signatures.py - --ignore=IPython/utils/traitlets.py - --ignore=IPython/utils/version.py -doctest_optionflags = NORMALIZE_WHITESPACE ELLIPSIS -ipdoctest_optionflags = NORMALIZE_WHITESPACE ELLIPSIS -asyncio_mode = strict