merge duplicate patches re: zfec setuptools
Some patches were done in the tahoe darcs repo and some in the zfec darcs repo.
This commit is contained in:
parent
e997b22068
commit
3f7588e43d
|
@ -15,7 +15,7 @@ This file can also be run as a script to install or upgrade setuptools.
|
||||||
"""
|
"""
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
DEFAULT_VERSION = "0.6c5"
|
DEFAULT_VERSION = "0.6c6"
|
||||||
DEFAULT_URL = "http://cheeseshop.python.org/packages/%s/s/setuptools/" % sys.version[:3]
|
DEFAULT_URL = "http://cheeseshop.python.org/packages/%s/s/setuptools/" % sys.version[:3]
|
||||||
|
|
||||||
md5_data = {
|
md5_data = {
|
||||||
|
@ -40,6 +40,7 @@ md5_data = {
|
||||||
'setuptools-0.6c5-py2.3.egg': 'ee9fd80965da04f2f3e6b3576e9d8167',
|
'setuptools-0.6c5-py2.3.egg': 'ee9fd80965da04f2f3e6b3576e9d8167',
|
||||||
'setuptools-0.6c5-py2.4.egg': 'afe2adf1c01701ee841761f5bcd8aa64',
|
'setuptools-0.6c5-py2.4.egg': 'afe2adf1c01701ee841761f5bcd8aa64',
|
||||||
'setuptools-0.6c5-py2.5.egg': 'a8d3f61494ccaa8714dfed37bccd3d5d',
|
'setuptools-0.6c5-py2.5.egg': 'a8d3f61494ccaa8714dfed37bccd3d5d',
|
||||||
|
'setuptools-0.6c6-py2.5.egg': 'b2f8a7520709a5b34f80946de5f02f53',
|
||||||
}
|
}
|
||||||
|
|
||||||
import sys, os
|
import sys, os
|
||||||
|
|
|
@ -20,7 +20,12 @@
|
||||||
# http://allmydata.com/.
|
# http://allmydata.com/.
|
||||||
|
|
||||||
from ez_setup import use_setuptools
|
from ez_setup import use_setuptools
|
||||||
use_setuptools(min_version='0.6a9')
|
import sys
|
||||||
|
if 'cygwin' in sys.platform.lower():
|
||||||
|
min_version='0.6c6'
|
||||||
|
else:
|
||||||
|
min_version='0.6a9'
|
||||||
|
use_setuptools(min_version=min_version)
|
||||||
|
|
||||||
from setuptools import Extension, find_packages, setup
|
from setuptools import Extension, find_packages, setup
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue