From 00ef8956f80da44ec945ebcc785c7652873b9696 Mon Sep 17 00:00:00 2001 From: Roman Yurchak Date: Mon, 18 May 2020 21:22:48 +0200 Subject: [PATCH] MAINT Remove pytest.ini (#664) --- conftest.py | 2 ++ packages/micropip/test_micropip.py | 1 + pytest.ini | 2 -- setup.cfg | 3 +-- 4 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 pytest.ini diff --git a/conftest.py b/conftest.py index 5792e0a85..116805f0f 100644 --- a/conftest.py +++ b/conftest.py @@ -26,6 +26,8 @@ import selenium.webdriver.common.utils # noqa: E402 selenium.webdriver.common.utils.is_connectable = _selenium_is_connectable +collect_ignore_glob = ['packages/*/*/*'] + try: import pytest diff --git a/packages/micropip/test_micropip.py b/packages/micropip/test_micropip.py index 30e9435bc..339c982b5 100644 --- a/packages/micropip/test_micropip.py +++ b/packages/micropip/test_micropip.py @@ -33,6 +33,7 @@ def test_install_simple(selenium_standalone): def test_parse_wheel_url(): + pytest.importorskip('distlib') import micropip url = "https://a/snowballstemmer-2.0.0-py2.py3-none-any.whl" diff --git a/pytest.ini b/pytest.ini deleted file mode 100644 index 1898d8734..000000000 --- a/pytest.ini +++ /dev/null @@ -1,2 +0,0 @@ -[pytest] -norecursedirs = build src cpython emsdk/ diff --git a/setup.cfg b/setup.cfg index 8f56cb857..3fa2d51b4 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,4 @@ [tool:pytest] +norecursedirs = build src cpython emsdk/ addopts = -r sxX - --instafail - --doctest-modules