TST: prefer tmp_path fixture to the tmpdir one

The former returns a pathlib.Path, the latter a py.path.

Signed-off-by: Henry Schreiner <henryschreineriii@gmail.com>

Author: henryiii

tests/conftest.py

@@ -62,10 +62,10 @@ def in_git_repo_context(path=os.path.curdir):
 
 
 @pytest.fixture(scope='session')
-def tmp_dir_session(tmpdir_factory):
+def tmp_path_session(tmp_path_factory):
     return pathlib.Path(tempfile.mkdtemp(
         prefix='mesonpy-test-',
-        dir=tmpdir_factory.mktemp('test'),
+        dir=tmp_path_factory.mktemp('test'),
     ))
 
 
@@ -107,17 +107,17 @@ def fixture():
 
 def generate_sdist_fixture(package):
     @pytest.fixture(scope='session')
-    def fixture(tmp_dir_session):
+    def fixture(tmp_path_session):
         with cd_package(package), in_git_repo_context():
-            return tmp_dir_session / mesonpy.build_sdist(tmp_dir_session)
+            return tmp_path_session / mesonpy.build_sdist(tmp_path_session)
     return fixture
 
 
 def generate_wheel_fixture(package):
     @pytest.fixture(scope='session')
-    def fixture(tmp_dir_session):
+    def fixture(tmp_path_session):
         with cd_package(package), in_git_repo_context():
-            return tmp_dir_session / mesonpy.build_wheel(tmp_dir_session)
+            return tmp_path_session / mesonpy.build_wheel(tmp_path_session)
     return fixture
 
 
@@ -138,8 +138,8 @@ def disable_pip_version_check():
 
 
 @pytest.fixture(scope='session')
-def pep518_wheelhouse(tmpdir_factory):
-    wheelhouse = tmpdir_factory.mktemp('wheelhouse')
+def pep518_wheelhouse(tmp_path_factory):
+    wheelhouse = tmp_path_factory.mktemp('wheelhouse')
     meson_python = str(package_dir.parent.parent)
     # Populate wheelhouse with wheel for the following packages and
     # their dependencies.  Wheels are downloaded from PyPI or built

tests/docs/examples/test_spam.py

@@ -8,16 +8,16 @@
 from .conftest import build_project_wheel, examples_dir
 
 
-def test_build_and_import(venv, tmp_dir_session):
+def test_build_and_import(venv, tmp_path_session):
     """Test that the wheel for the spam example builds, installs, and imports."""
 
     if sys.version_info < (3, 8):
         # The test project requires Python >= 3.8.
         with pytest.raises(mesonpy.MesonBuilderError, match=r'Unsupported Python version `3.7.\d+`'):
-            build_project_wheel(package=examples_dir / 'spam', outdir=tmp_dir_session)
+            build_project_wheel(package=examples_dir / 'spam', outdir=tmp_path_session)
 
     else:
-        wheel = build_project_wheel(package=examples_dir / 'spam', outdir=tmp_dir_session)
+        wheel = build_project_wheel(package=examples_dir / 'spam', outdir=tmp_path_session)
 
         subprocess.run(
             [venv.executable, '-m', 'pip', 'install', wheel],

tests/test_pep517.py

@@ -53,10 +53,10 @@ def run(cmd: List[str], *args: object, **kwargs: object) -> subprocess.Completed
         assert set(mesonpy.get_requires_for_build_wheel()) == expected
 
 
-def test_invalid_config_settings(package_pure, tmp_dir_session):
+def test_invalid_config_settings(package_pure, tmp_path_session):
     raises_error = pytest.raises(mesonpy.ConfigError, match='Unknown config setting: invalid')
 
     with raises_error:
-        mesonpy.build_sdist(tmp_dir_session, {'invalid': ()})
+        mesonpy.build_sdist(tmp_path_session, {'invalid': ()})
     with raises_error:
-        mesonpy.build_wheel(tmp_dir_session, {'invalid': ()})
+        mesonpy.build_wheel(tmp_path_session, {'invalid': ()})

tests/test_project.py

@@ -55,7 +55,7 @@ def test_unsupported_python_version(package_unsupported_python_version):
     sys.version_info < (3, 8),
     reason="unittest.mock doesn't support the required APIs for this test",
 )
