summaryrefslogtreecommitdiff
path: root/setuptools/tests/fixtures.py
diff options
context:
space:
mode:
authorChih-Hsuan Yen <yan12125@gmail.com>2020-12-13 18:01:50 +0800
committerChih-Hsuan Yen <yan12125@gmail.com>2020-12-13 18:27:23 +0800
commit701eee9e53dcbfe200bef46420da420052699e68 (patch)
tree57dcd5a8b082014dd8e0b42ac3fa60f120a7b1da /setuptools/tests/fixtures.py
parentd368be2b5be8676ba8a3d55045b45b55090f6982 (diff)
downloadpython-setuptools-git-701eee9e53dcbfe200bef46420da420052699e68.tar.gz
Fix tests with pytest 6.2
The latest pytest deprecates pytest.yield_fixture in favor of pytest.fixture [1]. The changelog [2] says that both are the same. [1] https://github.com/pytest-dev/pytest/pull/7988 [2] https://docs.pytest.org/en/stable/changelog.html#pytest-6-2-0-2020-12-12
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