--- a/sbin/virtualenv/create_python_env.py Fri Oct 22 18:14:30 2010 +0200
+++ b/sbin/virtualenv/create_python_env.py Tue Oct 26 10:19:59 2010 +0200
@@ -42,10 +42,8 @@
EXTRA_TEXT += " 'DISTRIBUTE' : { 'setup': 'distribute', 'url': 'http://pypi.python.org/packages/source/d/distribute/distribute-0.6.13.tar.gz', 'local': '"+ os.path.abspath(os.path.join(src_base,"distribute-0.6.13.tar.gz"))+"'},\n"
EXTRA_TEXT += " 'PSYCOPG2' : { 'setup': 'psycopg2','url': 'http://initd.org/pub/software/psycopg/psycopg2-2.2.1.tar.gz', 'local': '"+ os.path.abspath(os.path.join(src_base,"psycopg2-2.2.1.tar.gz"))+"'},\n"
EXTRA_TEXT += " 'MYSQL' : { 'setup': 'mysql-python', 'url': 'http://sourceforge.net/projects/mysql-python/files/mysql-python-test/1.2.3c1/MySQL-python-1.2.3c1.tar.gz/download', 'local' : '"+ os.path.abspath(os.path.join(src_base,"MySQL-python-1.2.3c1.tar.gz"))+"'},\n"
-EXTRA_TEXT += " 'FOURSUITE_XML' : { 'setup': '4Suite-XML', 'url': 'ftp://ftp.4suite.org/pub/4Suite/4Suite-XML-1.0.2.tar.bz2', 'local': '"+ os.path.abspath(os.path.join(src_base,"4Suite-XML-1.0.2.tar.bz2"))+"'},\n"
EXTRA_TEXT += " 'PYLUCENE' : { 'setup': 'http://apache.crihan.fr/dist/lucene/pylucene/pylucene-3.0.1-1-src.tar.gz', 'url': 'http://apache.crihan.fr/dist/lucene/pylucene/pylucene-3.0.1-1-src.tar.gz', 'local': '"+ os.path.abspath(os.path.join(src_base,"pylucene-3.0.1-1-src.tar.gz"))+"'},\n"
EXTRA_TEXT += " 'PIL' : { 'setup': 'pil', 'url': 'http://effbot.org/downloads/Imaging-1.1.7.tar.gz', 'local': '"+ os.path.abspath(os.path.join(src_base,"Imaging-1.1.7.tar.gz"))+"'},\n"
-EXTRA_TEXT += " 'PYXML' : { 'setup': 'http://sourceforge.net/projects/pyxml/files/pyxml/0.8.4/PyXML-0.8.4.tar.gz/download', 'url': 'http://sourceforge.net/projects/pyxml/files/pyxml/0.8.4/PyXML-0.8.4.tar.gz/download', 'local': '"+ os.path.abspath(os.path.join(src_base,"PyXML-0.8.4.tar.gz"))+"', 'patch': '"+os.path.join(patch_path,"pyxml.patch")+"'},\n"
EXTRA_TEXT += " 'DJANGO' : { 'setup': 'django', 'url': 'http://www.djangoproject.com/download/1.2.3/tarball/', 'local': '"+ os.path.abspath(os.path.join(src_base,"Django-1.2.3.tar.gz"))+"'},\n"
EXTRA_TEXT += " 'JOGGING' : { 'setup': 'jogging', 'url': 'http://github.com/zain/jogging/tarball/v0.2.2', 'local': '"+ os.path.abspath(os.path.join(src_base,"jogging-0.2.2.tar.gz"))+"'},\n"
EXTRA_TEXT += " 'DJANGO-EXTENSIONS' : { 'setup': 'django-extensions', 'url':'http://django-command-extensions.googlecode.com/files/django-extensions-0.4.1.tar.gz', 'local':'"+ os.path.abspath(os.path.join(src_base,"django-extensions-0.4.1.tar.gz"))+"' },\n"
@@ -201,46 +199,13 @@
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)
- #('LXML', 'easy_install', None, {'STATIC_DEPS': 'true'}),
+# ('LXML', 'easy_install', None, {'STATIC_DEPS': 'true'}),
('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),