Merge branch 'coverage' into 'master'

Clean up coverage settings by using the new plugin system in coverage 4.5

See merge request python-devs/importlib_resources!54

Author: warsaw

coverage.ini

@@ -5,22 +5,20 @@ omit =
      setup*
     .tox/*/lib/python*/site-packages/*
     */tests/*.py
-    /tmp/*
-    /private/var/folders/*
     */testing/*.py
     importlib_resources/_py${OMIT}.py
     importlib_resources/__init__.py
     importlib_resources/_compat.py
     importlib_resources/abc.py
+plugins =
+     coverplug
 
 [report]
 exclude_lines =
     pragma: nocover
-    pragma: missed
-    pragma: ge${GEVER}
-    pragma: le${LEVER}
     raise NotImplementedError
     raise AssertionError
+    pragma: FIXME
     assert\s
 
 [paths]

coverplug.py

@@ -0,0 +1,21 @@
+"""Coverage plugin to add exclude lines based on the Python version."""
+
+import sys
+
+from coverage import CoveragePlugin
+
+
+class MyConfigPlugin(CoveragePlugin):
+    def configure(self, config):
+        opt_name = 'report:exclude_lines'
+        exclude_lines = config.get_option(opt_name)
+        # Python >= 3.6 has os.PathLike.
+        if sys.version_info >= (3, 6):
+            exclude_lines.append('pragma: >=36')
+        else:
+            exclude_lines.append('pragma: <=35')
+        config.set_option(opt_name, exclude_lines)
+
+
+def coverage_init(reg, options):
+    reg.add_configurer(MyConfigPlugin())

importlib_resources/_py2.py

@@ -169,7 +169,7 @@ def is_resource(package, name):
             # ENOTDIR, but then we'd have to depend on another external
             # library since Python 2 doesn't have unittest.mock.  It's not
             # worth it.
-            raise                     # pragma: ge3
+            raise                     # pragma: nocover
         return False
     if name not in package_contents:
         return False
@@ -232,7 +232,7 @@ def contents(package):
             # ENOTDIR, but then we'd have to depend on another external
             # library since Python 2 doesn't have unittest.mock.  It's not
             # worth it.
-            raise                     # pragma: ge3
+            raise                     # pragma: nocover
         # The package is probably in a zip file.
         archive_path = getattr(package.__loader__, 'archive', None)
         if archive_path is None:

importlib_resources/_py3.py

@@ -18,9 +18,9 @@
 
 Package = Union[ModuleType, str]
 if sys.version_info >= (3, 6):
-    Resource = Union[str, os.PathLike]              # pragma: ge35
+    Resource = Union[str, os.PathLike]              # pragma: <=35
 else:
-    Resource = str                                  # pragma: le35
+    Resource = str                                  # pragma: >=36
 
 
 def _get_package(package) -> ModuleType:
@@ -173,7 +173,7 @@ def path(package: Package, resource: Resource) -> Iterator[Path]:
     # resource_path() raises FileNotFoundError.
     package_directory = Path(package.__spec__.origin).parent
     file_path = package_directory / resource
-    if file_path.exists():
+    if file_path.exists():                          # pragma: FIXME
         yield file_path
     else:
         with open_binary(package, resource) as fp:
@@ -213,10 +213,10 @@ def is_resource(package: Package, name: str) -> bool:
     # contents doesn't necessarily mean it's a resource.  Directories are not
     # resources, so let's try to find out if it's a directory or not.
     path = Path(package.__spec__.origin).parent / name
-    if path.is_file():
+    if path.is_file():                              # pragma: FIXME
         return True
     if path.is_dir():
-        return False
+        return False                                # pragma: FIXME
     # If it's not a file and it's not a directory, what is it?  Well, this
     # means the file doesn't exist on the file system, so it probably lives
     # inside a zip file.  We have to crack open the zip, look at its table of

tox.ini

@@ -20,7 +20,7 @@ passenv =
     LANG*
     LC_*
 deps =
-     cov,diffcov: coverage
+     cov,diffcov: coverage>=4.5
      diffcov: diff_cover
 setenv =
     cov: COVERAGE_PROCESS_START={[coverage]rcfile}