Add support & testing for Python 3.7

Author: dbanty

.circleci/config.yml

@@ -3,41 +3,53 @@ orbs:
   codecov: codecov/[email protected]
 
 jobs:
-  build:
+  test:
+    working_directory: ~/repo
+    parameters:
+      python-version:
+        type: string
     docker:
-    - image: circleci/python:3.8.2
+      - image: cimg/python:<< parameters.python-version >>
     steps:
-    - checkout
-    - restore_cache:
-        keys:
-        - v1-dependencies-{{ checksum "poetry.lock" }}
-    - run:
-        name: Install Dependencies
-        command: |
-          pip install poetry --user --upgrade
-          poetry config virtualenvs.in-project true
-          poetry install
+      - checkout
+      - restore_cache:
+          keys:
+            - venv-<< parameters.python-version >>-{{ checksum "poetry.lock" }}
+      - run:
+          name: Install Dependencies
+          command: |
+            pip install poetry --user --upgrade
+            poetry config virtualenvs.in-project true
+            poetry install
 
-    - run:
-        name: Run Tests
-        command: |
-          mkdir -p test-reports/safety test-reports/mypy test-reports/pytest
-          poetry run black . --check
-          poetry run isort
-          poetry run safety check --json > test-reports/safety/results.json
-          poetry run mypy openapi_python_client --junit-xml=test-reports/mypy/results.xml
-          poetry run pytest --junitxml=test-reports/pytest/results.xml --cov=openapi_python_client tests
-          poetry run pytest end_to_end_tests
-          poetry run coverage xml
-    - store_test_results:
-        path: test-reports
-    - codecov/upload:
-        file: coverage.xml
-    - run:
-        command: poetry run pip uninstall openapi-python-client -y
-        name: Uninstall Package
-    - save_cache:
-        key: v1-dependencies-{{ checksum "poetry.lock" }}
-        paths:
-        - ./.venv
-    working_directory: ~/repo
+      - run:
+          name: Run Tests
+          command: |
+            mkdir -p test-reports/safety test-reports/mypy test-reports/pytest
+            poetry run black . --check
+            poetry run isort
+            poetry run safety check --json > test-reports/safety/results.json
+            poetry run mypy openapi_python_client --junit-xml=test-reports/mypy/results.xml
+            poetry run pytest --junitxml=test-reports/pytest/results.xml --cov=openapi_python_client tests
+            poetry run pytest end_to_end_tests
+            poetry run coverage xml
+      - store_test_results:
+          path: test-reports
+      - codecov/upload:
+          file: coverage.xml
+      - run:
+          command: poetry run pip uninstall openapi-python-client -y
+          name: Uninstall Package
+      - save_cache:
+          key: venv-<< parameters.python-version >>-{{ checksum "poetry.lock" }}
+          paths:
+            - ./.venv
+
+
+workflows:
+  tests:
+    jobs:
+      - test:
+          matrix:
+            parameters:
+              python-version: ["3.7", "3.8"]

CHANGELOG.md

