add 3.6 check and remove 3.6 incompatible future annotations import

autorest/codegen/serializers/general_serializer.py

@@ -78,9 +78,6 @@ def serialize_vendor_file(self) -> str:
             )
 
         if self.code_model.need_mixin_abc:
-            file_import.add_submodule_import(
-                "__future__", "annotations", ImportType.STDLIB
-            )
             file_import.add_submodule_import(
                 "abc",
                 "ABC",

autorest/codegen/templates/vendor.py.jinja2

@@ -29,8 +29,8 @@ def _format_url_section(template, **kwargs):
 
 class MixinABC(ABC):
     """DO NOT use this class. It is for internal typing use only."""
-    _client: {{ keywords.async_class }}PipelineClient
+    _client: "{{ keywords.async_class }}PipelineClient"
     _config: {{ code_model.class_name }}Configuration
-    _serialize: Serializer
-    _deserialize: Deserializer
+    _serialize: "Serializer"
+    _deserialize: "Deserializer"
 {% endif %}

eng/pipelines/ci.yml

@@ -40,11 +40,14 @@ jobs:
 
     strategy:
       matrix:
+        Windows_Python36:
+          OSName: "Windows"
+          OSVmImage: "MMS2019"
+          PythonVersion: "3.6"
         Linux_Python37:
           OSName: "Linux"
           OSVmImage: "MMSUbuntu20.04"
           PythonVersion: "3.7"
-          CoverageArg: ""
         Linux_Python310:
           OSName: "Linux"
           OSVmImage: "MMSUbuntu20.04"

test/azure/version-tolerant/Expected/AcceptanceTests/AzureReportVersionTolerant/azurereportversiontolerant/_vendor.py

@@ -5,7 +5,6 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from __future__ import annotations
 from abc import ABC
 from typing import TYPE_CHECKING
 
@@ -21,7 +20,7 @@
 class MixinABC(ABC):
     """DO NOT use this class. It is for internal typing use only."""
 
-    _client: PipelineClient
+    _client: "PipelineClient"
     _config: AutoRestReportServiceForAzureConfiguration
-    _serialize: Serializer
-    _deserialize: Deserializer
+    _serialize: "Serializer"
+    _deserialize: "Deserializer"

test/azure/version-tolerant/Expected/AcceptanceTests/AzureReportVersionTolerant/azurereportversiontolerant/aio/_vendor.py

@@ -5,7 +5,6 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from __future__ import annotations
 from abc import ABC
 from typing import TYPE_CHECKING
 
@@ -21,7 +20,7 @@
 class MixinABC(ABC):
     """DO NOT use this class. It is for internal typing use only."""
 
-    _client: AsyncPipelineClient
+    _client: "AsyncPipelineClient"
     _config: AutoRestReportServiceForAzureConfiguration
-    _serialize: Serializer
-    _deserialize: Deserializer
+    _serialize: "Serializer"
+    _deserialize: "Deserializer"

test/azure/version-tolerant/Expected/AcceptanceTests/LroWithParameterizedEndpointsVersionTolerant/lrowithparameterizedendpointsversiontolerant/_vendor.py

@@ -5,7 +5,6 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from __future__ import annotations
 from abc import ABC
 from typing import TYPE_CHECKING
 
@@ -32,7 +31,7 @@ def _format_url_section(template, **kwargs):
 class MixinABC(ABC):
     """DO NOT use this class. It is for internal typing use only."""
 
-    _client: PipelineClient
+    _client: "PipelineClient"
     _config: LROWithParamaterizedEndpointsConfiguration
-    _serialize: Serializer
-    _deserialize: Deserializer
+    _serialize: "Serializer"
+    _deserialize: "Deserializer"

test/azure/version-tolerant/Expected/AcceptanceTests/LroWithParameterizedEndpointsVersionTolerant/lrowithparameterizedendpointsversiontolerant/aio/_vendor.py

@@ -5,7 +5,6 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from __future__ import annotations
 from abc import ABC
 from typing import TYPE_CHECKING
 
@@ -21,7 +20,7 @@
 class MixinABC(ABC):
     """DO NOT use this class. It is for internal typing use only."""
 
-    _client: AsyncPipelineClient
+    _client: "AsyncPipelineClient"
     _config: LROWithParamaterizedEndpointsConfiguration
-    _serialize: Serializer
-    _deserialize: Deserializer
+    _serialize: "Serializer"
+    _deserialize: "Deserializer"

test/dpg/version-tolerant/Expected/AcceptanceTests/DPGCustomizationCustomizedVersionTolerant/dpgcustomizationcustomizedversiontolerant/_vendor.py

@@ -5,7 +5,6 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from __future__ import annotations
 from abc import ABC
 from typing import TYPE_CHECKING
 
@@ -32,7 +31,7 @@ def _format_url_section(template, **kwargs):
 class MixinABC(ABC):
     """DO NOT use this class. It is for internal typing use only."""
 
-    _client: PipelineClient
+    _client: "PipelineClient"
     _config: DPGClientConfiguration
-    _serialize: Serializer
-    _deserialize: Deserializer
+    _serialize: "Serializer"
+    _deserialize: "Deserializer"

test/dpg/version-tolerant/Expected/AcceptanceTests/DPGCustomizationCustomizedVersionTolerant/dpgcustomizationcustomizedversiontolerant/aio/_vendor.py

@@ -5,7 +5,6 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from __future__ import annotations
 from abc import ABC
 from typing import TYPE_CHECKING
 
@@ -21,7 +20,7 @@
 class MixinABC(ABC):
     """DO NOT use this class. It is for internal typing use only."""
 
-    _client: AsyncPipelineClient
+    _client: "AsyncPipelineClient"
     _config: DPGClientConfiguration
-    _serialize: Serializer
-    _deserialize: Deserializer
+    _serialize: "Serializer"
+    _deserialize: "Deserializer"

test/dpg/version-tolerant/Expected/AcceptanceTests/DPGCustomizationInitialVersionTolerant/dpgcustomizationinitialversiontolerant/_vendor.py

@@ -5,7 +5,6 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from __future__ import annotations
 from abc import ABC
 from typing import TYPE_CHECKING
 
@@ -32,7 +31,7 @@ def _format_url_section(template, **kwargs):
 class MixinABC(ABC):
     """DO NOT use this class. It is for internal typing use only."""
 
-    _client: PipelineClient
+    _client: "PipelineClient"
     _config: DPGClientConfiguration
-    _serialize: Serializer
-    _deserialize: Deserializer
+    _serialize: "Serializer"
+    _deserialize: "Deserializer"

test/dpg/version-tolerant/Expected/AcceptanceTests/DPGCustomizationInitialVersionTolerant/dpgcustomizationinitialversiontolerant/aio/_vendor.py

@@ -5,7 +5,6 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from __future__ import annotations
 from abc import ABC
 from typing import TYPE_CHECKING
 
@@ -21,7 +20,7 @@
 class MixinABC(ABC):
     """DO NOT use this class. It is for internal typing use only."""
 
-    _client: AsyncPipelineClient
+    _client: "AsyncPipelineClient"
     _config: DPGClientConfiguration
-    _serialize: Serializer
-    _deserialize: Deserializer
+    _serialize: "Serializer"
+    _deserialize: "Deserializer"

test/vanilla/version-tolerant/Expected/AcceptanceTests/AnythingVersionTolerant/anythingversiontolerant/_vendor.py

@@ -5,7 +5,6 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from __future__ import annotations
 from abc import ABC
 from typing import TYPE_CHECKING
 
@@ -21,7 +20,7 @@
 class MixinABC(ABC):
     """DO NOT use this class. It is for internal typing use only."""
 
-    _client: PipelineClient
+    _client: "PipelineClient"
     _config: AnythingClientConfiguration
-    _serialize: Serializer
-    _deserialize: Deserializer
+    _serialize: "Serializer"
+    _deserialize: "Deserializer"

test/vanilla/version-tolerant/Expected/AcceptanceTests/AnythingVersionTolerant/anythingversiontolerant/aio/_vendor.py

@@ -5,7 +5,6 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from __future__ import annotations
 from abc import ABC
 from typing import TYPE_CHECKING
 
@@ -21,7 +20,7 @@
 class MixinABC(ABC):
     """DO NOT use this class. It is for internal typing use only."""
 
-    _client: AsyncPipelineClient
+    _client: "AsyncPipelineClient"
     _config: AnythingClientConfiguration
-    _serialize: Serializer
-    _deserialize: Deserializer
+    _serialize: "Serializer"
+    _deserialize: "Deserializer"

test/vanilla/version-tolerant/Expected/AcceptanceTests/ErrorWithSecretsVersionTolerant/errorwithsecretsversiontolerant/_vendor.py

@@ -5,7 +5,6 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from __future__ import annotations
 from abc import ABC
 from typing import TYPE_CHECKING
 
@@ -21,7 +20,7 @@
 class MixinABC(ABC):
     """DO NOT use this class. It is for internal typing use only."""
 
-    _client: PipelineClient
+    _client: "PipelineClient"
     _config: ErrorWithSecretsConfiguration
-    _serialize: Serializer
-    _deserialize: Deserializer
+    _serialize: "Serializer"
+    _deserialize: "Deserializer"

test/vanilla/version-tolerant/Expected/AcceptanceTests/ErrorWithSecretsVersionTolerant/errorwithsecretsversiontolerant/aio/_vendor.py

@@ -5,7 +5,6 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from __future__ import annotations
 from abc import ABC
 from typing import TYPE_CHECKING
 
@@ -21,7 +20,7 @@
 class MixinABC(ABC):
     """DO NOT use this class. It is for internal typing use only."""
 
-    _client: AsyncPipelineClient
+    _client: "AsyncPipelineClient"
     _config: ErrorWithSecretsConfiguration
-    _serialize: Serializer
-    _deserialize: Deserializer
+    _serialize: "Serializer"
+    _deserialize: "Deserializer"

test/vanilla/version-tolerant/Expected/AcceptanceTests/IncorrectErrorResponseVersionTolerant/incorrecterrorresponseversiontolerant/_vendor.py

@@ -5,7 +5,6 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from __future__ import annotations
 from abc import ABC
 from typing import TYPE_CHECKING
 
@@ -21,7 +20,7 @@
 class MixinABC(ABC):
     """DO NOT use this class. It is for internal typing use only."""
 
-    _client: PipelineClient
+    _client: "PipelineClient"
     _config: IncorrectReturnedErrorModelConfiguration
-    _serialize: Serializer
-    _deserialize: Deserializer
+    _serialize: "Serializer"
+    _deserialize: "Deserializer"

test/vanilla/version-tolerant/Expected/AcceptanceTests/IncorrectErrorResponseVersionTolerant/incorrecterrorresponseversiontolerant/aio/_vendor.py

@@ -5,7 +5,6 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from __future__ import annotations
 from abc import ABC
 from typing import TYPE_CHECKING
 
@@ -21,7 +20,7 @@
 class MixinABC(ABC):
     """DO NOT use this class. It is for internal typing use only."""
 
-    _client: AsyncPipelineClient
+    _client: "AsyncPipelineClient"
     _config: IncorrectReturnedErrorModelConfiguration
-    _serialize: Serializer
-    _deserialize: Deserializer
+    _serialize: "Serializer"
+    _deserialize: "Deserializer"

test/vanilla/version-tolerant/Expected/AcceptanceTests/MediaTypesVersionTolerant/mediatypesversiontolerant/_vendor.py

@@ -5,7 +5,6 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from __future__ import annotations
 from abc import ABC
 from typing import TYPE_CHECKING
 
@@ -21,7 +20,7 @@
 class MixinABC(ABC):
     """DO NOT use this class. It is for internal typing use only."""
 
-    _client: PipelineClient
+    _client: "PipelineClient"
     _config: MediaTypesClientConfiguration
-    _serialize: Serializer
-    _deserialize: Deserializer
+    _serialize: "Serializer"
+    _deserialize: "Deserializer"

test/vanilla/version-tolerant/Expected/AcceptanceTests/MediaTypesVersionTolerant/mediatypesversiontolerant/aio/_vendor.py

@@ -5,7 +5,6 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from __future__ import annotations
 from abc import ABC
 from typing import TYPE_CHECKING
 
@@ -21,7 +20,7 @@
 class MixinABC(ABC):
     """DO NOT use this class. It is for internal typing use only."""
 
-    _client: AsyncPipelineClient
+    _client: "AsyncPipelineClient"
     _config: MediaTypesClientConfiguration
-    _serialize: Serializer
-    _deserialize: Deserializer
+    _serialize: "Serializer"
+    _deserialize: "Deserializer"

test/vanilla/version-tolerant/Expected/AcceptanceTests/MergePatchJsonVersionTolerant/mergepatchjsonversiontolerant/_vendor.py

@@ -5,7 +5,6 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from __future__ import annotations
 from abc import ABC
 from typing import TYPE_CHECKING
 
@@ -21,7 +20,7 @@
 class MixinABC(ABC):
     """DO NOT use this class. It is for internal typing use only."""
 
-    _client: PipelineClient
+    _client: "PipelineClient"
     _config: MergePatchJsonClientConfiguration
-    _serialize: Serializer
-    _deserialize: Deserializer
+    _serialize: "Serializer"
+    _deserialize: "Deserializer"

test/vanilla/version-tolerant/Expected/AcceptanceTests/MergePatchJsonVersionTolerant/mergepatchjsonversiontolerant/aio/_vendor.py

@@ -5,7 +5,6 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from __future__ import annotations
 from abc import ABC
 from typing import TYPE_CHECKING
 
@@ -21,7 +20,7 @@
 class MixinABC(ABC):
     """DO NOT use this class. It is for internal typing use only."""
 
-    _client: AsyncPipelineClient
+    _client: "AsyncPipelineClient"
     _config: MergePatchJsonClientConfiguration
-    _serialize: Serializer
-    _deserialize: Deserializer
+    _serialize: "Serializer"
+    _deserialize: "Deserializer"

test/vanilla/version-tolerant/Expected/AcceptanceTests/ModelFlatteningVersionTolerant/modelflatteningversiontolerant/_vendor.py

@@ -5,7 +5,6 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from __future__ import annotations
 from abc import ABC
 from typing import TYPE_CHECKING
 
@@ -32,7 +31,7 @@ def _format_url_section(template, **kwargs):
 class MixinABC(ABC):
     """DO NOT use this class. It is for internal typing use only."""
 
-    _client: PipelineClient
+    _client: "PipelineClient"
     _config: AutoRestResourceFlatteningTestServiceConfiguration
-    _serialize: Serializer
-    _deserialize: Deserializer
+    _serialize: "Serializer"
+    _deserialize: "Deserializer"