ammokhov · Sep 3, 2020 · Aug 26, 2020 · Aug 27, 2020 · Aug 27, 2020 · Sep 2, 2020
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,10 +1,13 @@
+exclude: ^(buildspec.yml|.pre-commit-config.yaml)$
+fail_fast: true
 repos:
 - repo: https://github.com/pre-commit/mirrors-isort
   rev: v4.3.17
   hooks:
   - id: isort
+    # language_version: python3.6
 - repo: https://github.com/ambv/black
-  rev: stable
+  rev: 20.8b1
   hooks:
   - id: black
     exclude: templates/

diff --git a/.travis.yml b/.travis.yml
@@ -21,3 +21,23 @@ jobs:
   - python: "3.6"
   - python: "3.7"
   - python: "3.8"
+  - stage: "integ python 3.6"
+    language: python
+    python: "3.6"
+    script:
+      - DIR=$(mktemp -d)
+      - cd "$DIR"
+      - ls -la
+      - printf "AWS::Foo::Bar\n1\ny" | cfn init -vv
+      - ls -la
+      - mypy src/aws_foo_bar/ --strict --implicit-reexport
+  - stage: "integ python 3.7"
+    language: python
+    python: "3.7"
+    script:
+      - DIR=$(mktemp -d)
+      - cd "$DIR"
+      - ls -la
+      - printf "AWS::Foo::Bar\n2\ny" | cfn init -vv
+      - ls -la
+      - mypy src/aws_foo_bar/ --strict --implicit-reexport
diff --git a/buildspec.yml b/buildspec.yml
diff --git a/python/rpdk/python/templates/models.py b/python/rpdk/python/templates/models.py
@@ -60,12 +60,12 @@ def _deserialize(
             {% set container = type.container %}
             {% set resolved_type = type.type %}
             {% if container == ContainerType.MODEL %}
-            {{ name }}={{ resolved_type }}._deserialize(json_data.get("{{ resolved_type }}")),
+            {{ name }}={{ resolved_type }}._deserialize(json_data.get("{{ name }}")),
             {% elif container == ContainerType.SET %}
-            {{ name }}=set_or_none(json_data.get("{{ resolved_type.type }}")),
+            {{ name }}=set_or_none(json_data.get("{{ name }}")),
             {% elif container == ContainerType.LIST %}
             {% if type | contains_model %}
-            {{name}}=deserialize_list(json_data.get("{{ resolved_type.type }}"), {{resolved_type.type}}),
+            {{name}}=deserialize_list(json_data.get("{{ name }}"), {{resolved_type.type}}),
             {% else %}
             {{ name }}=json_data.get("{{ name }}"),
             {% endif %}

diff --git a/python/rpdk/python/templates/requirements.txt b/python/rpdk/python/templates/requirements.txt
@@ -1 +1 @@
-{{ support_lib_name }}==2.0.0
+{{ support_lib_name }}==2.1.0
diff --git a/src/cloudformation_cli_python_lib/boto3_proxy.py b/src/cloudformation_cli_python_lib/boto3_proxy.py
@@ -1,6 +1,6 @@
+# boto3 doesn't have stub files
 from typing import Optional
 
-# boto3 doesn't have stub files
 from boto3.session import Session  # type: ignore
 
 from .utils import Credentials

diff --git a/src/cloudformation_cli_python_lib/log_delivery.py b/src/cloudformation_cli_python_lib/log_delivery.py
@@ -19,7 +19,7 @@ class ProviderLogHandler(logging.Handler):
     def __init__(
         self, group: str, stream: str, session: SessionProxy, *args: Any, **kwargs: Any
     ):
-        super(ProviderLogHandler, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         self.group = group
         self.stream = stream.replace(":", "__")
         self.client = session.client("logs")

diff --git a/src/cloudformation_cli_python_lib/recast.py b/src/cloudformation_cli_python_lib/recast.py
@@ -89,8 +89,10 @@ def _field_to_type(field: Any, key: str, classes: Dict[str, Any]) -> Any:  # noq
         possible_types = field.__args__
         if not possible_types:
             raise InvalidRequest(f"Cannot process type {field} for field {key}")
-    except AttributeError:
-        raise InvalidRequest(f"Cannot process type {field} for field {key}")
+    except AttributeError as attribute_error:
+        raise InvalidRequest(
+            f"Cannot process type {field} for field {key}"
+        ) from attribute_error
     # Assuming that the union is generated from typing.Optional, so only
     # contains one type and None
     # pylint: disable=unidiomatic-typecheck

diff --git a/tests/lib/interface_test.py b/tests/lib/interface_test.py
@@ -12,8 +12,8 @@
     ProgressEvent,
 )
 
-import hypothesis.strategies as s
-from hypothesis import given
+import hypothesis.strategies as s  # pylint: disable=C0411
+from hypothesis import given  # pylint: disable=C0411
 
 
 @pytest.fixture(scope="module")

diff --git a/tests/lib/metrics_test.py b/tests/lib/metrics_test.py
@@ -12,7 +12,7 @@
     format_dimensions,
 )
 
-from botocore.stub import Stubber
+from botocore.stub import Stubber  # pylint: disable=C0411
 
 RESOURCE_TYPE = "Aa::Bb::Cc"
 NAMESPACE = MetricsPublisherProxy._make_namespace(  # pylint: disable=protected-access

diff --git a/tests/lib/utils_test.py b/tests/lib/utils_test.py
@@ -12,8 +12,8 @@
     deserialize_list,
 )
 
-import hypothesis.strategies as s
-from hypothesis import given
+import hypothesis.strategies as s  # pylint: disable=C0411
+from hypothesis import given  # pylint: disable=C0411
 
 
 def roundtrip(value):

diff --git a/tests/plugin/codegen_test.py b/tests/plugin/codegen_test.py
@@ -94,6 +94,10 @@ def test_initialize(project):
         "README.md",
         "foo-bar-baz.json",
         "requirements.txt",
+        "inputs/inputs_1_invalid.json",
+        "inputs/inputs_1_update.json",
+        "inputs/inputs_1_create.json",
+        "inputs",
         "src",
         "src/foo_bar_baz",
         "src/foo_bar_baz/__init__.py",
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{{ support_lib_name }}==2.0.0
		{{ support_lib_name }}==2.1.0