feat: [google-cloud-oracledatabase] add enum value State::NOT_APPROVED_IN_PRIVATE_MARKETPLACE

packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/types/entitlement.py

@@ -59,12 +59,16 @@ class State(proto.Enum):
                 Entitlement and Account are active.
             ACCOUNT_SUSPENDED (4):
                 Account is suspended.
+            NOT_APPROVED_IN_PRIVATE_MARKETPLACE (5):
+                Entitlement is not approved in private
+                marketplace.
         """
         STATE_UNSPECIFIED = 0
         ACCOUNT_NOT_LINKED = 1
         ACCOUNT_NOT_ACTIVE = 2
         ACTIVE = 3
         ACCOUNT_SUSPENDED = 4
+        NOT_APPROVED_IN_PRIVATE_MARKETPLACE = 5
 
     name: str = proto.Field(
         proto.STRING,

packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/types/exadata_infra.py

@@ -377,8 +377,8 @@ class MaintenanceWindow(proto.Message):
             4.
         patching_mode (google.cloud.oracledatabase_v1.types.MaintenanceWindow.PatchingMode):
             Optional. Cloud CloudExadataInfrastructure
-            node patching method, either "ROLLING"
-            or "NONROLLING". Default value is ROLLING.
+            node patching method, either "ROLLING" or
+            "NONROLLING". Default value is ROLLING.
         custom_action_timeout_mins (int):
             Optional. Determines the amount of time the
             system will wait before the start of each

packages/google-cloud-oracledatabase/noxfile.py

@@ -385,7 +385,7 @@ def prerelease_deps(session, protobuf_implementation):
     """
     Run all tests with pre-release versions of dependencies installed
     rather than the standard non pre-release versions.
-    Pre-releases versions can be installed using
+    Pre-release versions can be installed using
     `pip install --pre <package>`.
     """
 
@@ -395,16 +395,16 @@ def prerelease_deps(session, protobuf_implementation):
     # Install all dependencies
     session.install("-e", ".")
 
-    unit_deps_all = UNIT_TEST_STANDARD_DEPENDENCIES + UNIT_TEST_EXTERNAL_DEPENDENCIES
     # Install dependencies for the unit test environment
+    unit_deps_all = UNIT_TEST_STANDARD_DEPENDENCIES + UNIT_TEST_EXTERNAL_DEPENDENCIES
     session.install(*unit_deps_all)
 
+    # Install dependencies for the system test environment
     system_deps_all = (
         SYSTEM_TEST_STANDARD_DEPENDENCIES
         + SYSTEM_TEST_EXTERNAL_DEPENDENCIES
         + SYSTEM_TEST_EXTRAS
     )
-    # Install dependencies for the system test environment
     session.install(*system_deps_all)
 
     # Because we test minimum dependency versions on the minimum Python
@@ -429,37 +429,44 @@ def prerelease_deps(session, protobuf_implementation):
     # Install dependencies specified in `testing/constraints-X.txt`.
     session.install(*constraints_deps)
 
+    # Note: If a dependency is added to the `prerel_deps` list,
+    # the `core_dependencies_from_source` list in the `core_deps_from_source`
+    # nox session should also be updated.
     prerel_deps = [
-        "protobuf",
-        # dependency of grpc
-        "six",
-        "grpc-google-iam-v1",
         "googleapis-common-protos",
-        "grpcio",
-        "grpcio-status",
         "google-api-core",
         "google-auth",
+        "grpc-google-iam-v1",
+        "grpcio",
+        "grpcio-status",
+        "protobuf",
         "proto-plus",
-        "google-cloud-testutils",
-        # dependencies of google-cloud-testutils"
-        "click",
     ]
 
     for dep in prerel_deps:
-        session.install("--pre", "--no-deps", "--upgrade", dep)
-
-    # Remaining dependencies
-    other_deps = [
-        "requests",
-    ]
-    session.install(*other_deps)
-
-    # Print out prerelease package versions
-    session.run(
-        "python", "-c", "import google.protobuf; print(google.protobuf.__version__)"
-    )
-    session.run("python", "-c", "import grpc; print(grpc.__version__)")
-    session.run("python", "-c", "import google.auth; print(google.auth.__version__)")
+        session.install("--pre", "--no-deps", "--ignore-installed", dep)
+        # TODO(https://github.com/grpc/grpc/issues/38965): Add `grpcio-status``
+        # to the dictionary below once this bug is fixed.
+        # TODO(https://github.com/googleapis/google-cloud-python/issues/13643): Add
+        # `googleapis-common-protos` and `grpc-google-iam-v1` to the dictionary below
+        # once this bug is fixed.
+        package_namespaces = {
+            "google-api-core": "google.api_core",
+            "google-auth": "google.auth",
+            "grpcio": "grpc",
+            "protobuf": "google.protobuf",
+            "proto-plus": "proto",
+        }
+
+        version_namespace = package_namespaces.get(dep)
+
+        print(f"Installed {dep}")
+        if version_namespace:
+            session.run(
+                "python",
+                "-c",
+                f"import {version_namespace}; print({version_namespace}.__version__)",
+            )
 
     session.run(
         "py.test",
@@ -476,12 +483,12 @@ def prerelease_deps(session, protobuf_implementation):
     ["python", "upb"],
 )
 def core_deps_from_source(session, protobuf_implementation):
-    """Run all tests with local versions of core dependencies installed,
-    rather than pulling core dependencies from PyPI.
+    """Run all tests with core dependencies installed from source
+    rather than pulling the dependencies from PyPI.
     """
 
     # Install all dependencies
