Skip to content
Snippets Groups Projects
Commit 73d3c7cf authored by Andreas Klöckner's avatar Andreas Klöckner
Browse files

Update ez_setup.py for updated setuptools version number.

parent f252c8a1
No related branches found
No related tags found
No related merge requests found
...@@ -14,7 +14,7 @@ the appropriate options to ``use_setuptools()``. ...@@ -14,7 +14,7 @@ the appropriate options to ``use_setuptools()``.
This file can also be run as a script to install or upgrade setuptools. This file can also be run as a script to install or upgrade setuptools.
""" """
import sys import sys
DEFAULT_VERSION = "0.6c8" DEFAULT_VERSION = "0.6c9"
DEFAULT_URL = "http://pypi.python.org/packages/%s/s/setuptools/" % sys.version[:3] DEFAULT_URL = "http://pypi.python.org/packages/%s/s/setuptools/" % sys.version[:3]
md5_data = { md5_data = {
...@@ -48,13 +48,18 @@ md5_data = { ...@@ -48,13 +48,18 @@ md5_data = {
'setuptools-0.6c8-py2.3.egg': '50759d29b349db8cfd807ba8303f1902', 'setuptools-0.6c8-py2.3.egg': '50759d29b349db8cfd807ba8303f1902',
'setuptools-0.6c8-py2.4.egg': 'cba38d74f7d483c06e9daa6070cce6de', 'setuptools-0.6c8-py2.4.egg': 'cba38d74f7d483c06e9daa6070cce6de',
'setuptools-0.6c8-py2.5.egg': '1721747ee329dc150590a58b3e1ac95b', 'setuptools-0.6c8-py2.5.egg': '1721747ee329dc150590a58b3e1ac95b',
'setuptools-0.6c9-py2.3.egg': 'a83c4020414807b496e4cfbe08507c03',
'setuptools-0.6c9-py2.4.egg': '260a2be2e5388d66bdaee06abec6342a',
'setuptools-0.6c9-py2.5.egg': 'fe67c3e5a17b12c0e7c541b7ea43a8e6',
'setuptools-0.6c9-py2.6.egg': 'ca37b1ff16fa2ede6e19383e7b59245a',
} }
import sys, os import sys, os
try: from hashlib import md5
except ImportError: from md5 import md5
def _validate_md5(egg_name, data): def _validate_md5(egg_name, data):
if egg_name in md5_data: if egg_name in md5_data:
from md5 import md5
digest = md5(data).hexdigest() digest = md5(data).hexdigest()
if digest != md5_data[egg_name]: if digest != md5_data[egg_name]:
print >>sys.stderr, ( print >>sys.stderr, (
...@@ -64,7 +69,6 @@ def _validate_md5(egg_name, data): ...@@ -64,7 +69,6 @@ def _validate_md5(egg_name, data):
sys.exit(2) sys.exit(2)
return data return data
def use_setuptools( def use_setuptools(
version=DEFAULT_VERSION, download_base=DEFAULT_URL, to_dir=os.curdir, version=DEFAULT_VERSION, download_base=DEFAULT_URL, to_dir=os.curdir,
download_delay=15 download_delay=15
...@@ -233,7 +237,6 @@ def update_md5(filenames): ...@@ -233,7 +237,6 @@ def update_md5(filenames):
"""Update our built-in md5 registry""" """Update our built-in md5 registry"""
import re import re
from md5 import md5
for name in filenames: for name in filenames:
base = os.path.basename(name) base = os.path.basename(name)
...@@ -270,3 +273,4 @@ if __name__=='__main__': ...@@ -270,3 +273,4 @@ if __name__=='__main__':
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment