Change Requests requirement and remove unused imports

sigmavirus24 · sigmavirus24 · commit 2c46fdad34ec · 2017-12-22T15:01:37.000-06:00
diff --git a/.travis.yml b/.travis.yml
@@ -15,14 +15,6 @@ env:
 
 matrix:
   include:
-    - python: 2.7
-      env: TOXENV=py27 REQUESTS_VERSION="===2.0.1"
-    - python: 3.4
-      env: TOXENV=py34 REQUESTS_VERSION="===2.0.1"
-    - python: 3.5
-      env: TOXENV=py35 REQUESTS_VERSION="===2.0.1"
-    - python: pypy
-      env: TOXENV=pypy REQUESTS_VERSION="===2.0.1"
     - python: 2.7
       env: TOXENV=py27 REQUESTS_VERSION=""
     - python: 3.4
diff --git a/setup.py b/setup.py
@@ -23,18 +23,18 @@
     'pyasn1'
 ]
 
-kwargs['tests_require'] = ['betamax >=0.2.0', 'pytest <3.3.0',
+kwargs['tests_require'] = ['betamax>=0.8.0', 'pytest>2.3.5',
                            'betamax-matchers>=0.1.0']
 if sys.version_info < (3, 0):
     kwargs['tests_require'].append('unittest2 ==0.5.1')
 if sys.version_info < (3, 3):
-    kwargs['tests_require'].append('mock ==1.0.1')
+    kwargs['tests_require'].append('mock')
 
 if sys.argv[-1] in ("submit", "publish"):
     os.system("python setup.py bdist_wheel sdist upload")
     sys.exit()
 
-requires.extend(["requests >= 2.0", "uritemplate >= 3.0.0"])
+requires.extend(["requests >= 2.18", "uritemplate >= 3.0.0"])
 
 __version__ = ''
 with open('github3/__about__.py', 'r') as fd:
diff --git a/tests/integration/test_orgs.py b/tests/integration/test_orgs.py
@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 """Integration tests for methods implemented on Organization."""
 import pytest
-import requests
 
 import github3
 
diff --git a/tests/integration/test_repos_release.py b/tests/integration/test_repos_release.py
@@ -2,9 +2,6 @@
 import os
 import tempfile
 
-import pytest
-import requests
-
 from .helper import IntegrationHelper
 
 
diff --git a/tests/integration/test_repos_repo.py b/tests/integration/test_repos_repo.py
@@ -3,7 +3,6 @@
 import github3.exceptions as exc
 
 import pytest
-import requests
 
 from . import helper
 