-def test_user_args(package_user_args, mocker, tmp_dir_session):
+def test_user_args(package_user_args, mocker, tmp_path_session):
     mocker.patch('mesonpy.Project._meson')
 
     def last_two_meson_args():
@@ -64,7 +64,7 @@ def last_two_meson_args():
         ]
 
     # create the build directory ourselves because Project._meson is mocked
-    builddir = str(tmp_dir_session / 'build')
+    builddir = str(tmp_path_session / 'build')
     subprocess.run(['meson', 'setup', '.', builddir], check=True)
 
     config_settings = {
@@ -76,9 +76,9 @@ def last_two_meson_args():
     }
 
     with contextlib.suppress(Exception):
-        mesonpy.build_sdist(tmp_dir_session / 'dist', config_settings)
+        mesonpy.build_sdist(tmp_path_session / 'dist', config_settings)
     with contextlib.suppress(Exception):
-        mesonpy.build_wheel(tmp_dir_session / 'dist', config_settings)
+        mesonpy.build_wheel(tmp_path_session / 'dist', config_settings)
 
     assert last_two_meson_args() == [
         # sdist
@@ -92,6 +92,6 @@ def last_two_meson_args():
 
 
 @pytest.mark.parametrize('package', ('top-level', 'meson-args'))
-def test_unknown_user_args(package, tmp_dir_session):
+def test_unknown_user_args(package, tmp_path_session):
     with pytest.raises(mesonpy.ConfigError):
-        mesonpy.Project(package_dir / f'unknown-user-args-{package}', tmp_dir_session)
+        mesonpy.Project(package_dir / f'unknown-user-args-{package}', tmp_path_session)

tests/test_sdist.py

@@ -42,7 +42,7 @@ def test_contents_subdirs(sdist_subdirs):
     }
 
 
-def test_contents_unstaged(package_pure, tmpdir):
+def test_contents_unstaged(package_pure, tmp_path):
     new_data = textwrap.dedent('''
     def bar():
         return 'foo'
@@ -56,13 +56,13 @@ def bar():
             with open('pure.py', 'w') as f, open('crap', 'x'):
                 f.write(new_data)
 
-            sdist_path = mesonpy.build_sdist(os.fspath(tmpdir))
+            sdist_path = mesonpy.build_sdist(os.fspath(tmp_path))
     finally:
         with open('pure.py', 'w') as f:
             f.write(old_data)
         os.unlink('crap')
 
-    with tarfile.open(tmpdir / sdist_path, 'r:gz') as sdist:
+    with tarfile.open(tmp_path / sdist_path, 'r:gz') as sdist:
         names = set(sdist.getnames())
         read_data = sdist.extractfile('pure-1.0.0/pure.py').read().replace(b'\r\n', b'\n')
 

tests/test_wheel.py

@@ -188,20 +188,20 @@ def test_detect_wheel_tag_script(wheel_executable):
 
 
 @pytest.mark.skipif(platform.system() != 'Linux', reason='Unsupported on this platform for now')
-def test_rpath(wheel_link_against_local_lib, tmpdir):
+def test_rpath(wheel_link_against_local_lib, tmp_path):
     artifact = wheel.wheelfile.WheelFile(wheel_link_against_local_lib)
-    artifact.extractall(tmpdir)
+    artifact.extractall(tmp_path)
 
-    elf = mesonpy._elf.ELF(tmpdir / f'example{EXT_SUFFIX}')
+    elf = mesonpy._elf.ELF(tmp_path / f'example{EXT_SUFFIX}')
     assert '$ORIGIN/.link_against_local_lib.mesonpy.libs' in elf.rpath
 
 
 @pytest.mark.skipif(platform.system() != 'Linux', reason='Unsupported on this platform for now')
-def test_uneeded_rpath(wheel_purelib_and_platlib, tmpdir):
+def test_uneeded_rpath(wheel_purelib_and_platlib, tmp_path):
     artifact = wheel.wheelfile.WheelFile(wheel_purelib_and_platlib)
-    artifact.extractall(tmpdir)
+    artifact.extractall(tmp_path)
 
-    elf = mesonpy._elf.ELF(tmpdir / f'plat{EXT_SUFFIX}')
+    elf = mesonpy._elf.ELF(tmp_path / f'plat{EXT_SUFFIX}')
     if elf.rpath:
         # elf.rpath is a frozenset, so iterate over it. An rpath may be
         # present, e.g. when conda is used (rpath will be <conda-prefix>/lib/)