# HG changeset patch
# User cavaliet
# Date 1412176537 -7200
# Node ID a7cad36240bfaa9bf4681ae0fac358d3169cbb58
# Parent  b1f4a742936ce37b1ee131722954bb03efd1e2a0
v0.6.1 : correct venv with distribuable libadvene

diff -r b1f4a742936c -r a7cad36240bf src/spel/__init__.py
--- a/src/spel/__init__.py	Wed Oct 01 13:15:36 2014 +0200
+++ b/src/spel/__init__.py	Wed Oct 01 17:15:37 2014 +0200
@@ -1,4 +1,4 @@
-VERSION = (0, 6, 0, "final", 0)
+VERSION = (0, 6, 1, "final", 0)
 
 VERSION_STR = unicode(".".join(map(lambda i:"%02d" % (i,), VERSION[:2])))
 
diff -r b1f4a742936c -r a7cad36240bf virtualenv/res/lib/lib_create_env.py
--- a/virtualenv/res/lib/lib_create_env.py	Wed Oct 01 13:15:36 2014 +0200
+++ b/virtualenv/res/lib/lib_create_env.py	Wed Oct 01 17:15:37 2014 +0200
@@ -49,10 +49,10 @@
     'DJANGO-TASTYPIE' : {'setup':'django-tastypie', 'url':'https://github.com/toastdriven/django-tastypie/archive/v0.9.15.tar.gz', 'local': 'django-tastypie-0.9.15.tar.gz', 'install' : {'method':'pip', 'option_str': None, 'dict_extra_env': None}},
     'DJANGO-CHUNCKED-UPLOADS' : {'setup': 'django-chuncked-uploads', 'url':'https://github.com/IRI-Research/django-chunked-uploads/archive/v0.5.tar.gz', 'local':'django-chunked-uploads-0.5.tar.gz', 'install' : {'method':'pip', 'option_str': None, 'dict_extra_env': None}},
     'LDT' : {'setup': 'ldt', 'url':'http://www.iri.centrepompidou.fr/dev/hg/spel/raw-file/e61d81e7ab8f/virtualenv/res/src/ldt-1.53.4.tar.gz', 'local':'ldt-1.53.4.tar.gz', 'install' : {'method':'pip', 'option_str': None, 'dict_extra_env': None}},
-    'SIMPLETAL' : {'setup': 'ldt', 'url':'http://www.owlfish.com/software/simpleTAL/downloads/SimpleTAL-4.3.tar.gz', 'local':'SimpleTAL-4.3.tar.gz', 'install' : {'method':'pip', 'option_str': None, 'dict_extra_env': None}},
+    'SIMPLETAL' : {'setup': 'simpletal', 'url':'http://www.owlfish.com/software/simpleTAL/downloads/SimpleTAL-4.3.tar.gz', 'local':'SimpleTAL-4.3.tar.gz', 'install' : {'method':'pip', 'option_str': None, 'dict_extra_env': None}},
     'RDFLIB' : {'setup': 'rdflib', 'url':'https://github.com/RDFLib/rdflib/archive/master.zip', 'local':'rdflib-master.zip', 'install' : {'method':'pip', 'option_str': None, 'dict_extra_env': None}},
     'ISODATE' : {'setup': 'isodate', 'url':'https://github.com/gweis/isodate/archive/master.zip', 'local':'isodate-master.zip', 'install' : {'method':'pip', 'option_str': None, 'dict_extra_env': None}},
-    'LIBADVENE' : {'setup': 'libadvene', 'url':'https://github.com/oaubert/advene2/archive/9ac68177a0e1ee8a38471d60f983aa234799a6ed.zip', 'local':'advene2-9ac68177a0e1ee8a38471d60f983aa234799a6ed.zip', 'install' : {'method':'install_libadvene', 'option_str': None, 'dict_extra_env': None}},
+    'LIBADVENE' : {'setup': 'libadvene', 'url':'libadvene-9ac68177a0e1ee8a38471d60f983aa234799a6ed.tar.gz', 'local':'libadvene-9ac68177a0e1ee8a38471d60f983aa234799a6ed.tar.gz', 'install' : {'method':'pip', 'option_str': None, 'dict_extra_env': None}},
 }
 
 if system_str == 'Windows':
@@ -148,15 +148,6 @@
     shutil.copytree(os.path.join(psycopg2_src_path, 'psycopg2'), os.path.abspath(os.path.join(home_dir, 'Lib/site-packages', 'psycopg2')))
     shutil.copy(os.path.join(psycopg2_src_path, 'psycopg2-2.4.5-py2.7.egg-info'), os.path.abspath(os.path.join(home_dir, 'Lib/site-packages', 'site-packages')))    
 
-def install_libadvene(option_str, extra_env, res_source_key, home_dir, lib_dir, tmp_dir, src_dir, res_env, logger, call_subprocess, filter_python_develop):
-    # extract advene2
-    zf = zipfile.ZipFile(res_env.URLS['LIBADVENE'][res_source_key])
-    libadvene_base_path = os.path.join(src_dir,"advene2")
-    zf.extractall(libadvene_base_path)
-    zf.close()
-    
-    libadvene_src_path = os.path.join(libadvene_base_path, "advene2-9ac68177a0e1ee8a38471d60f983aa234799a6ed", "libadvene")
-    shutil.copytree(os.path.join(libadvene_src_path), os.path.abspath(os.path.join(lib_dir, 'site-packages', 'libadvene')))
     
 
 def install_mysql(option_str, extra_env, res_source_key, home_dir, lib_dir, tmp_dir, src_dir, res_env, logger, call_subprocess, filter_python_develop):
diff -r b1f4a742936c -r a7cad36240bf virtualenv/res/src/advene2-9ac68177a0e1ee8a38471d60f983aa234799a6ed.zip
Binary file virtualenv/res/src/advene2-9ac68177a0e1ee8a38471d60f983aa234799a6ed.zip has changed
diff -r b1f4a742936c -r a7cad36240bf virtualenv/res/src/libadvene-9ac68177a0e1ee8a38471d60f983aa234799a6ed.tar.gz
Binary file virtualenv/res/src/libadvene-9ac68177a0e1ee8a38471d60f983aa234799a6ed.tar.gz has changed