Merge remote-tracking branch 'origin/master'

modelhub-ai · Jan 16, 2019 · 1bb8936 · 1bb8936
2 parents ee4f282 + 6cb52d2
commit 1bb8936
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -9,7 +9,8 @@ install:
   - pip install numpy
   - pip install Pillow==5.1.0
   - pip install SimpleITK==1.1.0
-  - pip install requests==2.18.4
+  - pip install requests==2.20.0
+  - pip install python-magic==0.4.15
   - pip install coverage
   - pip install coveralls
 script:

diff --git a/framework/modelhubapi_tests/apitestbase.py b/framework/modelhubapi_tests/apitestbase.py
@@ -3,7 +3,11 @@
 import os
 from modelhubapi import ModelHubRESTAPI
 
-
+# Python 2/3 compatibility
+try:
+  basestring
+except NameError:
+  basestring = str
 
 class TestAPIBase(unittest.TestCase):
     """

diff --git a/framework/requirements.txt b/framework/requirements.txt
@@ -6,4 +6,5 @@ Pillow==5.1.0
 SimpleITK==1.1.0
 jupyter==1.0.0
 netron==1.7.4
-requests==2.18.4
+requests==2.20.0
+python-magic==0.4.15