diff -r 9e6b4dbefcbc -r 80453e7a2ef1 sbin/virtualenv/create_python_env.py --- a/sbin/virtualenv/create_python_env.py Tue Nov 16 11:03:25 2010 +0100 +++ b/sbin/virtualenv/create_python_env.py Tue Nov 16 11:14:51 2010 +0100 @@ -199,38 +199,6 @@ if system_str == 'Linux' and 'DISTRIBUTE' not in ignore_packages: normal_install('DISTRIBUTE', 'pip', None, None, res_source_key, home_dir, tmp_dir) - - if 'PYXML' not in ignore_packages: - logger.notify("PyXML install : %s " % URLS['PYXML'][res_source_key]) - if sys.version_info >= (2,6): - logger.notify("PyXML -> python version >= 2.6 : patching") - pyxml_src = os.path.join(src_dir,"pyxml.tar.gz") - urllib.urlretrieve(URLS['PYXML'][res_source_key], pyxml_src) - logger.notify("PyXML -> python version >= 2.6 : extract archive") - tf = tarfile.open(pyxml_src,'r:gz') - pyxml_base_path = os.path.join(src_dir,"pyxml") - tf.extractall(pyxml_base_path) - tf.close() - - #patch - pyxml_version = os.listdir(pyxml_base_path)[0] - pyxml_path = os.path.join(pyxml_base_path, pyxml_version) - olddir = os.getcwd() - os.chdir(pyxml_path) - logger.notify("PyXML -> python version >= 2.6 : do patch %s : %s " % (pyxml_path, URLS['PYXML']['patch'])) - p = patch.fromfile(URLS['PYXML']['patch']) - p.apply() - os.chdir(olddir) - logger.notify("PyXML -> python version >= 2.6 : install") - call_subprocess([os.path.abspath(os.path.join(home_dir, 'bin', 'pip')), 'install', '-E', os.path.abspath(home_dir), '--build='+os.path.abspath(pyxml_base_path), '--no-download', pyxml_version], - cwd=os.path.abspath(tmp_dir), - filter_stdout=filter_python_develop, - show_stdout=True) - else: - call_subprocess([os.path.abspath(os.path.join(home_dir, 'bin', 'pip')), 'install', '-E', os.path.abspath(home_dir), URLS['PYXML'][res_source_key]], - cwd=os.path.abspath(tmp_dir), - filter_stdout=filter_python_develop, - show_stdout=True) NORMAL_INSTALL = [ #(key,method, option_str, extra_env) @@ -238,7 +206,6 @@ ('PSYCOPG2', 'pip', None, None), ('MYSQL', 'pip', None, None), ('PIL', 'pip', None, None), - ('FOURSUITE_XML','easy_install', None, None), ('DJANGO','pip', None, None), ('JOGGING','pip', None, None), ('DJANGO-EXTENSIONS', 'pip', None, None),