Drop support for Python < 3.8 (#31)

Author: milkrage

.github/workflows/checks.yml

@@ -0,0 +1,21 @@
+name: Checks
+on: push
+jobs:
+  flake8:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: '3.8'
+      - run: pip install -r requirements.txt -r test-requirements.txt
+      - run: flake8 .
+  pytest:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: '3.8'
+      - run: pip install -r requirements.txt -r test-requirements.txt
+      - run: pytest tests/

.travis.yml

@@ -1,7 +1,5 @@
-cliff==3.10.1
-pbr==5.11.0
-requests==2.28.1
-six==1.16.0
-PyYAML==6.0
-python-keystoneclient==4.5.0
-importlib-metadata==4.13.0
+cliff>=3.1.0
+pbr>=5.4.5
+requests>=2.22.0
+PyYAML>=5.3.1
+python-keystoneclient>=4.0.0

requirements.txt

@@ -1 +1 @@
-__version__ = "2.1"
+__version__ = "2.2"

selvpcclient/__init__.py

@@ -1,7 +1,6 @@
 import abc
 import logging
 
-import six
 from cliff.command import Command
 from cliff.lister import Lister
 from cliff.show import ShowOne
@@ -176,7 +175,7 @@ def __repr__(self):
         return "<%s %s>" % (self.__class__.__name__, info)
 
     def _add_details(self, info):
-        for (k, v) in six.iteritems(info):
+        for k, v in info.items():
             setattr(self, k, v)
 
     def __getattr__(self, k):
@@ -201,8 +200,7 @@ def take_action(self, parsed_args):
         pass
 
 
-@six.add_metaclass(abc.ABCMeta)
-class DisplayCommand(CLICommand):
+class DisplayCommand(CLICommand, metaclass=abc.ABCMeta):
     columns = []
     _formatters = {}
 

selvpcclient/base.py

@@ -1,8 +1,6 @@
 import inspect
 import sys
 
-import six
-
 from selvpcclient.exceptions import base
 
 
@@ -300,11 +298,13 @@ class HttpVersionNotSupported(HttpServerError):
     message = "HTTP Version Not Supported"
 
 
-# _code_map contains all the classes that have http_status attribute.
-_code_map = dict(
-    (getattr(obj, 'http_status', None), obj)
-    for name, obj in six.iteritems(vars(sys.modules[__name__]))
-    if inspect.isclass(obj) and getattr(obj, 'http_status', False))
+_code_map = {}
+
+for member in inspect.getmembers(sys.modules[__name__], inspect.isclass):
+    name, obj = member
+
+    if hasattr(obj, 'http_status'):
+        _code_map[getattr(obj, 'http_status')] = obj
 
 
 def get_http_exception(status_code, content=None):

selvpcclient/exceptions/http.py

@@ -7,7 +7,6 @@
 from typing import Dict, Optional, Tuple
 
 import requests
-import six
 
 from selvpcclient.exceptions.base import ClientException
 
@@ -207,7 +206,7 @@ def try_parse_json(json_):
 def make_curl(url, method, data):
     string_parts = ['curl -i', ' -X{} "{}"'.format(method, url)]
 
-    for (key, value) in six.iteritems(data.get('headers', {})):
+    for key, value in data.get('headers', {}).items():
         if key in SENSITIVE_HEADERS:
             v = str()
             if value:

selvpcclient/util.py

@@ -15,9 +15,7 @@ classifier =
     Development Status :: 5 - Production/Stable
     Operating System :: OS Independent
     Programming Language :: Python
-    Programming Language :: Python :: 2.7
-    Programming Language :: Python :: 3.4
-    Programming Language :: Python :: 3.5
+    Programming Language :: Python :: 3.8
 
 [entry_points]
 console_scripts =

setup.cfg

@@ -2,7 +2,7 @@
 from setuptools import find_packages, setup
 
 setup(
-    setup_requires=['pbr>=1.8'],
+    setup_requires=['pbr>=5.4.5'],
     packages=find_packages(exclude=['tests']),
     pbr=True
 )

setup.py

@@ -1,4 +1,4 @@
-pytest==2.9.1
-responses==0.5.1
-mock==4.0.3
-flake8==3.9.2
+pytest==7.2.1
+responses==0.22.0
+mock==5.0.1
+flake8==6.0.0