Revert "Merge PR470"

This reverts commit 7960a1b2a40e71a149cedfb9eefd57e7fc775833, reversing
changes made to 3fa74d860fda1caa97e135779dfaa5d71536b034.
This commit is contained in:
Jean-Paul Calderone 2018-03-20 18:10:44 -04:00
parent 7960a1b2a4
commit 3bb4c979c8

View File

@ -20,7 +20,7 @@ install_requires = [
# need pkg_resources . We use >=11.3 here because that's what # need pkg_resources . We use >=11.3 here because that's what
# "cryptography" requires (which is a sub-dependency of TLS-using # "cryptography" requires (which is a sub-dependency of TLS-using
# packages), so there's no point in requiring less. # packages), so there's no point in requiring less.
"setuptools >= 28.8.0", "setuptools >= 11.3",
"zfec >= 1.1.0", "zfec >= 1.1.0",
@ -150,9 +150,7 @@ import sys
if not hasattr(sys, 'frozen'): if not hasattr(sys, 'frozen'):
package_imports.append(('setuptools', 'setuptools')) package_imports.append(('setuptools', 'setuptools'))
setup_requires = [ setup_requires = []
'setuptools >= 28.8.0', # for PEP-440 style versions
]
# These are suppressed globally: # These are suppressed globally: