Fix python version problems before release

opsgenie · Jun 8, 2017 · fa743f6 · fa743f6
1 parent 9cd4121
commit fa743f6
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 10 deletions.
diff --git a/opsgenie/client.py b/opsgenie/client.py
@@ -1,7 +1,6 @@
-from swagger_client import AlertApi
-
 from .alert.service import AlertService
 from .config import Configuration
+from .swagger_client import AlertApi
 
 
 class OpsGenie:

diff --git a/opsgenie/config.py b/opsgenie/config.py
@@ -1,5 +1,5 @@
-from opsgenie import swagger_client
 from .errors import ApiKeyMissingError, EndpointMissingError, InvalidConfigurationError
+from .swagger_client import configuration as SwaggerConf
 
 
 class Configuration:
@@ -36,7 +36,7 @@ def __init__(self, apikey=None, endpoint=DEFAULT_ENDPOINT, http_config=None, pro
         else:
             self.proxy_config = None
 
-        self.swag_conf = swagger_client.configuration
+        self.swag_conf = SwaggerConf
         self.swag_conf.api_key['Authorization'] = self.api_key
         self.swag_conf.api_key_prefix['Authorization'] = 'GenieKey'
 

diff --git a/requirements.txt b/requirements.txt
@@ -1,8 +1,7 @@
-tox
 pytz>=2016.1
 requests>=2.9.1
+six>=1.10.0
 certifi >= 14.05.14
-six>=1.10
 python_dateutil >= 2.5.3
-setuptools >= 21.0.0
+setuptools >= 20.3.1
 urllib3 >= 1.15.1
diff --git a/test-requirements.txt b/test-requirements.txt
@@ -1,6 +1,7 @@
-coverage>=4.0.3
+tox
 nose2>=0.6.4
+httpretty>=0.8.14
+coverage>=4.0.3
 pluggy>=0.3.1
 py>=1.4.31
 randomize>=0.13
-httpretty>=0.8.14
diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27, py34
+envlist = py27, py35
 skipsdist=True
 
 [testenv]