sailplatform
diff --git a/Collapse file
‎caliper/base.py‎
Copy file name to clipboardExpand all lines: caliper/base.py
+2-2Lines changed: 2 additions & 2 deletions b/Collapse file
‎caliper/base.py‎
Copy file name to clipboardExpand all lines: caliper/base.py
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/Collapse file
‎setup.py‎
Copy file name to clipboardExpand all lines: setup.py
+4-6Lines changed: 4 additions & 6 deletions b/Collapse file
‎setup.py‎
Copy file name to clipboardExpand all lines: setup.py
+4-6Lines changed: 4 additions & 6 deletions
diff --git a/Collapse file
‎tox.ini‎
Copy file name to clipboard
+3-6Lines changed: 3 additions & 6 deletions b/Collapse file
‎tox.ini‎
Copy file name to clipboard
+3-6Lines changed: 3 additions & 6 deletions
@@ -29,7 +29,7 @@
 from aniso8601 import (parse_datetime as aniso_parse_datetime, parse_date as
                        aniso_parse_date, parse_time as aniso_parse_time,
                        parse_duration as aniso_parse_duration)
-from oauthlib import uri_validate as oauthlib_uri_validate
+from urllib.parse import urlparse as urllib_urlparse
 
 from caliper.constants import CALIPER_CLASSES
 
@@ -71,7 +71,7 @@ def is_valid_time(time):
 def is_valid_URI(uri):
     if not uri:
         return False
-    elif isinstance(uri, str) and oauthlib_uri_validate.is_uri(uri):
+    elif isinstance(uri, str) and (urllib_urlparse(uri).geturl() == uri):
         return True
     else:
         return False
 
@@ -17,13 +17,11 @@
     os.system('python setup.py sdist upload')
     sys.exit()
 
-_packages = ['caliper', 'caliper.extern', 'caliper.util', 'caliper_tests']
+_packages = ['caliper', 'caliper.extern', 'caliper.util', 'tests']
 
-_requires = ['aniso8601 >= 1.1.0', 'future >= 0.14.3', 'oauthlib >= 0.7.2',
-             'requests >= 2.7.0']
+_requires = ['aniso8601 >= 1.1.0', 'future >= 0.14.3', 'requests >= 2.7.0']
 
-_fixtures = ['fixtures_local/*.json',
-             'fixtures_common/src/test/resources/fixtures/*.json']
+_fixtures = ['fixtures_common/src/test/resources/fixtures/*.json']
 
 
 def _get_val_from_mod(k):
@@ -49,7 +47,7 @@ def _get_val_from_mod(k):
     maintainer_email='info@imsglobal.org',
     url='https://github.com/IMSGlobal/caliper-python',
     packages=_packages,
-    package_data={'caliper_tests': _fixtures},
+    package_data={'tests': _fixtures},
     install_requires=_requires,
     license=_license,
     zip_safe=False,
 
@@ -1,14 +1,11 @@
 [tox]
-envlist = py27, py35
+envlist = py35, py27
 
 [testenv]
-changedir = caliper_tests
-commands =
-         discover
+changedir = tests
 deps =
      aniso8601
      discover
      future
-     oauthlib
      requests
-
+commands = discover