Merge branch 'master' into beta

googleapis · Nov 3, 2020 · 50b452f · 50b452f
2 parents 81da030 + 3c713d5
commit 50b452f
Show file tree

Hide file tree

Showing 11 changed files with 6,925 additions and 6 deletions.
diff --git a/google/cloud/aiplatform/__init__.py b/google/cloud/aiplatform/__init__.py
@@ -15,6 +15,4 @@
 # limitations under the License.
 #
 
-from google.cloud.aiplatform import gapic
-
 __all__ = ()
diff --git a/noxfile.py b/noxfile.py
@@ -26,9 +26,9 @@
 BLACK_VERSION = "black==19.10b0"
 BLACK_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"]
 
-DEFAULT_PYTHON_VERSION = ""
-SYSTEM_TEST_PYTHON_VERSIONS = []
-UNIT_TEST_PYTHON_VERSIONS = []
+DEFAULT_PYTHON_VERSION = "3.8"
+SYSTEM_TEST_PYTHON_VERSIONS = ["3.8"]
+UNIT_TEST_PYTHON_VERSIONS = ["3.6", "3.7", "3.8"]
 
 
 @nox.session(python=DEFAULT_PYTHON_VERSION)
@@ -158,7 +158,6 @@ def docs(session):
     shutil.rmtree(os.path.join("docs", "_build"), ignore_errors=True)
     session.run(
         "sphinx-build",
-        "-W",  # warnings as errors
         "-T",  # show full traceback on exception
         "-N",  # no colors
         "-b",

diff --git a/samples/requirements.txt b/samples/requirements.txt
diff --git a/synth.py b/synth.py
@@ -135,4 +135,7 @@
     ]
 )  # the microgenerator has a good coveragerc file
 
+# Don't treat docs warnings as errors
+s.replace("noxfile.py", """["']-W["'],  # warnings as errors""", "")
+
 s.shell.run(["nox", "-s", "blacken"], hide_output=False)