Merge pull request #90 from akx/yeet-py27

Remove Python 2.7 support

Author: ajmyyra

.editorconfig

@@ -8,10 +8,7 @@ root = true
 [*]
 charset = utf-8
 end_of_line = lf
-indent_size = 2
+indent_size = 4
 indent_style = space
 insert_final_newline = true
 trim_trailing_whitespace = true
-
-[*.md]
-trim_trailing_whitespace = false

README.md

@@ -16,32 +16,13 @@ Alternatively, if you want the newest master or a devel branch - clone the proje
 python setup.py install
 ```
 
-**!! SSL security update for python 2 !!**
-* short story: `pip install requests[security]` should solve all of your problems.
-* long story:
-	* upcloud-python-api uses [requests](http://docs.python-requests.org/en/latest/)
-	  for HTTP(S) that in turn uses [urllib3](https://urllib3.readthedocs.org/en/latest/)
-	* urllib3 may detect that your python2.x's SSL is lacking as described
-	  [here](https://urllib3.readthedocs.org/en/latest/security.html#insecureplatformwarning) and
-	  [here](https://urllib3.readthedocs.org/en/latest/security.html#pyopenssl).
-	* you may also be interested in (especially if `requests[security]` did not work for you on Ubuntu)
-	  [http://stackoverflow.com/questions/29099404/ssl-insecureplatform-error-when-using-requests-package]
-	  (http://stackoverflow.com/questions/29099404/ssl-insecureplatform-error-when-using-requests-package)
-
-
-**Supported versions in the next release** (offline tests pass with tox):
-
-* <del>python 2.6</del> removed due to deprecation
-* python 2.7 supported but not recommended, especially when upcloud-ansible will be ported to python3
-* <del>python 3.2</del> removed due to python2/3 support
-* <del>python 3.3</del> removed due to python2/3 support
-* <del>python 3.4</del> removed due to python2/3 support
-* <del>python 3.5</del> removed due to python2/3 support
-* python 3.6
-* python 3.7
-* python 3.8
-* python 3.9
-* pypi3
+### Supported Python
+
+* Python 3.6
+* Python 3.7
+* Python 3.8
+* Python 3.9
+* PyPy3
 
 **Changelog:**
 * See the [Releases page](https://github.com/UpCloudLtd/upcloud-python-api/releases)

circle.yml

@@ -11,7 +11,7 @@ packages=['upcloud_api', 'upcloud_api.cloud_manager']
 license = MIT
 
 [options]
-python_requires = >=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*, <4
+python_requires = >=3.6, <4
 setup_requires =
     setuptools
     pytest-runner
@@ -26,8 +26,5 @@ packages =
     upcloud_api
     upcloud_api.cloud_manager
 
-[tox:tox]
-envlist = py27, py36, py37, py38, py39, pypy3
-
 [bdist_wheel]
 universal = 1

setup.cfg

@@ -1,7 +1,3 @@
-from __future__ import unicode_literals
-from __future__ import print_function
-from __future__ import division
-from __future__ import absolute_import
 import json
 import os
 import pytest
@@ -27,11 +23,11 @@ def manager():
 def read_from_file(filename):
     filename = filename.replace("/", "_")
     cwd = os.path.dirname(__file__)
-    f = open(cwd + '/json_data/'+filename, 'r')
+    f = open(cwd + '/json_data/'+filename)
     return f.read()
 
 
-class Mock(object):
+class Mock:
     base_url = 'https://api.upcloud.com/1.3'
 
     @staticmethod

test/conftest.py

@@ -1,8 +1,3 @@
-from __future__ import print_function
-from __future__ import unicode_literals
-from __future__ import division
-from __future__ import absolute_import
-
 from upcloud_api import CloudManager, Storage, FirewallRule, Tag, IPAddress
 from upcloud_api.server import Server, login_user_block
 

test/helpers/infra.py

@@ -1,8 +1,3 @@
-from __future__ import print_function
-from __future__ import unicode_literals
-from __future__ import division
-from __future__ import absolute_import
-
 from upcloud_api import Tag
 
 

test/helpers/infra_helpers.py

@@ -1,15 +1,9 @@
-from __future__ import unicode_literals
-from __future__ import print_function
-from __future__ import division
-from __future__ import absolute_import
-
-
 from upcloud_api import IPAddress, Server
 from conftest import Mock, read_from_file
 import json
 import responses
 
-class TestIP(object):
+class TestIP:
 
     def test_ip_in_server_creation(self):
         """IPAddress in server creation.
@@ -36,7 +30,7 @@ def test_ip_in_server_details(self):
         data = read_from_file('server_00798b85-efdc-41ca-8021-f6ef457b8531.json')
         s = Server(**json.loads(data))
         for ip in s.ip_addresses:
-            assert set(ip.to_dict().keys()) == set(['address', 'family', 'access'])
+            assert set(ip.to_dict().keys()) == {'address', 'family', 'access'}
 
     def test_ip_details(self):
         """IPAdress LIST/GET.

test/test_apidoc/test_10_ip_addresses.py

@@ -1,14 +1,9 @@
-from __future__ import unicode_literals
-from __future__ import print_function
-from __future__ import division
-from __future__ import absolute_import
-
 from conftest import Mock
 import json
 import responses
 
 
-class TestCloudManagerBasic(object):
+class TestCloudManagerBasic:
     @responses.activate
     def test_get_account(self, manager):
         data = Mock.mock_get("account")

test/test_cloud_manager.py

@@ -1,8 +1,3 @@
-from __future__ import unicode_literals
-from __future__ import print_function
-from __future__ import division
-from __future__ import absolute_import
-
 from upcloud_api import FirewallRule
 
 from conftest import Mock
@@ -30,7 +25,7 @@ def check_fields(body):
         """
         for field in required_fields:
             if field not in request_body['firewall_rule']:
-                raise Exception('missing required field: {0}. Body was:{1}'.format(field, request_body))
+                raise Exception(f'missing required field: {field}. Body was:{request_body}')
 
     if isinstance(request_body, list):
         for body in request_body:
@@ -42,7 +37,7 @@ def check_fields(body):
 
 
 
-class TestFirewall(object):
+class TestFirewall:
     @responses.activate
     def test_add_firewall_rule(self, manager):
         Mock.mock_get('server/00798b85-efdc-41ca-8021-f6ef457b8531')