Give us information about setuptools in --version

Avoid 0.6 series of setuptools - pkg_resources is broken on those versions Fixes pypa#85
sigmavirus24 · Jan 4, 2015 · 77ebef6 · 77ebef6
1 parent b393b24
commit 77ebef6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/setup.py b/setup.py
@@ -19,8 +19,9 @@
 
 
 install_requires = [
-    "requests >= 2.0",
     "pkginfo",
+    "requests >= 2.0",
+    "setuptools >= 0.7.0",
 ]
 
 if sys.version_info[:2] < (2, 7):

diff --git a/twine/cli.py b/twine/cli.py
@@ -16,6 +16,7 @@
 
 import argparse
 import pkg_resources
+import setuptools
 
 import requests
 import pkginfo
@@ -28,11 +29,12 @@ def _registered_commands(group='twine.registered_commands'):
 
 
 def dep_versions():
-    return 'pkginfo: {0}, requests: {1}'.format(
+    return 'pkginfo: {0}, requests: {1}, setuptools: {2}'.format(
         pkginfo.Installed(pkginfo).version,
         # __version__ is always defined but requests does not always have
         # PKG-INFO to read from
         requests.__version__,
+        setuptools.__version__,
     )