Merge branch 'master' into 'bugfix/121-unicode-error-on-fastpath'

# Conflicts:
#   importlib_metadata/docs/changelog.rst

Author: jaraco

importlib_metadata/docs/changelog.rst

@@ -6,6 +6,8 @@ v1.6.1
 ======
 
 * Ensure inputs to FastPath are Unicode. Closes #121.
+* Tests now rely on ``importlib.resources.files`` (and
+  backport) instead of the older ``path`` function.
 
 v1.6.0
 ======

importlib_metadata/docs/using.rst

@@ -95,7 +95,7 @@ The ``group`` and ``name`` are arbitrary values defined by the package author
 and usually a client will wish to resolve all entry points for a particular
 group.  Read `the setuptools docs
 <https://setuptools.readthedocs.io/en/latest/setuptools.html#dynamic-discovery-of-services-and-plugins>`_
-for more information on entrypoints, their definition, and usage.
+for more information on entry points, their definition, and usage.
 
 
 .. _metadata:

importlib_metadata/tests/test_zip.py

@@ -7,9 +7,11 @@
     )
 
 try:
-    from importlib.resources import path
-except ImportError:
-    from importlib_resources import path
+    from importlib import resources
+    getattr(resources, 'files')
+    getattr(resources, 'as_file')
+except (ImportError, AttributeError):
+    import importlib_resources as resources
 
 try:
     from contextlib import ExitStack
@@ -20,15 +22,19 @@
 class TestZip(unittest.TestCase):
     root = 'importlib_metadata.tests.data'
 
+    def _fixture_on_path(self, filename):
+        pkg_file = resources.files(self.root).joinpath(filename)
+        file = self.resources.enter_context(resources.as_file(pkg_file))
+        assert file.name.startswith('example-'), file.name
+        sys.path.insert(0, str(file))
+        self.resources.callback(sys.path.pop, 0)
+
     def setUp(self):
         # Find the path to the example-*.whl so we can add it to the front of
         # sys.path, where we'll then try to find the metadata thereof.
         self.resources = ExitStack()
         self.addCleanup(self.resources.close)
-        wheel = self.resources.enter_context(
-            path(self.root, 'example-21.12-py3-none-any.whl'))
-        sys.path.insert(0, str(wheel))
-        self.resources.callback(sys.path.pop, 0)
+        self._fixture_on_path('example-21.12-py3-none-any.whl')
 
     def test_zip_version(self):
         self.assertEqual(version('example'), '21.12')
@@ -66,10 +72,7 @@ def setUp(self):
         # sys.path, where we'll then try to find the metadata thereof.
         self.resources = ExitStack()
         self.addCleanup(self.resources.close)
-        egg = self.resources.enter_context(
-            path(self.root, 'example-21.12-py3.6.egg'))
-        sys.path.insert(0, str(egg))
-        self.resources.callback(sys.path.pop, 0)
+        self._fixture_on_path('example-21.12-py3.6.egg')
 
     def test_files(self):
         for file in files('example'):

setup.cfg

@@ -53,7 +53,7 @@ universal=1
 
 [options.extras_require]
 testing =
-    importlib_resources; python_version < "3.7"
+    importlib_resources>=1.3; python_version < "3.9"
     packaging
 docs =
     sphinx