Mercurial > repos > cathywise > truststore_browse_testing
changeset 24:f4585bf75a8a
Give up, try to update Python instead.
| author | Catherine Wise <catherine.wise@csiro.au> |
|---|---|
| date | Thu, 14 May 2015 12:03:13 +1000 |
| parents | 0637a2111bc9 |
| children | 18fe446f2d02 |
| files | TrustStoreGalaxyBrowse.py tool_dependencies.xml |
| diffstat | 2 files changed, 2 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/TrustStoreGalaxyBrowse.py Thu May 14 10:30:19 2015 +1000 +++ b/TrustStoreGalaxyBrowse.py Thu May 14 12:03:13 2015 +1000 @@ -12,8 +12,8 @@ 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() +# import urllib3.contrib.pyopenssl +# urllib3.contrib.pyopenssl.inject_into_urllib3() CLIENT_KEY = "desktop" CLIENT_SECRET = "cpU92F1PT7VOCANjSknuCDp4DrubmujoBaF6b0miz8OpKNokEbGMHCaSFK5/lISbBmaaGVCgeADI2A39F3Hkeg=="
--- a/tool_dependencies.xml Thu May 14 10:30:19 2015 +1000 +++ b/tool_dependencies.xml Thu May 14 12:03:13 2015 +1000 @@ -14,8 +14,6 @@ passlib pycrypto psycopg2 -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;