TST: stricter warning checks

Signed-off-by: Henry Schreiner <[email protected]>

Author: henryiii

pyproject.toml

@@ -83,3 +83,7 @@ addopts = ['-ra', '--strict-markers', '--strict-config']
 log_cli_level = 'info'
 norecursedirs = 'tests/packages/*'
 testpaths = ['tests']
+xfail_strict = true
+filterwarnings = [
+  'error',
+]

tests/conftest.py

@@ -9,6 +9,7 @@
 import subprocess
 import sys
 import tempfile
+import warnings
 
 from venv import EnvBuilder
 
@@ -71,7 +72,12 @@ def tmp_dir_session(tmpdir_factory):
 class VEnv(EnvBuilder):
     def __init__(self, env_dir):
         super().__init__(with_pip=True)
-        self.create(env_dir)
+        # This warning is mistakenly generated by CPython 3.11.0
+        # https://github.com/python/cpython/pull/98743
+        with warnings.catch_warnings():
+            if sys.version_info[:3] == (3, 11, 0):
+                warnings.filterwarnings('ignore', 'check_home argument is deprecated and ignored.', DeprecationWarning)
+            self.create(env_dir)
 
     def ensure_directories(self, env_dir):
         context = super().ensure_directories(env_dir)

tests/test_metadata.py

@@ -5,19 +5,21 @@
 
 
 def test_no_pep621(sdist_library):
-    sdist = tarfile.open(sdist_library, 'r:gz')
+    with tarfile.open(sdist_library, 'r:gz') as sdist:
+        sdist_pkg_info = sdist.extractfile('library-1.0.0/PKG-INFO').read().decode()
 
