From 3bb4c979c862c80534c6998c9390016f7847e4fa Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone Date: Tue, 20 Mar 2018 18:10:44 -0400 Subject: [PATCH] Revert "Merge PR470" This reverts commit 7960a1b2a40e71a149cedfb9eefd57e7fc775833, reversing changes made to 3fa74d860fda1caa97e135779dfaa5d71536b034. --- src/allmydata/_auto_deps.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/allmydata/_auto_deps.py b/src/allmydata/_auto_deps.py index 6bd532bf2..4f9b04828 100644 --- a/src/allmydata/_auto_deps.py +++ b/src/allmydata/_auto_deps.py @@ -20,7 +20,7 @@ install_requires = [ # need pkg_resources . We use >=11.3 here because that's what # "cryptography" requires (which is a sub-dependency of TLS-using # packages), so there's no point in requiring less. - "setuptools >= 28.8.0", + "setuptools >= 11.3", "zfec >= 1.1.0", @@ -150,9 +150,7 @@ import sys if not hasattr(sys, 'frozen'): package_imports.append(('setuptools', 'setuptools')) -setup_requires = [ - 'setuptools >= 28.8.0', # for PEP-440 style versions -] +setup_requires = [] # These are suppressed globally: