chore: Remove Python 3.6 support (#1430)

* chore: Remove Python 3.6 support

* fix 3.7 test fragment_alternative_templates test

.github/sync-repo-settings.yaml

@@ -16,7 +16,6 @@ branchProtectionRules:
     # - 'showcase-mtls (showcase_mtls_alternative_templates)'
     - 'showcase-mypy'
     - 'showcase-mypy (_alternative_templates)'
-    - 'showcase-unit (3.6)'
     - 'showcase-unit (3.7)'
     - 'showcase-unit (3.8)'
     - 'showcase-unit (3.9)'
@@ -29,7 +28,6 @@ branchProtectionRules:
     - 'showcase-unit (3.8, _alternative_templates_mixins)'
     - 'showcase-unit (3.9, _alternative_templates_mixins)'
     - 'showcase-unit (3.10, _alternative_templates_mixins)'
-    - 'showcase-unit (3.6, _mixins)'
     - 'showcase-unit (3.7, _mixins)'
     - 'showcase-unit (3.8, _mixins)'
     - 'showcase-unit (3.9, _mixins)'
@@ -39,12 +37,10 @@ branchProtectionRules:
     - 'goldens-lint'
     - 'style-check'
     - 'snippetgen'
-    - 'unit (3.6)'
     - 'unit (3.7)'
     - 'unit (3.8)'
     - 'unit (3.9)'
     - 'unit (3.10)'
-    - 'fragment (3.6)'
     - 'fragment (3.7)'
     - 'fragment (3.8)'
     - 'fragment (3.9)'

.github/workflows/tests.yaml

@@ -131,13 +131,8 @@ jobs:
   showcase-unit:
     strategy:
       matrix:
-        python: ["3.6", "3.7", "3.8", "3.9", "3.10"]
+        python: ["3.7", "3.8", "3.9", "3.10"]
         variant: ['', _alternative_templates, _mixins, _alternative_templates_mixins]
-        exclude:
-          - python: "3.6"
-            variant: _alternative_templates
-          - python: "3.6"
-            variant: _alternative_templates_mixins
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -241,7 +236,7 @@ jobs:
   unit:
     strategy:
       matrix:
-        python: ["3.6", "3.7", "3.8", "3.9", "3.10"]
+        python: ["3.7", "3.8", "3.9", "3.10"]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -262,11 +257,8 @@ jobs:
   fragment:
     strategy:
       matrix:
-        python: ["3.6", "3.7", "3.8", "3.9", "3.10"]
+        python: ["3.7", "3.8", "3.9", "3.10"]
         variant: ['', _alternative_templates]
-        exclude:
-          - python: "3.6"
-            variant: _alternative_templates
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3

.readthedocs.yml

@@ -3,4 +3,4 @@ build:
   image: latest
 python:
   pip_install: true
-  version: 3.6
+  version: 3.7

BUILD.bazel

@@ -27,11 +27,6 @@ pandoc_binary(
     name = "pandoc_binary",
 )
 
-config_setting(
-    name = "gapic_gen_python_3_6",
-    values = {"define": "gapic_gen_python=3.6"},
-)
-
 py_runtime(
     name = "pyenv3_runtime",
     interpreter = ":pyenv3wrapper.sh",
@@ -69,9 +64,7 @@ py_binary(
         requirement("MarkupSafe"),
         requirement("pypandoc"),
         requirement("PyYAML"),
-	requirement("grpc-google-iam-v1"),
-    ] + select({
-        ":gapic_gen_python_3_6": [requirement("dataclasses")],
-        "//conditions:default": [],
-    }),
+        requirement("grpc-google-iam-v1"),
+    ]
 )
+

docs/getting-started/index.rst

@@ -2,7 +2,7 @@ Getting Started
 ---------------
 
 This code generator is implemented as a plugin to ``protoc``, the compiler
-for `protocol buffers`_, and will run in any environment that Python 3.6+ and
+for `protocol buffers`_, and will run in any environment that Python 3.7+ and
 protocol buffers do.
 
 Because dependency management and such can be a significant undertaking, we

gapic/ads-templates/mypy.ini.j2

@@ -1,3 +1,3 @@
 [mypy]
-python_version = 3.6
+python_version = 3.7
 namespace_packages = True

gapic/templates/mypy.ini.j2

@@ -1,3 +1,3 @@
 [mypy]
-python_version = 3.6
+python_version = 3.7
 namespace_packages = True

gapic/templates/noxfile.py.j2

@@ -12,7 +12,6 @@ import sys
 import nox  # type: ignore
 
 ALL_PYTHON = [
-    "3.6",
     "3.7",
     "3.8",
     "3.9",

gapic/templates/setup.py.j2

@@ -47,12 +47,11 @@ setuptools.setup(
         'google-cloud-documentai >= 1.2.1, < 2.0.0dev',
     {% endif %}
     ),
-    python_requires='>=3.6',
+    python_requires='>=3.7',
     classifiers=[
         'Development Status :: 3 - Alpha',
         'Intended Audience :: Developers',
         'Operating System :: OS Independent',
-        'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',

mypy.ini

@@ -1,2 +1,2 @@
 [mypy]
-python_version = 3.6
+python_version = 3.7

noxfile.py

@@ -34,7 +34,6 @@
 
 
 ALL_PYTHON = (
-    "3.6",
     "3.7",
     "3.8",
     "3.9",
@@ -158,7 +157,7 @@ def fragment(session, use_ads_templates=False):
             session.log(tester(frag))
 
 
-@nox.session(python=ALL_PYTHON[1:])
+@nox.session(python=ALL_PYTHON)
 def fragment_alternative_templates(session):
     fragment(session, use_ads_templates=True)
 
@@ -334,7 +333,7 @@ def showcase_unit(
         run_showcase_unit_tests(session)
 
 
-@nox.session(python=ALL_PYTHON[1:])  # Do not test 3.6
+@nox.session(python=ALL_PYTHON)
 def showcase_unit_alternative_templates(session):
     with showcase_library(
         session, templates=ADS_TEMPLATES, other_opts=("old-naming",)
@@ -357,7 +356,7 @@ def showcase_unit_mixins(session):
         run_showcase_unit_tests(session)
 
 
-@nox.session(python=ALL_PYTHON[1:])  # Do not test 3.6
+@nox.session(python=ALL_PYTHON)
 def showcase_unit_alternative_templates_mixins(session):
     with showcase_library(
         session, templates=ADS_TEMPLATES, other_opts=("old-naming",),

requirements.txt

@@ -6,7 +6,6 @@ MarkupSafe==2.1.1
 protobuf==3.20.1
 pypandoc==1.8.1
 PyYAML==6.0
-dataclasses==0.6  # TODO(busunkim) remove when 3.6 support is dropped
 setuptools==65.3.0
 grpc-google-iam-v1==0.12.4
 proto-plus==1.22.1

setup.py

@@ -64,7 +64,6 @@
         "License :: OSI Approved :: Apache Software License",
         "Programming Language :: Python",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
@@ -74,7 +73,7 @@
         "Topic :: Software Development :: Libraries :: Python Modules",
     ],
     platforms="Posix; MacOS X",
-    python_requires=">=3.6",
+    python_requires=">=3.7",
     install_requires=dependencies,
     include_package_data=True,
     zip_safe=False,

tests/integration/goldens/asset/mypy.ini

@@ -1,3 +1,3 @@
 [mypy]
-python_version = 3.6
+python_version = 3.7
 namespace_packages = True

tests/integration/goldens/asset/noxfile.py

@@ -23,7 +23,6 @@
 import nox  # type: ignore
 
 ALL_PYTHON = [
-    "3.6",
     "3.7",
     "3.8",
     "3.9",

tests/integration/goldens/asset/setup.py

@@ -43,12 +43,11 @@
         'proto-plus >= 1.19.7',
         'grpc-google-iam-v1 >= 0.12.4, < 0.13dev',
     ),
-    python_requires='>=3.6',
+    python_requires='>=3.7',
     classifiers=[
         'Development Status :: 3 - Alpha',
         'Intended Audience :: Developers',
         'Operating System :: OS Independent',
-        'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',

tests/integration/goldens/credentials/mypy.ini

@@ -1,3 +1,3 @@
 [mypy]
-python_version = 3.6
+python_version = 3.7
 namespace_packages = True

tests/integration/goldens/credentials/noxfile.py

@@ -23,7 +23,6 @@
 import nox  # type: ignore
 
 ALL_PYTHON = [
-    "3.6",
     "3.7",
     "3.8",
     "3.9",

tests/integration/goldens/credentials/setup.py

@@ -42,12 +42,11 @@
         'googleapis-common-protos >= 1.55.0, <2.0.0dev',
         'proto-plus >= 1.19.7',
     ),
-    python_requires='>=3.6',
+    python_requires='>=3.7',
     classifiers=[
         'Development Status :: 3 - Alpha',
         'Intended Audience :: Developers',
         'Operating System :: OS Independent',
-        'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',

tests/integration/goldens/eventarc/mypy.ini

@@ -1,3 +1,3 @@
 [mypy]
-python_version = 3.6
+python_version = 3.7
 namespace_packages = True

tests/integration/goldens/eventarc/noxfile.py

@@ -23,7 +23,6 @@
 import nox  # type: ignore
 
 ALL_PYTHON = [
-    "3.6",
     "3.7",
     "3.8",
     "3.9",

tests/integration/goldens/eventarc/setup.py

@@ -42,12 +42,11 @@
         'googleapis-common-protos >= 1.55.0, <2.0.0dev',
         'proto-plus >= 1.19.7',
     ),
-    python_requires='>=3.6',
+    python_requires='>=3.7',
     classifiers=[
         'Development Status :: 3 - Alpha',
         'Intended Audience :: Developers',
         'Operating System :: OS Independent',
-        'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',

tests/integration/goldens/logging/mypy.ini

@@ -1,3 +1,3 @@
 [mypy]
-python_version = 3.6
+python_version = 3.7
 namespace_packages = True

tests/integration/goldens/logging/noxfile.py

@@ -23,7 +23,6 @@
 import nox  # type: ignore
 
 ALL_PYTHON = [
-    "3.6",
     "3.7",
     "3.8",
     "3.9",

tests/integration/goldens/logging/setup.py

@@ -42,12 +42,11 @@
         'googleapis-common-protos >= 1.55.0, <2.0.0dev',
         'proto-plus >= 1.19.7',
     ),
-    python_requires='>=3.6',
+    python_requires='>=3.7',
     classifiers=[
         'Development Status :: 3 - Alpha',
         'Intended Audience :: Developers',
         'Operating System :: OS Independent',
-        'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',

tests/integration/goldens/redis/mypy.ini

@@ -1,3 +1,3 @@
 [mypy]
-python_version = 3.6
+python_version = 3.7
 namespace_packages = True

tests/integration/goldens/redis/noxfile.py

@@ -23,7 +23,6 @@
 import nox  # type: ignore
 
 ALL_PYTHON = [
-    "3.6",
     "3.7",
     "3.8",
     "3.9",

tests/integration/goldens/redis/setup.py

@@ -42,12 +42,11 @@
         'googleapis-common-protos >= 1.55.0, <2.0.0dev',
         'proto-plus >= 1.19.7',
     ),
-    python_requires='>=3.6',
+    python_requires='>=3.7',
     classifiers=[
         'Development Status :: 3 - Alpha',
         'Intended Audience :: Developers',
         'Operating System :: OS Independent',
-        'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',