From 3f7588e43d31cc7b4d9bab1a8149ab35fe7064e6 Mon Sep 17 00:00:00 2001
From: Zooko O'Whielacronx <zooko@zooko.com>
Date: Thu, 9 Aug 2007 12:40:47 -0700
Subject: [PATCH] merge duplicate patches re: zfec setuptools Some patches were
done in the tahoe darcs repo and some in the zfec darcs repo.
---
src/zfec/ez_setup.py | 3 ++-
src/zfec/setup.py | 7 ++++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/zfec/ez_setup.py b/src/zfec/ez_setup.py
index 2d60a479..364cbc90 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
diff --git a/src/zfec/setup.py b/src/zfec/setup.py
index a8c08d83..24a16e35 100644
--- a/src/zfec/setup.py
+++ b/src/zfec/setup.py
@@ -20,7 +20,12 @@
# http://allmydata.com/.
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
--
2.45.2