@@ -5,6 +5,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 
+## 0.4.1 - 2020-06-02
+### Additions
+- Support for Python 3.7 (#58)
+
+
 ## 0.4.0 - 2020-05-30
 ### Breaking Changes
 - Classes generated to be included within lists will now be named like <ListName>Item. For example, if a property 

end_to_end_tests/test_end_to_end.py

@@ -8,7 +8,7 @@
 from openapi_python_client.cli import app
 
 
-def _compare_directories(first: Path, second: Path, /):
+def _compare_directories(first: Path, second: Path):
     first_printable = first.relative_to(Path.cwd())
     second_printable = second.relative_to(Path.cwd())
     dc = dircmp(first, second)

mypy.ini

@@ -2,7 +2,6 @@
 disallow_any_generics = True
 disallow_untyped_defs = True
 warn_redundant_casts = True
-warn_unused_ignores = True
 strict_equality = True
 
 [mypy-stringcase]

openapi_python_client/__init__.py

@@ -4,7 +4,7 @@
 import json
 import shutil
 import subprocess
-from importlib.metadata import version
+import sys
 from pathlib import Path
 from typing import Any, Dict, Optional
 
@@ -17,6 +17,12 @@
 from .openapi_parser import OpenAPI, import_string_from_reference
 from .openapi_parser.errors import MultipleParseError
 
+if sys.version_info.minor == 7:  # version did not exist in 3.7, need to use a backport
+    from importlib_metadata import version  # type: ignore
+else:
+    from importlib.metadata import version  # type: ignore
+
+
 __version__ = version(__package__)
 
 

openapi_python_client/openapi_parser/openapi.py

@@ -32,7 +32,7 @@ class EndpointCollection:
     parse_errors: List[ParseError] = field(default_factory=list)
 
     @staticmethod
-    def from_dict(d: Dict[str, Dict[str, Dict[str, Any]]], /) -> Dict[str, EndpointCollection]:
+    def from_dict(d: Dict[str, Dict[str, Dict[str, Any]]]) -> Dict[str, EndpointCollection]:
         """ Parse the openapi paths data to get EndpointCollections by tag """
         endpoints_by_tag: Dict[str, EndpointCollection] = {}
 
@@ -72,7 +72,7 @@ class Endpoint:
     multipart_body_reference: Optional[Reference] = None
 
     @staticmethod
-    def parse_request_form_body(body: Dict[str, Any], /) -> Optional[Reference]:
+    def parse_request_form_body(body: Dict[str, Any]) -> Optional[Reference]:
         """ Return form_body_reference """
         body_content = body["content"]
         form_body = body_content.get("application/x-www-form-urlencoded")
@@ -81,7 +81,7 @@ def parse_request_form_body(body: Dict[str, Any], /) -> Optional[Reference]:
         return None
 
     @staticmethod
-    def parse_multipart_body(body: Dict[str, Any], /) -> Optional[Reference]:
+    def parse_multipart_body(body: Dict[str, Any]) -> Optional[Reference]:
         """ Return form_body_reference """
         body_content = body["content"]
         body = body_content.get("multipart/form-data")
@@ -90,7 +90,7 @@ def parse_multipart_body(body: Dict[str, Any], /) -> Optional[Reference]:
         return None
 
     @staticmethod
-    def parse_request_json_body(body: Dict[str, Any], /) -> Optional[Property]:
+    def parse_request_json_body(body: Dict[str, Any]) -> Optional[Property]:
         """ Return json_body """
         body_content = body["content"]
         json_body = body_content.get("application/json")
@@ -169,7 +169,7 @@ class Schema:
     relative_imports: Set[str]
 
     @staticmethod
-    def from_dict(d: Dict[str, Any], /, name: str) -> Schema:
+    def from_dict(d: Dict[str, Any], name: str) -> Schema:
         """ A single Schema from its dict representation
         :param d:    Dict representation of the schema
         :param name: Name by which the schema is referenced, such as a model name.  Used to infer the type name if a `title` property is not available.
@@ -200,7 +200,7 @@ def from_dict(d: Dict[str, Any], /, name: str) -> Schema:
         return schema
 
     @staticmethod
-    def dict(d: Dict[str, Dict[str, Any]], /) -> Dict[str, Schema]:
+    def dict(d: Dict[str, Dict[str, Any]]) -> Dict[str, Schema]:
         """ Get a list of Schemas from an OpenAPI dict """
         result = {}
         for name, data in d.items():
@@ -221,7 +221,7 @@ class OpenAPI:
     enums: Dict[str, EnumProperty]
 
     @staticmethod
-    def from_dict(d: Dict[str, Dict[str, Any]], /) -> OpenAPI:
+    def from_dict(d: Dict[str, Dict[str, Any]]) -> OpenAPI:
         """ Create an OpenAPI from dict """
         schemas = Schema.dict(d["components"]["schemas"])
         endpoint_collections_by_tag = EndpointCollection.from_dict(d["paths"])

openapi_python_client/openapi_parser/properties.py

@@ -286,7 +286,7 @@ def get_imports(self, *, prefix: str) -> Set[str]:
         return imports
 
     @staticmethod
-    def values_from_list(l: List[str], /) -> Dict[str, str]:
+    def values_from_list(l: List[str]) -> Dict[str, str]:
         """ Convert a list of values into dict of {name: value} """
         output: Dict[str, str] = {}
 

openapi_python_client/openapi_parser/responses.py

@@ -1,11 +1,9 @@
 from dataclasses import InitVar, dataclass, field
-from typing import Any, Dict, Literal, TypedDict, Union
+from typing import Any, Dict
 
 from .errors import ParseError
 from .reference import Reference
 
-ContentType = Union[Literal["application/json"], Literal["text/html"]]
-
 
 @dataclass
 class Response:
@@ -79,18 +77,12 @@ def constructor(self) -> str:
 }
 
 
-class _ResponseDict(TypedDict):
-    description: str
-    content: Dict[ContentType, Any]
-
-
-def response_from_dict(*, status_code: int, data: _ResponseDict) -> Response:
+def response_from_dict(*, status_code: int, data: Dict[str, Any]) -> Response:
     """ Generate a Response from the OpenAPI dictionary representation of it """
     if "content" not in data:
         raise ParseError(data)
 
     content = data["content"]
-    content_type: ContentType
     if "application/json" in content:
         content_type = "application/json"
     elif "text/html" in content: