diff --git a/packages/google-cloud-orchestration-airflow/airflow-service-v1beta1-py.tar.gz b/packages/google-cloud-orchestration-airflow/airflow-service-v1beta1-py.tar.gz index cce782c92603..e69de29bb2d1 100644 Binary files a/packages/google-cloud-orchestration-airflow/airflow-service-v1beta1-py.tar.gz and b/packages/google-cloud-orchestration-airflow/airflow-service-v1beta1-py.tar.gz differ diff --git a/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/services/environments/async_client.py b/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/services/environments/async_client.py index 160666342d93..598c02145910 100644 --- a/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/services/environments/async_client.py +++ b/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/services/environments/async_client.py @@ -1643,7 +1643,7 @@ async def list_workloads( unit that runs a single Composer component. This method is supported for Cloud Composer environments in - versions composer-3.\ *.*-airflow-*.*.\* and newer. + versions composer-2.\ *.*-airflow-*.*.\* and newer. .. code-block:: python @@ -1776,7 +1776,7 @@ async def create_user_workloads_secret( r"""Creates a user workloads Secret. This method is supported for Cloud Composer environments in - versions composer-3.\ *.*-airflow-*.*.\* and newer. + versions composer-3-airflow-\ *.*.\ *-build.* and newer. .. code-block:: python @@ -1903,7 +1903,7 @@ async def get_user_workloads_secret( field in the response are cleared. This method is supported for Cloud Composer environments in - versions composer-3.\ *.*-airflow-*.*.\* and newer. + versions composer-3-airflow-\ *.*.\ *-build.* and newer. .. code-block:: python @@ -2020,7 +2020,7 @@ async def list_user_workloads_secrets( r"""Lists user workloads Secrets. This method is supported for Cloud Composer environments in - versions composer-3.\ *.*-airflow-*.*.\* and newer. + versions composer-3-airflow-\ *.*.\ *-build.* and newer. .. code-block:: python @@ -2151,7 +2151,7 @@ async def update_user_workloads_secret( r"""Updates a user workloads Secret. This method is supported for Cloud Composer environments in - versions composer-3.\ *.*-airflow-*.*.\* and newer. + versions composer-3-airflow-\ *.*.\ *-build.* and newer. .. code-block:: python @@ -2268,7 +2268,7 @@ async def delete_user_workloads_secret( r"""Deletes a user workloads Secret. This method is supported for Cloud Composer environments in - versions composer-3.\ *.*-airflow-*.*.\* and newer. + versions composer-3-airflow-\ *.*.\ *-build.* and newer. .. code-block:: python @@ -2373,7 +2373,7 @@ async def create_user_workloads_config_map( r"""Creates a user workloads ConfigMap. This method is supported for Cloud Composer environments in - versions composer-3.\ *.*-airflow-*.*.\* and newer. + versions composer-3-airflow-\ *.*.\ *-build.* and newer. .. code-block:: python @@ -2500,7 +2500,7 @@ async def get_user_workloads_config_map( r"""Gets an existing user workloads ConfigMap. This method is supported for Cloud Composer environments in - versions composer-3.\ *.*-airflow-*.*.\* and newer. + versions composer-3-airflow-\ *.*.\ *-build.* and newer. .. code-block:: python @@ -2617,7 +2617,7 @@ async def list_user_workloads_config_maps( r"""Lists user workloads ConfigMaps. This method is supported for Cloud Composer environments in - versions composer-3.\ *.*-airflow-*.*.\* and newer. + versions composer-3-airflow-\ *.*.\ *-build.* and newer. .. code-block:: python @@ -2749,7 +2749,7 @@ async def update_user_workloads_config_map( r"""Updates a user workloads ConfigMap. This method is supported for Cloud Composer environments in - versions composer-3.\ *.*-airflow-*.*.\* and newer. + versions composer-3-airflow-\ *.*.\ *-build.* and newer. .. code-block:: python @@ -2872,7 +2872,7 @@ async def delete_user_workloads_config_map( r"""Deletes a user workloads ConfigMap. This method is supported for Cloud Composer environments in - versions composer-3.\ *.*-airflow-*.*.\* and newer. + versions composer-3-airflow-\ *.*.\ *-build.* and newer. .. code-block:: python diff --git a/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/services/environments/client.py b/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/services/environments/client.py index e0f51739b18a..e9f0cd84f0e8 100644 --- a/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/services/environments/client.py +++ b/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/services/environments/client.py @@ -2078,7 +2078,7 @@ def list_workloads( unit that runs a single Composer component. This method is supported for Cloud Composer environments in - versions composer-3.\ *.*-airflow-*.*.\* and newer. + versions composer-2.\ *.*-airflow-*.*.\* and newer. .. code-block:: python @@ -2208,7 +2208,7 @@ def create_user_workloads_secret( r"""Creates a user workloads Secret. This method is supported for Cloud Composer environments in - versions composer-3.\ *.*-airflow-*.*.\* and newer. + versions composer-3-airflow-\ *.*.\ *-build.* and newer. .. code-block:: python @@ -2334,7 +2334,7 @@ def get_user_workloads_secret( field in the response are cleared. This method is supported for Cloud Composer environments in - versions composer-3.\ *.*-airflow-*.*.\* and newer. + versions composer-3-airflow-\ *.*.\ *-build.* and newer. .. code-block:: python @@ -2450,7 +2450,7 @@ def list_user_workloads_secrets( r"""Lists user workloads Secrets. This method is supported for Cloud Composer environments in - versions composer-3.\ *.*-airflow-*.*.\* and newer. + versions composer-3-airflow-\ *.*.\ *-build.* and newer. .. code-block:: python @@ -2580,7 +2580,7 @@ def update_user_workloads_secret( r"""Updates a user workloads Secret. This method is supported for Cloud Composer environments in - versions composer-3.\ *.*-airflow-*.*.\* and newer. + versions composer-3-airflow-\ *.*.\ *-build.* and newer. .. code-block:: python @@ -2696,7 +2696,7 @@ def delete_user_workloads_secret( r"""Deletes a user workloads Secret. This method is supported for Cloud Composer environments in - versions composer-3.\ *.*-airflow-*.*.\* and newer. + versions composer-3-airflow-\ *.*.\ *-build.* and newer. .. code-block:: python @@ -2800,7 +2800,7 @@ def create_user_workloads_config_map( r"""Creates a user workloads ConfigMap. This method is supported for Cloud Composer environments in - versions composer-3.\ *.*-airflow-*.*.\* and newer. + versions composer-3-airflow-\ *.*.\ *-build.* and newer. .. code-block:: python @@ -2926,7 +2926,7 @@ def get_user_workloads_config_map( r"""Gets an existing user workloads ConfigMap. This method is supported for Cloud Composer environments in - versions composer-3.\ *.*-airflow-*.*.\* and newer. + versions composer-3-airflow-\ *.*.\ *-build.* and newer. .. code-block:: python @@ -3042,7 +3042,7 @@ def list_user_workloads_config_maps( r"""Lists user workloads ConfigMaps. This method is supported for Cloud Composer environments in - versions composer-3.\ *.*-airflow-*.*.\* and newer. + versions composer-3-airflow-\ *.*.\ *-build.* and newer. .. code-block:: python @@ -3173,7 +3173,7 @@ def update_user_workloads_config_map( r"""Updates a user workloads ConfigMap. This method is supported for Cloud Composer environments in - versions composer-3.\ *.*-airflow-*.*.\* and newer. + versions composer-3-airflow-\ *.*.\ *-build.* and newer. .. code-block:: python @@ -3295,7 +3295,7 @@ def delete_user_workloads_config_map( r"""Deletes a user workloads ConfigMap. This method is supported for Cloud Composer environments in - versions composer-3.\ *.*-airflow-*.*.\* and newer. + versions composer-3-airflow-\ *.*.\ *-build.* and newer. .. code-block:: python diff --git a/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/services/environments/transports/grpc.py b/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/services/environments/transports/grpc.py index e92d09f5d29f..45741c9dd1fe 100644 --- a/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/services/environments/transports/grpc.py +++ b/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/services/environments/transports/grpc.py @@ -625,7 +625,7 @@ def list_workloads( unit that runs a single Composer component. This method is supported for Cloud Composer environments in - versions composer-3.\ *.*-airflow-*.*.\* and newer. + versions composer-2.\ *.*-airflow-*.*.\* and newer. Returns: Callable[[~.ListWorkloadsRequest], @@ -657,7 +657,7 @@ def create_user_workloads_secret( Creates a user workloads Secret. This method is supported for Cloud Composer environments in - versions composer-3.\ *.*-airflow-*.*.\* and newer. + versions composer-3-airflow-\ *.*.\ *-build.* and newer. Returns: Callable[[~.CreateUserWorkloadsSecretRequest], @@ -691,7 +691,7 @@ def get_user_workloads_secret( field in the response are cleared. This method is supported for Cloud Composer environments in - versions composer-3.\ *.*-airflow-*.*.\* and newer. + versions composer-3-airflow-\ *.*.\ *-build.* and newer. Returns: Callable[[~.GetUserWorkloadsSecretRequest], @@ -723,7 +723,7 @@ def list_user_workloads_secrets( Lists user workloads Secrets. This method is supported for Cloud Composer environments in - versions composer-3.\ *.*-airflow-*.*.\* and newer. + versions composer-3-airflow-\ *.*.\ *-build.* and newer. Returns: Callable[[~.ListUserWorkloadsSecretsRequest], @@ -757,7 +757,7 @@ def update_user_workloads_secret( Updates a user workloads Secret. This method is supported for Cloud Composer environments in - versions composer-3.\ *.*-airflow-*.*.\* and newer. + versions composer-3-airflow-\ *.*.\ *-build.* and newer. Returns: Callable[[~.UpdateUserWorkloadsSecretRequest], @@ -788,7 +788,7 @@ def delete_user_workloads_secret( Deletes a user workloads Secret. This method is supported for Cloud Composer environments in - versions composer-3.\ *.*-airflow-*.*.\* and newer. + versions composer-3-airflow-\ *.*.\ *-build.* and newer. Returns: Callable[[~.DeleteUserWorkloadsSecretRequest], @@ -823,7 +823,7 @@ def create_user_workloads_config_map( Creates a user workloads ConfigMap. This method is supported for Cloud Composer environments in - versions composer-3.\ *.*-airflow-*.*.\* and newer. + versions composer-3-airflow-\ *.*.\ *-build.* and newer. Returns: Callable[[~.CreateUserWorkloadsConfigMapRequest], @@ -857,7 +857,7 @@ def get_user_workloads_config_map( Gets an existing user workloads ConfigMap. This method is supported for Cloud Composer environments in - versions composer-3.\ *.*-airflow-*.*.\* and newer. + versions composer-3-airflow-\ *.*.\ *-build.* and newer. Returns: Callable[[~.GetUserWorkloadsConfigMapRequest], @@ -892,7 +892,7 @@ def list_user_workloads_config_maps( Lists user workloads ConfigMaps. This method is supported for Cloud Composer environments in - versions composer-3.\ *.*-airflow-*.*.\* and newer. + versions composer-3-airflow-\ *.*.\ *-build.* and newer. Returns: Callable[[~.ListUserWorkloadsConfigMapsRequest], @@ -927,7 +927,7 @@ def update_user_workloads_config_map( Updates a user workloads ConfigMap. This method is supported for Cloud Composer environments in - versions composer-3.\ *.*-airflow-*.*.\* and newer. + versions composer-3-airflow-\ *.*.\ *-build.* and newer. Returns: Callable[[~.UpdateUserWorkloadsConfigMapRequest], @@ -959,7 +959,7 @@ def delete_user_workloads_config_map( Deletes a user workloads ConfigMap. This method is supported for Cloud Composer environments in - versions composer-3.\ *.*-airflow-*.*.\* and newer. + versions composer-3-airflow-\ *.*.\ *-build.* and newer. Returns: Callable[[~.DeleteUserWorkloadsConfigMapRequest], diff --git a/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/services/environments/transports/grpc_asyncio.py b/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/services/environments/transports/grpc_asyncio.py index 77b0120283bc..9c81b9120c52 100644 --- a/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/services/environments/transports/grpc_asyncio.py +++ b/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/services/environments/transports/grpc_asyncio.py @@ -646,7 +646,7 @@ def list_workloads( unit that runs a single Composer component. This method is supported for Cloud Composer environments in - versions composer-3.\ *.*-airflow-*.*.\* and newer. + versions composer-2.\ *.*-airflow-*.*.\* and newer. Returns: Callable[[~.ListWorkloadsRequest], @@ -678,7 +678,7 @@ def create_user_workloads_secret( Creates a user workloads Secret. This method is supported for Cloud Composer environments in - versions composer-3.\ *.*-airflow-*.*.\* and newer. + versions composer-3-airflow-\ *.*.\ *-build.* and newer. Returns: Callable[[~.CreateUserWorkloadsSecretRequest], @@ -713,7 +713,7 @@ def get_user_workloads_secret( field in the response are cleared. This method is supported for Cloud Composer environments in - versions composer-3.\ *.*-airflow-*.*.\* and newer. + versions composer-3-airflow-\ *.*.\ *-build.* and newer. Returns: Callable[[~.GetUserWorkloadsSecretRequest], @@ -745,7 +745,7 @@ def list_user_workloads_secrets( Lists user workloads Secrets. This method is supported for Cloud Composer environments in - versions composer-3.\ *.*-airflow-*.*.\* and newer. + versions composer-3-airflow-\ *.*.\ *-build.* and newer. Returns: Callable[[~.ListUserWorkloadsSecretsRequest], @@ -779,7 +779,7 @@ def update_user_workloads_secret( Updates a user workloads Secret. This method is supported for Cloud Composer environments in - versions composer-3.\ *.*-airflow-*.*.\* and newer. + versions composer-3-airflow-\ *.*.\ *-build.* and newer. Returns: Callable[[~.UpdateUserWorkloadsSecretRequest], @@ -812,7 +812,7 @@ def delete_user_workloads_secret( Deletes a user workloads Secret. This method is supported for Cloud Composer environments in - versions composer-3.\ *.*-airflow-*.*.\* and newer. + versions composer-3-airflow-\ *.*.\ *-build.* and newer. Returns: Callable[[~.DeleteUserWorkloadsSecretRequest], @@ -847,7 +847,7 @@ def create_user_workloads_config_map( Creates a user workloads ConfigMap. This method is supported for Cloud Composer environments in - versions composer-3.\ *.*-airflow-*.*.\* and newer. + versions composer-3-airflow-\ *.*.\ *-build.* and newer. Returns: Callable[[~.CreateUserWorkloadsConfigMapRequest], @@ -881,7 +881,7 @@ def get_user_workloads_config_map( Gets an existing user workloads ConfigMap. This method is supported for Cloud Composer environments in - versions composer-3.\ *.*-airflow-*.*.\* and newer. + versions composer-3-airflow-\ *.*.\ *-build.* and newer. Returns: Callable[[~.GetUserWorkloadsConfigMapRequest], @@ -916,7 +916,7 @@ def list_user_workloads_config_maps( Lists user workloads ConfigMaps. This method is supported for Cloud Composer environments in - versions composer-3.\ *.*-airflow-*.*.\* and newer. + versions composer-3-airflow-\ *.*.\ *-build.* and newer. Returns: Callable[[~.ListUserWorkloadsConfigMapsRequest], @@ -951,7 +951,7 @@ def update_user_workloads_config_map( Updates a user workloads ConfigMap. This method is supported for Cloud Composer environments in - versions composer-3.\ *.*-airflow-*.*.\* and newer. + versions composer-3-airflow-\ *.*.\ *-build.* and newer. Returns: Callable[[~.UpdateUserWorkloadsConfigMapRequest], @@ -985,7 +985,7 @@ def delete_user_workloads_config_map( Deletes a user workloads ConfigMap. This method is supported for Cloud Composer environments in - versions composer-3.\ *.*-airflow-*.*.\* and newer. + versions composer-3-airflow-\ *.*.\ *-build.* and newer. Returns: Callable[[~.DeleteUserWorkloadsConfigMapRequest], diff --git a/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/types/environments.py b/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/types/environments.py index e7ae954fb758..d5c5741d7ba4 100644 --- a/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/types/environments.py +++ b/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/types/environments.py @@ -1779,7 +1779,7 @@ class SoftwareConfig(proto.Message): If unspecified, the field defaults to ``PLUGINS_ENABLED``. This field is supported for Cloud Composer environments in - versions composer-3.\ *.*-airflow-*.*.\* and newer. + versions composer-3-airflow-\ *.*.\ *-build.* and newer. """ class WebServerPluginsMode(proto.Enum): @@ -2075,7 +2075,7 @@ class NodeConfig(proto.Message): projects/{project}/regions/{region}/networkAttachments/{networkAttachment}. This field is supported for Cloud Composer environments in - versions composer-3.\ *.*-airflow-*.*.\* and newer. + versions composer-3-airflow-\ *.*.\ *-build.* and newer. composer_internal_ipv4_cidr_block (str): Optional. The IP range in CIDR notation to use internally by Cloud Composer. IP addresses are not reserved - and the same @@ -2086,7 +2086,7 @@ class NodeConfig(proto.Message): used. This field is supported for Cloud Composer environments in - versions composer-3.\ *.*-airflow-*.*.\* and newer. + versions composer-3-airflow-\ *.*.\ *-build.* and newer. """ location: str = proto.Field( @@ -2243,7 +2243,7 @@ class PrivateEnvironmentConfig(proto.Message): internet. This field is supported for Cloud Composer environments in - versions composer-3.\ *.*-airflow-*.*.\* and newer. + versions composer-3-airflow-\ *.*.\ *-build.* and newer. private_cluster_config (google.cloud.orchestration.airflow.service_v1beta1.types.PrivateClusterConfig): Optional. Configuration for the private GKE cluster for a Private IP Cloud Composer @@ -2487,7 +2487,7 @@ class WorkloadsConfig(proto.Message): Optional. Resources used by Airflow DAG processors. This field is supported for Cloud Composer environments in - versions composer-3.\ *.*-airflow-*.*.\* and newer. + versions composer-3-airflow-\ *.*.\ *-build.* and newer. """ class SchedulerResource(proto.Message): @@ -2625,7 +2625,7 @@ class DagProcessorResource(proto.Message): r"""Configuration for resources used by Airflow DAG processors. This field is supported for Cloud Composer environments in versions - composer-3.\ *.*-airflow-*.*.\* and newer. + composer-3-airflow-\ *.*.\ *-build.* and newer. Attributes: cpu (float): diff --git a/packages/google-cloud-orchestration-airflow/noxfile.py b/packages/google-cloud-orchestration-airflow/noxfile.py index 0acc836b384e..a4a13745db02 100644 --- a/packages/google-cloud-orchestration-airflow/noxfile.py +++ b/packages/google-cloud-orchestration-airflow/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 `. """ @@ -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",