chore: Unbreak release-please.

sasha-gitg · copybara-github · commit 68e84e9bf97c · 2023-08-02T13:07:34.000-07:00
PiperOrigin-RevId: 553233524
diff --git a/.github/release-please.yml b/.github/release-please.yml
@@ -1,5 +1,6 @@
 releaseType: python
 handleGHRelease: true
+manifest: true
 # NOTE: this section is generated by synthtool.languages.python
 # See https://github.com/googleapis/synthtool/blob/master/synthtool/languages/python.py
 branches:
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
@@ -22,7 +22,7 @@ In order to add a feature:
   documentation.
 
 - The feature must work fully on the following CPython versions:
-  3.8, 3.9, 3.10 and 3.11 on both UNIX and Windows.
+  3.7, 3.8, 3.9 and 3.10 on both UNIX and Windows.
 
 - The feature must not add unnecessary dependencies (where
   "unnecessary" is of course subjective, but new dependencies should
@@ -72,7 +72,7 @@ We use `nox <https://nox.readthedocs.io/en/latest/>`__ to instrument our tests.
 
 - To run a single unit test::
 
-    $ nox -s unit-3.11 -- -k <name of test>
+    $ nox -s unit-3.10 -- -k <name of test>
 
 
   .. note::
@@ -221,23 +221,23 @@ Supported Python Versions
 
 We support:
 
+-  `Python 3.7`_
 -  `Python 3.8`_
 -  `Python 3.9`_
 -  `Python 3.10`_
--  `Python 3.11`_
 
+.. _Python 3.7: https://docs.python.org/3.7/
 .. _Python 3.8: https://docs.python.org/3.8/
 .. _Python 3.9: https://docs.python.org/3.9/
 .. _Python 3.10: https://docs.python.org/3.10/
-.. _Python 3.11: https://docs.python.org/3.11/
 
 
 Supported versions can be found in our ``noxfile.py`` `config`_.
 
 .. _config: https://github.com/googleapis/python-aiplatform/blob/main/noxfile.py
 
 
-We also explicitly decided to support Python 3 beginning with version 3.8.
+We also explicitly decided to support Python 3 beginning with version 3.7.
 Reasons for this include:
 
 -  Encouraging use of newest versions of Python 3
diff --git a/noxfile.py b/noxfile.py
@@ -32,7 +32,7 @@
 
 DEFAULT_PYTHON_VERSION = "3.8"
 
-UNIT_TEST_PYTHON_VERSIONS = ["3.8", "3.9", "3.10", "3.11"]
+UNIT_TEST_PYTHON_VERSIONS = ["3.7", "3.8", "3.9", "3.10"]
 UNIT_TEST_STANDARD_DEPENDENCIES = [
     "mock",
     "asyncmock",
diff --git a/owlbot.py b/owlbot.py
@@ -88,14 +88,14 @@
 # only run post processor when there are changes to the generated code
 if has_generator_updates:
 
-    # ----------------------------------------------------------------------------
-    # Add templated files
-    # ----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
+# Add templated files
+# ----------------------------------------------------------------------------
 
     templated_files = common.py_library(
         cov_level=98,
         system_test_python_versions=["3.8"],
-        unit_test_python_versions=["3.8", "3.9", "3.10", "3.11"],
+        unit_test_python_versions=["3.7", "3.8", "3.9", "3.10"],
         unit_test_extras=["testing"],
         system_test_extras=["testing"],
         microgenerator=True,
@@ -118,25 +118,25 @@
             ".github/PULL_REQUEST_TEMPLATE.md",
             ".github/workflows",  # exclude gh actions as credentials are needed for tests
             "README.rst",
+            ".github/release-please.yml", # use release please manifest
         ],
     )  # the microgenerator has a good coveragerc file
 
-    # commenting out this line to omit method deletion
-    # python.py_samples(skip_readmes=True)
+    python.py_samples(skip_readmes=True)
 
     python.configure_previous_major_version_branches()
 
     # Update samples config to use `ucaip-sample-tests` project
     s.replace(
         ".kokoro/samples/python3.*/common.cfg",
         """env_vars: \{
-        key: "BUILD_SPECIFIC_GCLOUD_PROJECT"
-        value: "python-docs-samples-tests-.*?"
-    \}""",
+    key: "BUILD_SPECIFIC_GCLOUD_PROJECT"
+    value: "python-docs-samples-tests-.*?"
+\}""",
         """env_vars: {
-        key: "BUILD_SPECIFIC_GCLOUD_PROJECT"
-        value: "ucaip-sample-tests"
-    }""",
+    key: "BUILD_SPECIFIC_GCLOUD_PROJECT"
+    value: "ucaip-sample-tests"
+}""",
     )
 
     s.replace(
@@ -158,4 +158,4 @@
         "\"alabaster\",\n        \"google-cloud-aiplatform[prediction]\"",
     )
 
-    s.shell.run(["nox", "-s", "blacken"], hide_output=False)
+    s.shell.run(["nox", "-s", "blacken"], hide_output=False)
diff --git a/setup.py b/setup.py
@@ -59,16 +59,14 @@
     "pyarrow >= 6.0.1",
 ]
 pipelines_extra_require = [
-    "pyyaml==5.3.1",
+    "pyyaml>=5.3,<7",
 ]
 datasets_extra_require = [
-    "pyarrow >= 3.0.0, < 8.0dev; python_version<'3.11'",
-    "pyarrow >= 10.0.1; python_version>='3.11'",
+    "pyarrow >= 3.0.0, < 8.0dev",
 ]
 
 vizier_extra_require = [
-    "google-vizier==0.0.4; python_version<'3.11'",
-    "google-vizier>=0.1.6; python_version>='3.11'",
+    "google-vizier==0.0.4",
 ]
 
 prediction_extra_require = [
@@ -172,7 +170,6 @@
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
-        "Programming Language :: Python :: 3.11",
         "Topic :: Internet",
         "Topic :: Software Development :: Libraries :: Python Modules",
     ],
diff --git a/tests/unit/aiplatform/test_explain_saved_model_metadata_builder_tf2_test.py b/tests/unit/aiplatform/test_explain_saved_model_metadata_builder_tf2_test.py
@@ -116,7 +116,6 @@ def call(self, inputs):
         }
         assert expected_md == generated_md
 
-    @pytest.mark.skip(reason="Failing for Python 3.11, tracked in b/293506827.")
     def test_non_keras_model(self):
         class CustomModuleWithOutputName(tf.Module):
             def __init__(self):

Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,6 @@ def call(self, inputs):`
`116`	`116`	`}`
`117`	`117`	`assert expected_md == generated_md`
`118`	`118`
`119`		`- @pytest.mark.skip(reason="Failing for Python 3.11, tracked in b/293506827.")`
`120`	`119`	`def test_non_keras_model(self):`
`121`	`120`	`class CustomModuleWithOutputName(tf.Module):`
`122`	`121`	`def __init__(self):`