Drop Python 2.7 and 3.5 support

Author: RobbeSneyders

.github/workflows/python-publish.yml

@@ -12,21 +12,18 @@ on:
 jobs:
   publish:
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        python-version: [2.7, 3.6]
     steps:
       - uses: actions/checkout@v2
 
-      - name: Set up Python ${{ matrix.python-version }}
+      - name: Set up Python
         uses: actions/setup-python@v2
         with:
-          python-version: ${{ matrix.python-version }}
+          python-version: '3.x'
 
       - name: Bootstrap poetry
         run: |
-          python -m pip install --upgrade pip
-          pip install "poetry<1.2"
+          curl -sL https://raw.githubusercontent.com/python-poetry/poetry/master/install-poetry.py | python - -y
+          echo "$HOME/.local/bin" >> $GITHUB_PATH
 
       - name: Build
         run: poetry build

.github/workflows/python-test.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        python-version: [2.7, 3.5, 3.6, 3.7, 3.8, 3.9]
+        python-version: [3.6, 3.7, 3.8, 3.9]
         os: [windows-latest, ubuntu-latest]
       fail-fast: false
     steps:

.travis.yml

@@ -2,8 +2,6 @@ language: python
 sudo: false
 matrix:
   include:
-  - python: 2.7
-  - python: 3.5
   - python: 3.6
   - python: 3.7
   - python: 3.8

openapi_spec_validator/generators.py

@@ -1,7 +1,6 @@
 """OpenAPI spec validator generators module."""
 import logging
 
-from six import iteritems
 from jsonschema.validators import Draft4Validator
 
 from openapi_spec_validator.decorators import DerefValidatorDecorator
