Attempt to fix owlbot 3.6 overrides

googleapis · Jun 21, 2022 · 49a1717 · 49a1717
1 parent 3591596
commit 49a1717
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 11 deletions.
diff --git a/.kokoro/test-samples-impl.sh b/.kokoro/test-samples-impl.sh
@@ -33,7 +33,7 @@ export PYTHONUNBUFFERED=1
 env | grep KOKORO
 
 # Install nox
-python3.6 -m pip install --upgrade --quiet nox
+python3.7 -m pip install --upgrade --quiet nox
 
 # Use secrets acessor service account to get secrets
 if [[ -f "${KOKORO_GFILE_DIR}/secrets_viewer_service_account.json" ]]; then
@@ -76,7 +76,7 @@ for file in samples/**/requirements.txt; do
     echo "------------------------------------------------------------"
 
     # Use nox to execute the tests for the project.
-    python3.6 -m nox -s "$RUN_TESTS_SESSION"
+    python3.7 -m nox -s "$RUN_TESTS_SESSION"
     EXIT=$?
 
     # If this is a periodic build, send the test log to the FlakyBot.

diff --git a/owl-bot-staging/v1/mypy.ini b/owl-bot-staging/v1/mypy.ini
@@ -1,3 +1,3 @@
 [mypy]
-python_version = 3.6
+python_version = 3.7
 namespace_packages = True
diff --git a/owl-bot-staging/v1/noxfile.py b/owl-bot-staging/v1/noxfile.py
@@ -23,7 +23,6 @@
 import nox  # type: ignore
 
 ALL_PYTHON = [
-    "3.6",
     "3.7",
     "3.8",
     "3.9",

diff --git a/owl-bot-staging/v1/setup.py b/owl-bot-staging/v1/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',

diff --git a/owl-bot-staging/v1beta1/mypy.ini b/owl-bot-staging/v1beta1/mypy.ini
@@ -1,3 +1,3 @@
 [mypy]
-python_version = 3.6
+python_version = 3.7
 namespace_packages = True
diff --git a/owl-bot-staging/v1beta1/noxfile.py b/owl-bot-staging/v1beta1/noxfile.py
@@ -23,7 +23,6 @@
 import nox  # type: ignore
 
 ALL_PYTHON = [
-    "3.6",
     "3.7",
     "3.8",
     "3.9",

diff --git a/owl-bot-staging/v1beta1/setup.py b/owl-bot-staging/v1beta1/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',

diff --git a/owlbot.py b/owlbot.py
@@ -100,7 +100,6 @@
         ".kokoro/presubmit/presubmit.cfg",
         # exclude sample configs so periodic samples are tested against main
         # instead of pypi
-        ".kokoro/samples/python3.6/periodic.cfg",
         ".kokoro/samples/python3.7/periodic.cfg",
         ".kokoro/samples/python3.8/periodic.cfg",
         ".kokoro/samples/python3.9/periodic.cfg",
-Original file line number
+Diff line change
@@ Expand Up / @@ -23,7 +23,6 @@ @@
     import nox  # type: ignore
     ALL_PYTHON = [
-        "3.6",
         "3.7",
         "3.8",
         "3.9",
@@ Expand Down @@