Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,9 @@


install_requires = [
"requests >= 2.0",
"pkginfo",
"requests >= 2.0",
"setuptools >= 0.7.0",
]

if sys.version_info[:2] < (2, 7):
Expand Down
4 changes: 3 additions & 1 deletion twine/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

import argparse
import pkg_resources
import setuptools

import requests
import pkginfo
Expand All @@ -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__,
)


Expand Down