-    session.install(".")
+    session.install("-e", ".")
 
     # Install dependencies for the unit test environment
     unit_deps_all = UNIT_TEST_STANDARD_DEPENDENCIES + UNIT_TEST_EXTERNAL_DEPENDENCIES
@@ -497,7 +504,7 @@ def core_deps_from_source(session, protobuf_implementation):
 
     # Because we test minimum dependency versions on the minimum Python
     # version, the first version we test with in the unit tests sessions has a
-    # constraints file containing all dependencies and extras that should be installed.
+    # constraints file containing all dependencies and extras.
     with open(
         CURRENT_DIRECTORY
         / "testing"
@@ -517,16 +524,24 @@ def core_deps_from_source(session, protobuf_implementation):
     # Install dependencies specified in `testing/constraints-X.txt`.
     session.install(*constraints_deps)
 
+    # TODO(https://github.com/googleapis/gapic-generator-python/issues/2358): `grpcio` and
+    # `grpcio-status` should be added to the list below so that they are installed from source,
+    # rather than PyPI.
+    # TODO(https://github.com/googleapis/gapic-generator-python/issues/2357): `protobuf` should be
+    # added to the list below so that it is installed from source, rather than PyPI
+    # Note: If a dependency is added to the `core_dependencies_from_source` list,
+    # the `prerel_deps` list in the `prerelease_deps` nox session should also be updated.
     core_dependencies_from_source = [
+        f"{CURRENT_DIRECTORY}/../googleapis-common-protos",
         "google-api-core @ git+https://github.com/googleapis/python-api-core.git",
         "google-auth @ git+https://github.com/googleapis/google-auth-library-python.git",
-        f"{CURRENT_DIRECTORY}/../googleapis-common-protos",
         f"{CURRENT_DIRECTORY}/../grpc-google-iam-v1",
         "proto-plus @ git+https://github.com/googleapis/proto-plus-python.git",
     ]
 
     for dep in core_dependencies_from_source:
-        session.install(dep, "--ignore-installed", "--no-deps")
+        session.install(dep, "--no-deps", "--ignore-installed")
+        print(f"Installed {dep}")
 
     session.run(
         "py.test",

scripts/client-post-processing/doc-formatting.yaml

@@ -318,15 +318,6 @@ replacements:
                   16 - represents time slot 16:00 - 19:59 UTC
                   20 - represents time slot 20:00 - 23:59 UTC
     count: 1
-  - paths: [
-      packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/types/exadata_infra.py,
-    ]
-    before: |
-      Optional. Cloud CloudExadataInfrastructure
-      \            node patching method, either "ROLLING"
-      \             or "NONROLLING". Default value is ROLLING.
-    after: "Optional. Cloud CloudExadataInfrastructure\n            node patching method, either \"ROLLING\"\n            or \"NONROLLING\". Default value is ROLLING.\n"
-    count: 1
   - paths: [
       packages/google-cloud-service-control/google/cloud/servicecontrol_v1/types/service_controller.py,
     ]