summaryrefslogtreecommitdiff
path: root/setuptools/tests/fixtures.py
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2020-12-20 11:59:44 -0500
committerGitHub <noreply@github.com>2020-12-20 11:59:44 -0500
commit30b66d8ddde14ecbf0ae90966042d8d31fc680c8 (patch)
tree23ef08ac2feae3db704528e53af9ddc974610ba1 /setuptools/tests/fixtures.py
parentf8096a1f397426cf8e04c97487c950e0a8eadc5e (diff)
parent701eee9e53dcbfe200bef46420da420052699e68 (diff)
downloadpython-setuptools-git-30b66d8ddde14ecbf0ae90966042d8d31fc680c8.tar.gz
Merge pull request #2487 from yan12125/fix-tests-pytest-6.2
Fix tests with pytest 6.2
Diffstat (limited to 'setuptools/tests/fixtures.py')
-rw-r--r--setuptools/tests/fixtures.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/setuptools/tests/fixtures.py b/setuptools/tests/fixtures.py
index 5204c8d1..e8cb7f52 100644
--- a/setuptools/tests/fixtures.py
+++ b/setuptools/tests/fixtures.py
@@ -3,7 +3,7 @@ import pytest
from . import contexts
-@pytest.yield_fixture
+@pytest.fixture
def user_override(monkeypatch):
"""
Override site.USER_BASE and site.USER_SITE with temporary directories in
@@ -17,7 +17,7 @@ def user_override(monkeypatch):
yield
-@pytest.yield_fixture
+@pytest.fixture
def tmpdir_cwd(tmpdir):
with tmpdir.as_cwd() as orig:
yield orig