Merge branch 'main' into feature/228-directory-of-resources

Author: jaraco

.github/FUNDING.yml

@@ -0,0 +1 @@
+tidelift: pypi/importlib-resources

.pre-commit-config.yaml

@@ -1,5 +1,5 @@
 repos:
 - repo: https://github.com/psf/black
-  rev: 22.1.0
+  rev: 22.6.0
   hooks:
   - id: black

CHANGES.rst

@@ -5,6 +5,13 @@ v5.9.0
   representing a directory and (when needed) renders the
   full tree to a temporary directory.
 
+v5.8.1
+======
+
+* #253: In ``MultiplexedPath``, restore expectation that
+  a compound path with a non-existent directory does not
+  raise an exception.
+
 v5.8.0
 ======
 

README.rst

@@ -20,6 +20,9 @@
 .. image:: https://img.shields.io/badge/skeleton-2022-informational
    :target: https://blog.jaraco.com/skeleton
 
+.. image:: https://tidelift.com/badges/package/pypi/importlib-resources
+   :target: https://tidelift.com/subscription/pkg/pypi-importlib-resources?utm_source=pypi-importlib-resources&utm_medium=readme
+
 ``importlib_resources`` is a backport of Python standard library
 `importlib.resources
 <https://docs.python.org/3/library/importlib.html#module-importlib.resources>`_
@@ -53,3 +56,19 @@ were contributed to different versions in the standard library:
      - 3.9
    * - 0.5 (?)
      - 3.7
+
+For Enterprise
+==============
+
+Available as part of the Tidelift Subscription.
+
+This project and the maintainers of thousands of other packages are working with Tidelift to deliver one enterprise subscription that covers all of the open source you use.
+
+`Learn more <https://tidelift.com/subscription/pkg/pypi-importlib-resources?utm_source=pypi-importlib-resources&utm_medium=referral&utm_campaign=github>`_.
+
+Security Contact
+================
+
+To report a security vulnerability, please use the
+`Tidelift security contact <https://tidelift.com/security>`_.
+Tidelift will coordinate the fix and disclosure.

docs/conf.py

@@ -38,3 +38,5 @@
 intersphinx_mapping = {
     'python': ('https://docs.python.org/3', None),
 }
+
+extensions += ['jaraco.tidelift']

docs/index.rst

@@ -31,6 +31,8 @@ The documentation here includes a general :ref:`usage <using>` guide and a
    migration.rst
    history.rst
 
+.. tidelift-referral-banner::
+
 
 Indices and tables
 ==================

docs/migration.rst

@@ -148,7 +148,7 @@ a package is a directory or not::
 
 The ``importlib_resources`` equivalent is straightforward::
 
-    if importlib_resources.files('my.package').joinpath('resource').isdir():
+    if importlib_resources.files('my.package').joinpath('resource').is_dir():
         print('A directory')
 
 

importlib_resources/readers.py

@@ -85,13 +85,10 @@ def is_file(self):
     def joinpath(self, *descendants):
         try:
             return super().joinpath(*descendants)
-        except abc.TraversalError as exc:
-            # One of the paths didn't resolve.
-            msg, target, names = exc.args
-            if names:  # pragma: nocover
-                raise
-            # It was the last; construct result with the first path.
-            return self._paths[0].joinpath(target)
+        except abc.TraversalError:
+            # One of the paths did not resolve (a directory does not exist).
+            # Just return something that will not exist.
+            return self._paths[0].joinpath(*descendants)
 
     def open(self, *args, **kwargs):
         raise FileNotFoundError(f'{self} is not a file')

importlib_resources/tests/test_reader.py

@@ -77,6 +77,10 @@ def test_join_path(self):
         )
         self.assertEqual(path.joinpath(), path)
 
+    def test_join_path_compound(self):
+        path = MultiplexedPath(self.folder)
+        assert not path.joinpath('imaginary/foo.py').exists()
+
     def test_repr(self):
         self.assertEqual(
             repr(MultiplexedPath(self.folder)),

pyproject.toml

@@ -7,14 +7,14 @@ skip-string-normalization = true
 
 [tool.setuptools_scm]
 
-[pytest.enabler.black]
+[tool.pytest-enabler.black]
 addopts = "--black"
 
-[pytest.enabler.mypy]
+[tool.pytest-enabler.mypy]
 addopts = "--mypy"
 
-[pytest.enabler.flake8]
+[tool.pytest-enabler.flake8]
 addopts = "--flake8"
 
-[pytest.enabler.cov]
+[tool.pytest-enabler.cov]
 addopts = "--cov"

setup.cfg

@@ -41,7 +41,7 @@ testing =
 	pytest-mypy >= 0.9.1; \
 		# workaround for jaraco/skeleton#22
 		python_implementation != "PyPy"
-	pytest-enabler >= 1.0.1
+	pytest-enabler >= 1.3
 
 	# local
 
@@ -50,5 +50,6 @@ docs =
 	sphinx
 	jaraco.packaging >= 9
 	rst.linker >= 1.9
+	jaraco.tidelift >= 1.4
 
 	# local