Include the path in the error message if the version header can't be found.

Author: cjerdonek

changelog.d/1664.change.rst

@@ -0,0 +1,2 @@
+Include the path to the ``PKG-INFO`` or ``METADATA`` file in the exception
+text when the ``Version:`` header can't be found.

pkg_resources/__init__.py

@@ -1403,8 +1403,15 @@ def get_resource_string(self, manager, resource_name):
     def has_resource(self, resource_name):
         return self._has(self._fn(self.module_path, resource_name))
 
+    def get_metadata_path(self, name):
+        return self._fn(self.egg_info, name)
+
     def has_metadata(self, name):
-        return self.egg_info and self._has(self._fn(self.egg_info, name))
+        if not self.egg_info:
+            return self.egg_info
+
+        path = self.get_metadata_path(name)
+        return self._has(path)
 
     def get_metadata(self, name):
         if not self.egg_info:
@@ -1868,6 +1875,9 @@ class FileMetadata(EmptyProvider):
     def __init__(self, path):
         self.path = path
 
+    def get_metadata_path(self, name):
+        return self.path
+
     def has_metadata(self, name):
         return name == 'PKG-INFO' and os.path.isfile(self.path)
 
@@ -2656,15 +2666,23 @@ def _warn_legacy_version(self):
 
         warnings.warn(tmpl.format(**vars(self)), PEP440Warning)
 
+    def _make_missing_version_message(self):
+        path = self._get_metadata_path_for_display(self.PKG_INFO)
+        tmpl = "Missing 'Version:' header and/or {} file at path: {}"
+        msg = tmpl.format(self.PKG_INFO, path)
+
+        return msg
+
     @property
     def version(self):
         try:
             return self._version
         except AttributeError:
             version = self._get_version()
             if version is None:
-                tmpl = "Missing 'Version:' header and/or %s file"
-                raise ValueError(tmpl % self.PKG_INFO, self)
+                msg = self._make_missing_version_message()
+                raise ValueError(msg, self)
+
             return version
 
     @property
@@ -2722,6 +2740,19 @@ def requires(self, extras=()):
                 )
         return deps
 
+    def _get_metadata_path_for_display(self, name):
+        """
+        Return the path to the given metadata file, if available.
+        """
+        try:
+            path = self.get_metadata_path(name)
+        # Handle exceptions e.g. in case the distribution's metadata
+        # provider doesn't support get_metadata_path().
+        except Exception:
+            return '[could not detect]'
+
+        return path
+
     def _get_metadata(self, name):
         if self.has_metadata(name):
             for line in self.get_metadata_lines(name):

pkg_resources/tests/test_pkg_resources.py

@@ -17,6 +17,7 @@
 except ImportError:
     import mock
 
+from pkg_resources import DistInfoDistribution, Distribution, EggInfoDistribution
 from pkg_resources.extern.six.moves import map
 from pkg_resources.extern.six import text_type, string_types
 
@@ -190,6 +191,83 @@ def test_setuptools_not_imported(self):
         subprocess.check_call(cmd)
 
 
+def touch_file(path):
+    """
+    Create an empty file.
+    """
+    with open(path, 'w') as f:
+        f.write('')
+
+
+def make_distribution_no_version(tmpdir, basename):
+    """
+    Create a distribution directory with no file containing the version.
+    """
+    # Convert the LocalPath object to a string before joining.
+    dist_dir = os.path.join(str(tmpdir), basename)
+    os.mkdir(dist_dir)
+    # Make the directory non-empty so distributions_from_metadata()
+    # will detect it and yield it.
+    touch_file(os.path.join(dist_dir, 'temp.txt'))
+
+    dists = list(pkg_resources.distributions_from_metadata(dist_dir))
+    assert len(dists) == 1
+    dist, = dists
+
+    return dist, dist_dir
+
+
+def check_version_missing(dist, metadata_path, expected_text,
+    expected_dist_type):
+    """
+    Check accessing dist.version when the "Version" header is missing.
+    """
+    with pytest.raises(ValueError) as excinfo:
+        dist.version
+
+    err = str(excinfo)
+    # Include a string expression after the assert so the full strings
+    # will be visible for inspection on failure.
+    assert expected_text in err, str((expected_text, err))
+
+    # Also check the args passed to the ValueError.
+    msg, dist = excinfo.value.args
+    assert expected_text in msg
+    # Check that the message portion contains the path.
+    assert metadata_path in msg, str((metadata_path, msg))
+    assert type(dist) == expected_dist_type
+
+
+class TestDistribution:
+
+    def test_version_missing(self, tmpdir):
+        """
+        Test when the "Version" header is missing from the metadata file.
+        """
+        dist, dist_dir = make_distribution_no_version(tmpdir, 'foo.egg-info')
+
+        expected_text = "Missing 'Version:' header and/or PKG-INFO file at path: "
+        metadata_path = os.path.join(dist_dir, 'PKG-INFO')
+        check_version_missing(dist, metadata_path=metadata_path,
+            expected_text=expected_text,
+            expected_dist_type=EggInfoDistribution)
+
+
+class TestDistInfoDistribution:
+
+    def test_version_missing(self, tmpdir):
+        """
+        Test when the "Version" header is missing from the metadata file.
+        """
+        dist, dist_dir = make_distribution_no_version(tmpdir, 'foo.dist-info')
+
+        expected_text = "Missing 'Version:' header and/or METADATA file at path: "
+        metadata_path = os.path.join(dist_dir, 'METADATA')
+        check_version_missing(dist, metadata_path=metadata_path,
+            expected_text=expected_text,
+            expected_dist_type=DistInfoDistribution)
+
+
 class TestDeepVersionLookupDistutils:
     @pytest.fixture
     def env(self, tmpdir):