Mercurial Mercurial > fablib / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
correct paramiko version
authorymh <ymh.work@gmail.com>
Fri, 28 Mar 2014 15:44:39 +0100
changeset 19 55fecd7b4ba7
parent 18 bc8e23448f4d
child 20 7fe7c089c1f2
correct paramiko version
virtualenv/fablib/res/requirement.txt file | annotate | diff | comparison | revisions
virtualenv/res/lib/lib_create_env.py file | annotate | diff | comparison | revisions
virtualenv/res/src/paramiko-1.12.3.tar.gz file | annotate | diff | comparison | revisions
virtualenv/res/src/paramiko-1.13.0.tar.gz file | annotate | diff | comparison | revisions
virtualenv/res/src/requirement.txt file | annotate | diff | comparison | revisions 
--- a/virtualenv/fablib/res/requirement.txt	Wed Mar 26 15:32:32 2014 +0100
+++ b/virtualenv/fablib/res/requirement.txt	Fri Mar 28 15:44:39 2014 +0100
@@ -1,7 +1,7 @@
 #pip install -f <path_to>/virtualenv/res/src --no-index -r requirement.txt 
 Fabric==1.8.3
-ecdsa==0.10
-mercurial==2.8.2
-paramiko==1.12.0
+ecdsa==0.11
+mercurial==2.9.1
+paramiko==1.12.3
 pycrypto==2.6.1
-wsgiref==0.1.2
\ No newline at end of file
+wsgiref==0.1.2
--- a/virtualenv/res/lib/lib_create_env.py	Wed Mar 26 15:32:32 2014 +0100
+++ b/virtualenv/res/lib/lib_create_env.py	Fri Mar 28 15:44:39 2014 +0100
@@ -16,10 +16,10 @@
 
 URLS = {
     #'': {'setup': '', 'url':'', 'local':''},
-    'EDCSA': {'setup': 'edcsa', 'url':'https://github.com/warner/python-ecdsa/archive/python-ecdsa-0.11.tar.gz', 'local':'ecdsa-0.10.tar.gz', 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
+    'EDCSA': {'setup': 'edcsa', 'url':'https://github.com/warner/python-ecdsa/archive/python-ecdsa-0.11.tar.gz', 'local':'ecdsa-0.11.tar.gz', 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
     'WSGIREF': {'setup': 'wsgiref', 'url':'https://pypi.python.org/packages/source/w/wsgiref/wsgiref-0.1.2.zip', 'local':'wsgiref-0.1.2.zip', 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
     'PYCRYPTO': {'setup': 'pycrypto', 'url':'http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/pycrypto-2.6.1.tar.gz', 'local':'pycrypto-2.6.1.tar.gz', 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
-    'PARAMIKO' : {'setup': 'paramiko', 'url':'https://github.com/paramiko/paramiko/archive/v1.13.0.tar.gz', 'local':'paramiko-1.13.0.tar.gz', 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
+    'PARAMIKO' : {'setup': 'paramiko', 'url':'https://github.com/paramiko/paramiko/archive/v1.12.3.tar.gz', 'local':'paramiko-1.12.3.tar.gz', 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
     'FABRIC': {'setup': 'fabric', 'url':'https://github.com/fabric/fabric/archive/1.8.3.tar.gz', 'local':'fabric-1.8.3.tar.gz', 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
     'MERCURIAL': {'setup': 'mercurial', 'url':'http://mercurial.selenic.com/release/mercurial-2.9.1.tar.gz', 'local':'mercurial-2.9.1.tar.gz', 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
 }
@@ -48,7 +48,7 @@
             if url_dict.get('install', {}).get('method','pip') == 'pip-req':
                 get_base_path = self.get_run_res_base_path
             else:
-                get_base_path = self.get_src_base_path                                
+                get_base_path = self.get_src_base_path
             if not url_dict['url'].startswith("http://"):
                 url_dict_copy['url'] = get_base_path(url_dict['url'])
             url_dict_copy['local'] = get_base_path(url_dict['local'])
@@ -306,7 +306,12 @@
                     extra_env = {}
                     
                 if 'TMPDIR' not in extra_env:
-                    extra_env['TMPDIR'] = os.path.abspath(tmp_dir)          
+                    extra_env['TMPDIR'] = os.path.abspath(tmp_dir)
+                if system_str == 'Darwin':
+                    archflags = extra_env.get('ARCHFLAGS', '')
+                    if '-Wno-error=unused-command-line-argument-hard-error-in-future' not in archflags:
+                        archflags += " -Wno-error=unused-command-line-argument-hard-error-in-future"
+                        extra_env['ARCHFLAGS'] = archflags.strip()
                 #isinstance(lst, (list, tuple))
                 if key not in ignore_packages:
                     logger.notify("install %s with method %s" % (key, repr(method)))
Binary file virtualenv/res/src/paramiko-1.12.3.tar.gz has changed
Binary file virtualenv/res/src/paramiko-1.13.0.tar.gz has changed
--- a/virtualenv/res/src/requirement.txt	Wed Mar 26 15:32:32 2014 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-./pycrypto-2.6.tar.gz
-./paramiko-1.12.0.tar.gz
-./Fabric-1.8.1.tar.gz
-./mercurial-2.8.2.tar.gz
fablib