Skip to content

Commit

Permalink
merge master -Dorg -Ssuccess-only: PR 305 (Ensure we are using pyopen…
Browse files Browse the repository at this point in the history
…ssl (See ome#240))
  • Loading branch information
snoopycrimecop committed Oct 16, 2021
2 parents e926fdb + 7a3bdf1 commit 30ff80f
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions src/omero/util/upgrade_check.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,13 @@
import requests
standard_library.install_aliases()

# Ensure we are using pyopenssl (ome/omero-py#240)
try:
import urllib3.contrib.pyopenssl
urllib3.contrib.pyopenssl.inject_into_urllib3()
except ImportError:
pass


class UpgradeCheck(object):

Expand Down

0 comments on commit 30ff80f

Please sign in to comment.