@@ -37,6 +36,6 @@ def from_spec_resolver(cls, spec_resolver):
         :type instance_resolver: :class:`jsonschema.RefResolver`
         """
         deref = DerefValidatorDecorator(spec_resolver)
-        for key, validator_callable in iteritems(Draft4Validator.VALIDATORS):
+        for key, validator_callable in Draft4Validator.VALIDATORS.items():
             if key in cls.validators:
                 yield key, deref(validator_callable)

openapi_spec_validator/handlers/file.py

@@ -1,5 +1,5 @@
 """OpenAPI spec validator handlers file module."""
-from six import StringIO
+import io
 from yaml import load
 
 from openapi_spec_validator.handlers.base import BaseHandler
@@ -21,7 +21,7 @@ class FileHandler(FileObjectHandler):
     """OpenAPI spec validator file path handler."""
 
     def __call__(self, uri):
-        if isinstance(uri, StringIO):
+        if isinstance(uri, io.StringIO):
             return super(FileHandler, self).__call__(uri)
 
         assert uri.startswith("file")

openapi_spec_validator/handlers/requests.py

@@ -1,10 +1,9 @@
 """OpenAPI spec validator handlers requests module."""
-from __future__ import absolute_import
 import contextlib
-
-from six import StringIO
-from six.moves.urllib.parse import urlparse
+import io
 import requests
+import urllib.parse
+
 
 from openapi_spec_validator.handlers.file import FileHandler
 
@@ -18,7 +17,7 @@ def __init__(self, *allowed_schemes, **options):
         self.allowed_schemes = allowed_schemes
 
     def __call__(self, url):
-        scheme = urlparse(url).scheme
+        scheme = urllib.parse.urlparse(url).scheme
         assert scheme in self.allowed_schemes
 
         if scheme == "file":
@@ -27,6 +26,6 @@ def __call__(self, url):
         response = requests.get(url, timeout=self.timeout)
         response.raise_for_status()
 
-        data = StringIO(response.text)
+        data = io.StringIO(response.text)
         with contextlib.closing(data) as fh:
             return super(UrlRequestsHandler, self).__call__(fh)

openapi_spec_validator/handlers/urllib.py

@@ -1,8 +1,8 @@
 """OpenAPI spec validator handlers requests module."""
 import contextlib
 
-from six.moves.urllib.parse import urlparse
-from six.moves.urllib.request import urlopen
+import urllib.parse
+import urllib.request
 
 from openapi_spec_validator.handlers.file import FileObjectHandler
 
@@ -16,9 +16,9 @@ def __init__(self, *allowed_schemes, **options):
         self.allowed_schemes = allowed_schemes
 
     def __call__(self, url):
-        assert urlparse(url).scheme in self.allowed_schemes
+        assert urllib.parse.urlparse(url).scheme in self.allowed_schemes
 
-        f = urlopen(url, timeout=self.timeout)
+        f = urllib.request.urlopen(url, timeout=self.timeout)
 
         with contextlib.closing(f) as fh:
             return super(UrllibHandler, self).__call__(fh)

openapi_spec_validator/handlers/utils.py

@@ -1,12 +1,12 @@
 import os.path
 
-from six.moves.urllib.parse import urlparse, unquote
-from six.moves.urllib.request import url2pathname
+import urllib.parse
+import urllib.request
 
 
 def uri_to_path(uri):
-    parsed = urlparse(uri)
+    parsed = urllib.parse.urlparse(uri)
     host = "{0}{0}{mnt}{0}".format(os.path.sep, mnt=parsed.netloc)
     return os.path.normpath(
-        os.path.join(host, url2pathname(unquote(parsed.path)))
+        os.path.join(host, urllib.request.url2pathname(urllib.parse.unquote(parsed.path)))
     )

openapi_spec_validator/readers.py

@@ -1,8 +1,5 @@
 import os
-try:
-    import pathlib
-except ImportError:
-    import pathlib2 as pathlib
+import pathlib
 import sys
 
 from openapi_spec_validator import all_urls_handler, file_object_handler

openapi_spec_validator/schemas.py

@@ -2,7 +2,8 @@
 import os
 
 from pkg_resources import resource_filename
-from six.moves.urllib import parse, request
+import urllib.parse
+import urllib.request
 from yaml import load
 
 from openapi_spec_validator.loaders import ExtendedSafeLoader
@@ -13,7 +14,7 @@ def get_openapi_schema(version):
     path_resource = resource_filename('openapi_spec_validator', path)
     path_full = os.path.join(os.path.dirname(__file__), path_resource)
     schema = read_yaml_file(path_full)
-    schema_url = parse.urljoin('file:', request.pathname2url(path_full))
+    schema_url = urllib.parse.urljoin('file:', urllib.request.pathname2url(path_full))
     return schema, schema_url
 
 

openapi_spec_validator/shortcuts.py

@@ -1,5 +1,5 @@
 """OpenAPI spec validator shortcuts module."""
-from six.moves.urllib import parse
+import urllib.parse
 
 
 def validate_spec_factory(validator_callable):
@@ -10,7 +10,7 @@ def validate(spec, spec_url=''):
 
 def validate_spec_url_factory(validator_callable, handlers):
     def validate(url):
-        result = parse.urlparse(url)
+        result = urllib.parse.urlparse(url)
         handler = handlers[result.scheme]
         spec = handler(url)
         return validator_callable(spec, spec_url=url)

openapi_spec_validator/validators.py

@@ -3,7 +3,6 @@
 
 from jsonschema.validators import RefResolver
 from openapi_schema_validator import OAS30Validator, oas30_format_checker
-from six import iteritems
 
 from openapi_spec_validator.exceptions import (
     ParameterDuplicateError, ExtraParametersError, UnresolvableParameterError,
@@ -108,7 +107,7 @@ def __init__(self, dereferencer):
     @wraps_errors
     def iter_errors(self, schemas):
         schemas_deref = self.dereferencer.dereference(schemas)
-        for name, schema in iteritems(schemas_deref):
+        for name, schema in schemas_deref.items():
             for err in self._iter_schema_errors(schema):
                 yield err
 
@@ -164,7 +163,7 @@ def __init__(self, dereferencer, operation_ids_registry=None):
     @wraps_errors
     def iter_errors(self, paths):
         paths_deref = self.dereferencer.dereference(paths)
-        for url, path_item in iteritems(paths_deref):
+        for url, path_item in paths_deref.items():
             for err in self._iter_path_errors(url, path_item):
                 yield err
 
@@ -213,7 +212,7 @@ def iter_errors(self, url, path_item):
         for err in self._iter_parameters_errors(parameters):
             yield err
 
-        for field_name, operation in iteritems(path_item):
+        for field_name, operation in path_item.items():
             if field_name not in self.OPERATIONS:
                 continue
 

pyproject.toml

@@ -23,9 +23,7 @@ classifiers = [
     "Intended Audience :: Developers",
     "Topic :: Software Development :: Libraries :: Python Modules",
     "Operating System :: OS Independent",
-    "Programming Language :: Python :: 2.7",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.5",
     "Programming Language :: Python :: 3.6",
     "Programming Language :: Python :: 3.7",
     "Programming Language :: Python :: 3.8",
@@ -38,7 +36,7 @@ jsonschema = ">=3.2.0, <4.0.0"
 openapi-schema-validator = "<0.2.0"
 pathlib2 = {version = "*", python = "~2.7"}
 pyrsistent = "<0.17.0"
-python = ">= 2.7, != 3.0.*, != 3.1.*, != 3.2.*, != 3.3.*, != 3.4.*"
+python = ">= 3.6"
 PyYAML = ">=5.1"
 requests = {version = "*", optional = true}
 setuptools = "*"
@@ -49,7 +47,6 @@ dev = ["pre-commit"]
 requests = ["requests"]
 
 [tool.poetry.dev-dependencies]
-mock = {version = "*", python = "~2.7"}
 pre-commit =  {version = "*", optional = true}
 pytest = "=3.5.0"
 pytest-flake8 = "=1.0.7"

tests/integration/test_main.py

@@ -3,10 +3,7 @@
 
 from openapi_spec_validator.__main__ import main
 
-try:
-    from unittest import mock
-except ImportError:
-    import mock
+from unittest import mock
 
 
 def test_schema_default():

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = {py27,py35,py36}-{default,simplejson}
+envlist = {py36,py37,py38,py39}-{default,simplejson}
 
 [testenv]
 deps =