changeset 16:10ce45af14dd

Use pyopenssl
author Catherine Wise <catherine.wise@csiro.au>
date Wed, 13 May 2015 11:09:53 +1000
parents 7b3039ccf50f
children 3121071e7ce3
files TrustStoreGalaxyBrowse.py tool_dependencies.xml
diffstat 2 files changed, 7 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/TrustStoreGalaxyBrowse.py	Wed May 13 10:59:48 2015 +1000
+++ b/TrustStoreGalaxyBrowse.py	Wed May 13 11:09:53 2015 +1000
@@ -11,6 +11,10 @@
 from py_ts import TrustStoreClient, utils
 from galaxy.datatypes.checkers import util
 
+# Tell urllib3 to use pyOpenSSL because we are on old Python stdlib.
+import urllib3.contrib.pyopenssl
+urllib3.contrib.pyopenssl.inject_into_urllib3()
+
 CLIENT_KEY = "desktop"
 CLIENT_SECRET = "cpU92F1PT7VOCANjSknuCDp4DrubmujoBaF6b0miz8OpKNokEbGMHCaSFK5/lISbBmaaGVCgeADI2A39F3Hkeg=="
 CHUNK_SIZE = 2**20 # 1Mb
--- a/tool_dependencies.xml	Wed May 13 10:59:48 2015 +1000
+++ b/tool_dependencies.xml	Wed May 13 11:09:53 2015 +1000
@@ -14,6 +14,9 @@
 passlib
 pycrypto
 psycopg2
+pyopenssl
+ndg-httpsclient
+pyasn1
                 </action>
                 <action type="download_file">https://tstest-kms.it.csiro.au/truststore/downloads/PythonTrustStore-0.5.1.tar.gz</action>
                 <action type="shell_command">.  $INSTALL_DIR/venv/bin/activate;