Fix some cleanup regressions.

Author: ionelmc

tests/conftest.py

@@ -1,5 +1,6 @@
-def pytest_ignore_collect(path, config):
-    basename = path.basename
+from pathlib import Path
 
-    if 'pytestsupport' in basename:
+
+def pytest_ignore_collect(collection_path: Path, config):
+    if 'pytestsupport' in collection_path.__fspath__():
         return True

tests/test_aspectlib.py

@@ -447,7 +447,7 @@ def test_weave_wrong_module():
                 "Setting test_aspectlib.MissingGlobal to <class 'test_aspectlib.MissingGlobal'>. "
                 'There was no previous definition, probably patching the wrong module.',
             ),
-            {},
+            {'stacklevel': 2},
         )
     ]
 

tests/test_integrations.py

@@ -44,7 +44,7 @@ def test_mock_builtin_os():
 def test_record_warning():
     with aspectlib.weave('warnings.warn', record):
         warnings.warn('crap', stacklevel=1)
-        assert warnings.warn.calls == [(None, ('crap',), {})]
+        assert warnings.warn.calls == [(None, ('crap',), {'stacklevel': 1})]
 
 
 @pytest.mark.skipif(not hasattr(os, 'fork'), reason='os.fork not available')