Imported Upstream version 38.1.0

diff --git a/CHANGES.rst b/CHANGES.rst
index c8a3ecc3f61a66da778ef58e05a3a69ae2fc060d..df91d999454afec1a7abfbefe79e320712f15b4c 100644 (file)
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+v38.1.0
+-------
+
+* #1208: Improve error message when failing to locate scripts
+  in egg-info metadata.
+
 v38.0.0
 -------
 

diff --git a/README.rst b/README.rst
index 1c6ee603541ad32f7f2a023b7cabe67b487b856c..f754d96624bc4ff32b54c94c0c73d1308eef51fb 100755 (executable)
--- a/README.rst
+++ b/README.rst
@@ -5,7 +5,7 @@
     :target: https://setuptools.readthedocs.io
 
 .. image:: https://img.shields.io/travis/pypa/setuptools/master.svg?label=Linux%20build%20%40%20Travis%20CI
-   :target: http://travis-ci.org/pypa/setuptools
+   :target: https://travis-ci.org/pypa/setuptools
 
 .. image:: https://img.shields.io/appveyor/ci/jaraco/setuptools/master.svg?label=Windows%20build%20%40%20Appveyor
    :target: https://ci.appveyor.com/project/jaraco/setuptools/branch/master

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index c06cf4b1d87025405eb0bf51a030df974007eb1c..73334641b5675510711b30d26ab7834b7990fd1a 100644 (file)
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -1513,7 +1513,10 @@ class NullProvider:
     def run_script(self, script_name, namespace):
         script = 'scripts/' + script_name
         if not self.has_metadata(script):
-            raise ResolutionError("No script named %r" % script_name)
+            raise ResolutionError(
+                "Script {script!r} not found in metadata at {self.egg_info!r}"
+                .format(**locals()),
+            )
         script_text = self.get_metadata(script).replace('\r\n', '\n')
         script_text = script_text.replace('\r', '\n')
         script_filename = self._fn(self.egg_info, script)

diff --git a/setup.cfg b/setup.cfg
index c06810df755e9d79593d9ef54b39fa685f68ab8b..39452fdeecac026f6531b38e2914ae647e7f49fb 100755 (executable)
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 38.0.0
+current_version = 38.1.0
 commit = True
 tag = True
 

diff --git a/setup.py b/setup.py
index 845588d466aa4defbb5e74dcf441ff3bfe857979..052d7a1f53e9576b16c540e498c03d1fd774f902 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -89,7 +89,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="38.0.0",
+    version="38.1.0",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",