Remove explicit depend on distribute.
Things in the world are moving towards setuptools 0.7, and there is not a path between distribute and setuptools. Our explicit dependency on setuptools is causing us to have to write patches to try to jump through additional hoops to get it to install in the right contexts. Fixes bug 1189941 Change-Id: Id7a749c02203100dab52160a551d3548c8a48fd6
This commit is contained in:
parent
6c91a6f0f0
commit
fa4f46e39c
|
@ -1,3 +1,2 @@
|
|||
d2to1>=0.2.10,<0.3
|
||||
distribute<0.7
|
||||
setuptools_git>=0.4
|
||||
|
|
13
setup.py
13
setup.py
|
@ -14,19 +14,6 @@
|
|||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
import os
|
||||
import sys
|
||||
|
||||
try:
|
||||
sys.path += [x for x in os.listdir(".") if x.endswith(".egg")]
|
||||
import d2to1 # flake8: noqa
|
||||
except ImportError:
|
||||
import subprocess
|
||||
if not subprocess.call(
|
||||
[sys.executable] +
|
||||
"-m pip.__init__ install distribute<0.7 d2to1>=0.2.10,<0.3".split()
|
||||
):
|
||||
sys.exit(subprocess.call([sys.executable] + sys.argv))
|
||||
import setuptools
|
||||
|
||||
setuptools.setup(
|
||||
|
|
Loading…
Reference in New Issue