From c4e551081388b0c170aaf7d9b914a5be1917c2fd Mon Sep 17 00:00:00 2001 From: tahoe Date: Tue, 31 Jul 2007 16:18:11 -0700 Subject: [PATCH] setuptools upgrade to 0.6c6 --- src/simplejson/ez_setup/__init__.py | 4 +++- src/simplejson/setup.py | 2 +- src/zfec/ez_setup.py | 6 ++++-- src/zfec/setup.py | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/simplejson/ez_setup/__init__.py b/src/simplejson/ez_setup/__init__.py index d33c823c..abbe1820 100644 --- a/src/simplejson/ez_setup/__init__.py +++ b/src/simplejson/ez_setup/__init__.py @@ -15,7 +15,7 @@ This file can also be run as a script to install or upgrade setuptools. """ import sys -DEFAULT_VERSION = "0.6c5" +DEFAULT_VERSION = "0.6c6" DEFAULT_URL = "http://cheeseshop.python.org/packages/%s/s/setuptools/" % sys.version[:3] md5_data = { @@ -40,6 +40,7 @@ md5_data = { 'setuptools-0.6c5-py2.3.egg': 'ee9fd80965da04f2f3e6b3576e9d8167', 'setuptools-0.6c5-py2.4.egg': 'afe2adf1c01701ee841761f5bcd8aa64', 'setuptools-0.6c5-py2.5.egg': 'a8d3f61494ccaa8714dfed37bccd3d5d', + 'setuptools-0.6c6-py2.5.egg': 'b2f8a7520709a5b34f80946de5f02f53', } import sys, os @@ -90,6 +91,7 @@ def use_setuptools( except pkg_resources.VersionConflict, e: # XXX could we install in a subprocess here? + # --arnowa here we would need an elegant update solution, i think print >>sys.stderr, ( "The required version of setuptools (>=%s) is not available, and\n" "can't be installed while this script is running. Please install\n" diff --git a/src/simplejson/setup.py b/src/simplejson/setup.py index 01d1e433..ac189220 100644 --- a/src/simplejson/setup.py +++ b/src/simplejson/setup.py @@ -1,7 +1,7 @@ #!/usr/bin/env python import ez_setup -ez_setup.use_setuptools(min_version="0.6a9") +ez_setup.use_setuptools(min_version="0.6c6") from setuptools import setup, find_packages, Extension, Feature from distutils.command.build_ext import build_ext diff --git a/src/zfec/ez_setup.py b/src/zfec/ez_setup.py index d33c823c..34469f0a 100644 --- a/src/zfec/ez_setup.py +++ b/src/zfec/ez_setup.py @@ -15,7 +15,7 @@ This file can also be run as a script to install or upgrade setuptools. """ import sys -DEFAULT_VERSION = "0.6c5" +DEFAULT_VERSION = "0.6c6" DEFAULT_URL = "http://cheeseshop.python.org/packages/%s/s/setuptools/" % sys.version[:3] md5_data = { @@ -40,6 +40,7 @@ md5_data = { 'setuptools-0.6c5-py2.3.egg': 'ee9fd80965da04f2f3e6b3576e9d8167', 'setuptools-0.6c5-py2.4.egg': 'afe2adf1c01701ee841761f5bcd8aa64', 'setuptools-0.6c5-py2.5.egg': 'a8d3f61494ccaa8714dfed37bccd3d5d', + 'setuptools-0.6c6-py2.5.egg': 'b2f8a7520709a5b34f80946de5f02f53', } import sys, os @@ -90,6 +91,7 @@ def use_setuptools( except pkg_resources.VersionConflict, e: # XXX could we install in a subprocess here? + # --arnowa here we would need an elegant update solution, i think print >>sys.stderr, ( "The required version of setuptools (>=%s) is not available, and\n" "can't be installed while this script is running. Please install\n" @@ -157,7 +159,7 @@ def main(argv, version=DEFAULT_VERSION): if egg and os.path.exists(egg): os.unlink(egg) else: - if setuptools.__version__ == '0.0.1': + if setuptools.__version__ == "0.0.1": #Does this happen?? --arnowa # tell the user to uninstall obsolete version use_setuptools(version) diff --git a/src/zfec/setup.py b/src/zfec/setup.py index a8c08d83..8f4e31fe 100644 --- a/src/zfec/setup.py +++ b/src/zfec/setup.py @@ -20,7 +20,7 @@ # http://allmydata.com/. from ez_setup import use_setuptools -use_setuptools(min_version='0.6a9') +use_setuptools(min_version='0.6c6') from setuptools import Extension, find_packages, setup -- 2.45.2