diff options
| -rw-r--r-- | .hgtags | 1 | ||||
| -rw-r--r-- | CHANGES.rst | 13 | ||||
| -rwxr-xr-x | setup.cfg | 2 | ||||
| -rwxr-xr-x | setup.py | 7 | ||||
| -rw-r--r-- | setuptools/command/upload_docs.py | 2 |
5 files changed, 22 insertions, 3 deletions
@@ -280,3 +280,4 @@ a011298221c3d47aa539ae4c119c51861caf6438 v23.2.1 8d37b17a93ec3e5fff9e040fc3f14ab7b7b24b2c v24.0.0 130a58f9503fe07ca8c7a34675b7d3a976f163d7 v24.0.1 7996c56bf6a2f81427b2f91eb11e64d690353493 v24.0.2 +d425bd1ee620772fe90e0dd2a7530b0d6a642601 v24.0.3 diff --git a/CHANGES.rst b/CHANGES.rst index e04bdf05..aa1d1b83 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -2,6 +2,19 @@ CHANGES ======= +v24.1.0 +------- + +* #659: ``setup.py`` now will fail fast and with a helpful + error message when the necessary metadata is missing. + +v24.0.3 +------- + +* Updated style in much of the codebase to match + community expectations. See #632, #633, #634, + #637, #639, #638, #642, #648. + v24.0.2 ------- @@ -1,5 +1,5 @@ [bumpversion] -current_version = 24.0.2 +current_version = 24.0.3 commit = True tag = True @@ -11,6 +11,11 @@ import textwrap # Allow to run setup.py from another directory. os.chdir(os.path.dirname(os.path.abspath(__file__))) +# Prevent improper installs without necessary metadata. See #659 +if not os.path.exists('setuptools.egg-info'): + msg = "Cannot build setuptools without metadata. Run bootstrap.py" + raise RuntimeError(msg) + src_root = None from distutils.util import convert_path @@ -67,7 +72,7 @@ wheel = ['wheel'] if needs_wheel else [] setup_params = dict( name="setuptools", - version="24.0.2", + version="24.0.3", description="Easily download, build, install, upgrade, and uninstall " "Python packages", author="Python Packaging Authority", diff --git a/setuptools/command/upload_docs.py b/setuptools/command/upload_docs.py index 01b49046..ccc1c76f 100644 --- a/setuptools/command/upload_docs.py +++ b/setuptools/command/upload_docs.py @@ -105,7 +105,7 @@ class upload_docs(upload): if not isinstance(values, list): values = [values] for value in values: - if type(value) is tuple: + if isinstance(value, tuple): title += '; filename="%s"' % value[0] value = value[1] else: |