-    assert sdist.extractfile('library-1.0.0/PKG-INFO').read().decode() == textwrap.dedent('''
+    assert sdist_pkg_info == textwrap.dedent('''
         Metadata-Version: 2.1
         Name: library
         Version: 1.0.0
     ''').strip()
 
 
 def test_pep621(sdist_full_metadata):
-    sdist = tarfile.open(sdist_full_metadata, 'r:gz')
+    with tarfile.open(sdist_full_metadata, 'r:gz') as sdist:
+        sdist_pkg_info = sdist.extractfile('full_metadata-1.2.3/PKG-INFO').read().decode()
 
-    assert sdist.extractfile('full_metadata-1.2.3/PKG-INFO').read().decode() == textwrap.dedent('''\
+    assert sdist_pkg_info == textwrap.dedent('''\
         Metadata-Version: 2.1
         Name: full-metadata
         Version: 1.2.3
@@ -50,9 +52,10 @@ def test_pep621(sdist_full_metadata):
 
 
 def test_dynamic_version(sdist_dynamic_version):
-    sdist = tarfile.open(sdist_dynamic_version, 'r:gz')
+    with tarfile.open(sdist_dynamic_version, 'r:gz') as sdist:
+        sdist_pkg_info = sdist.extractfile('dynamic_version-1.0.0/PKG-INFO').read().decode().strip()
 
-    assert sdist.extractfile('dynamic_version-1.0.0/PKG-INFO').read().decode().strip() == textwrap.dedent('''
+    assert sdist_pkg_info == textwrap.dedent('''
         Metadata-Version: 2.1
         Name: dynamic-version
         Version: 1.0.0

tests/test_sdist.py

@@ -14,9 +14,10 @@
 
 
 def test_contents(sdist_library):
-    sdist = tarfile.open(sdist_library, 'r:gz')
+    with tarfile.open(sdist_library, 'r:gz') as sdist:
+        names = set(sdist.getnames())
 
-    assert set(sdist.getnames()) == {
+    assert names == {
         'library-1.0.0/example.c',
         'library-1.0.0/examplelib.c',
         'library-1.0.0/examplelib.h',
@@ -27,9 +28,10 @@ def test_contents(sdist_library):
 
 
 def test_contents_subdirs(sdist_subdirs):
-    sdist = tarfile.open(sdist_subdirs, 'r:gz')
+    with tarfile.open(sdist_subdirs, 'r:gz') as sdist:
+        names = set(sdist.getnames())
 
-    assert set(sdist.getnames()) == {
+    assert names == {
         'subdirs-1.0.0/PKG-INFO',
         'subdirs-1.0.0/meson.build',
         'subdirs-1.0.0/pyproject.toml',
@@ -60,22 +62,21 @@ def bar():
             f.write(old_data)
         os.unlink('crap')
 
-    sdist = tarfile.open(tmpdir / sdist_path, 'r:gz')
+    with tarfile.open(tmpdir / 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')
 
-    assert set(sdist.getnames()) == {
+    assert names == {
         'pure-1.0.0/PKG-INFO',
         'pure-1.0.0/meson.build',
         'pure-1.0.0/pure.py',
         'pure-1.0.0/pyproject.toml',
     }
-    read_data = sdist.extractfile('pure-1.0.0/pure.py').read().replace(b'\r\n', b'\n')
     assert read_data == new_data.encode()
 
 
 @pytest.mark.skipif(sys.platform in {'win32', 'cygwin'}, reason='Platform does not support executable bit')
 def test_executable_bit(sdist_executable_bit):
-    sdist = tarfile.open(sdist_executable_bit, 'r:gz')
-
     expected = {
         'executable_bit-1.0.0/PKG-INFO': False,
         'executable_bit-1.0.0/example-script.py': True,
@@ -84,12 +85,13 @@ def test_executable_bit(sdist_executable_bit):
         'executable_bit-1.0.0/meson.build': False,
         'executable_bit-1.0.0/pyproject.toml': False,
     }
-    for member in sdist.getmembers():
-        assert bool(member.mode & stat.S_IXUSR) == expected[member.name]
+
+    with tarfile.open(sdist_executable_bit, 'r:gz') as sdist:
+        for member in sdist.getmembers():
+            assert bool(member.mode & stat.S_IXUSR) == expected[member.name]
 
 
 def test_generated_files(sdist_generated_files):
-    sdist = tarfile.open(sdist_generated_files, 'r:gz')
     expected = {
         'executable_bit-1.0.0/PKG-INFO',
         'executable_bit-1.0.0/example-script.py',
@@ -100,4 +102,5 @@ def test_generated_files(sdist_generated_files):
         'executable_bit-1.0.0/_version_meson.py',
         'executable_bit-1.0.0/generate_version.py',
     }
-    assert set(tar.name for tar in sdist.getmembers()) == expected
+    with tarfile.open(sdist_generated_files, 'r:gz') as sdist:
+        assert set(tar.name for tar in sdist.getmembers()) == expected

tests/test_wheelfile.py

@@ -1,3 +1,4 @@
+import contextlib
 import time
 
 import wheel.wheelfile
@@ -8,16 +9,18 @@
 def test_basic(tmp_path):
     path = tmp_path / 'test-1.0-py3-any-none.whl'
     bar = tmp_path / 'bar'
-    open(bar, 'wb').write(b'bar')
+    bar.write_bytes(b'bar')
     with mesonpy._wheelfile.WheelFile(path, 'w') as w:
         assert w.name == 'test'
         assert w.version == '1.0'
         w.writestr('foo', b'test')
         w.write(bar, 'bar')
-    with wheel.wheelfile.WheelFile(path, 'r') as w:
+    with contextlib.closing(wheel.wheelfile.WheelFile(path, 'r')) as w:
         assert set(w.namelist()) == {'foo', 'bar', 'test-1.0.dist-info/RECORD'}
-        w.open('foo').read() == b'test'
-        w.open('bar').read() == b'bar'
+        with w.open('foo') as foo:
+            assert foo.read() == b'test'
+        with w.open('bar') as bar:
+            assert bar.read() == b'bar'
 
 
 def test_source_date_epoch(tmp_path, monkeypatch):
@@ -27,7 +30,7 @@ def test_source_date_epoch(tmp_path, monkeypatch):
     assert epoch % 2 == 0
     monkeypatch.setenv('SOURCE_DATE_EPOCH', str(epoch))
     bar = tmp_path / 'bar'
-    open(bar, 'wb').write(b'bar')
+    bar.write_bytes(b'bar')
     with mesonpy._wheelfile.WheelFile(path, 'w') as w:
         w.writestr('foo', b'test')
         w.write(bar, 'bar')