Merge pull request #259 from pre-commit/all-repos_autofix_all-repos-sed

Replace deprecated yield_fixture with fixture

Author: asottile

tests/check_merge_conflict_test.py

@@ -12,7 +12,7 @@
 from testing.util import write_file
 
 
-@pytest.yield_fixture
+@pytest.fixture
 def f1_is_a_conflict_file(tmpdir):
     # Make a merge conflict
     repo1 = tmpdir.join('repo1')
@@ -67,7 +67,7 @@ def f1_is_a_conflict_file(tmpdir):
         yield
 
 
-@pytest.yield_fixture
+@pytest.fixture
 def repository_is_pending_merge(tmpdir):
     # Make a (non-conflicting) merge
     repo1 = tmpdir.join('repo1')

tests/conftest.py

@@ -7,7 +7,7 @@
 from pre_commit_hooks.util import cmd_output
 
 
-@pytest.yield_fixture
+@pytest.fixture
 def temp_git_dir(tmpdir):
     git_dir = tmpdir.join('gits')
     cmd_output('git', 'init', '--', git_dir.strpath)

tests/forbid_new_submodules_test.py

@@ -6,7 +6,7 @@
 from pre_commit_hooks.forbid_new_submodules import main
 
 
-@pytest.yield_fixture
+@pytest.fixture
 def git_dir_with_git_dir(tmpdir):
     with tmpdir.as_cwd():
         cmd_output('git', 'init', '.')