diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 203388cdd4..c8e50ca9b8 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -446,15 +446,15 @@ jobs: - name: Install nox. run: | python -m pip install nox - - name: Run the prerelease_deps nox session + - name: Run the prerelease_deps and core_deps_from_source nox sessions # Exclude testing for asset which requires dependency google-cloud-org-policy # in order to run unit tests # See https://github.com/googleapis/gapic-generator-python/issues/1806 run: | - nox -f tests/integration/goldens/credentials/noxfile.py -s prerelease_deps - nox -f tests/integration/goldens/eventarc/noxfile.py -s prerelease_deps - nox -f tests/integration/goldens/logging/noxfile.py -s prerelease_deps - nox -f tests/integration/goldens/redis/noxfile.py -s prerelease_deps + nox -f tests/integration/goldens/credentials/noxfile.py -s prerelease_deps core_deps_from_source + nox -f tests/integration/goldens/eventarc/noxfile.py -s prerelease_deps core_deps_from_source + nox -f tests/integration/goldens/logging/noxfile.py -s prerelease_deps core_deps_from_source + nox -f tests/integration/goldens/redis/noxfile.py -s prerelease_deps core_deps_from_source lint: runs-on: ubuntu-latest steps: diff --git a/gapic/templates/noxfile.py.j2 b/gapic/templates/noxfile.py.j2 index c03635deb5..e940f7b9bf 100644 --- a/gapic/templates/noxfile.py.j2 +++ b/gapic/templates/noxfile.py.j2 @@ -610,10 +610,10 @@ def core_deps_from_source(session, protobuf_implementation): # the `prerel_deps` list in the `prerelease_deps` nox session should also be updated. core_dependencies_from_source = [ "googleapis-common-protos @ git+https://github.com/googleapis/google-cloud-python#egg=googleapis-common-protos&subdirectory=packages/googleapis-common-protos", - "google-api-core @ git+https://github.com/googleapis/python-api-core.git", + "google-api-core @ git+https://github.com/googleapis/google-cloud-python#egg=google-api-core&subdirectory=packages/google-api-core", "google-auth @ git+https://github.com/googleapis/google-auth-library-python.git", "grpc-google-iam-v1 @ git+https://github.com/googleapis/google-cloud-python#egg=grpc-google-iam-v1&subdirectory=packages/grpc-google-iam-v1", - "proto-plus @ git+https://github.com/googleapis/proto-plus-python.git", + "proto-plus @ git+https://github.com/googleapis/google-cloud-python#egg=proto-plus&subdirectory=packages/proto-plus", ] for dep in core_dependencies_from_source: diff --git a/tests/integration/goldens/asset/noxfile.py b/tests/integration/goldens/asset/noxfile.py index 3005dac3c7..566e8e9e09 100755 --- a/tests/integration/goldens/asset/noxfile.py +++ b/tests/integration/goldens/asset/noxfile.py @@ -603,10 +603,10 @@ def core_deps_from_source(session, protobuf_implementation): # the `prerel_deps` list in the `prerelease_deps` nox session should also be updated. core_dependencies_from_source = [ "googleapis-common-protos @ git+https://github.com/googleapis/google-cloud-python#egg=googleapis-common-protos&subdirectory=packages/googleapis-common-protos", - "google-api-core @ git+https://github.com/googleapis/python-api-core.git", + "google-api-core @ git+https://github.com/googleapis/google-cloud-python#egg=google-api-core&subdirectory=packages/google-api-core", "google-auth @ git+https://github.com/googleapis/google-auth-library-python.git", "grpc-google-iam-v1 @ git+https://github.com/googleapis/google-cloud-python#egg=grpc-google-iam-v1&subdirectory=packages/grpc-google-iam-v1", - "proto-plus @ git+https://github.com/googleapis/proto-plus-python.git", + "proto-plus @ git+https://github.com/googleapis/google-cloud-python#egg=proto-plus&subdirectory=packages/proto-plus", ] for dep in core_dependencies_from_source: diff --git a/tests/integration/goldens/credentials/noxfile.py b/tests/integration/goldens/credentials/noxfile.py index 1b63a5d05d..29438a4060 100755 --- a/tests/integration/goldens/credentials/noxfile.py +++ b/tests/integration/goldens/credentials/noxfile.py @@ -603,10 +603,10 @@ def core_deps_from_source(session, protobuf_implementation): # the `prerel_deps` list in the `prerelease_deps` nox session should also be updated. core_dependencies_from_source = [ "googleapis-common-protos @ git+https://github.com/googleapis/google-cloud-python#egg=googleapis-common-protos&subdirectory=packages/googleapis-common-protos", - "google-api-core @ git+https://github.com/googleapis/python-api-core.git", + "google-api-core @ git+https://github.com/googleapis/google-cloud-python#egg=google-api-core&subdirectory=packages/google-api-core", "google-auth @ git+https://github.com/googleapis/google-auth-library-python.git", "grpc-google-iam-v1 @ git+https://github.com/googleapis/google-cloud-python#egg=grpc-google-iam-v1&subdirectory=packages/grpc-google-iam-v1", - "proto-plus @ git+https://github.com/googleapis/proto-plus-python.git", + "proto-plus @ git+https://github.com/googleapis/google-cloud-python#egg=proto-plus&subdirectory=packages/proto-plus", ] for dep in core_dependencies_from_source: diff --git a/tests/integration/goldens/eventarc/noxfile.py b/tests/integration/goldens/eventarc/noxfile.py index 235454ee92..3da254f003 100755 --- a/tests/integration/goldens/eventarc/noxfile.py +++ b/tests/integration/goldens/eventarc/noxfile.py @@ -603,10 +603,10 @@ def core_deps_from_source(session, protobuf_implementation): # the `prerel_deps` list in the `prerelease_deps` nox session should also be updated. core_dependencies_from_source = [ "googleapis-common-protos @ git+https://github.com/googleapis/google-cloud-python#egg=googleapis-common-protos&subdirectory=packages/googleapis-common-protos", - "google-api-core @ git+https://github.com/googleapis/python-api-core.git", + "google-api-core @ git+https://github.com/googleapis/google-cloud-python#egg=google-api-core&subdirectory=packages/google-api-core", "google-auth @ git+https://github.com/googleapis/google-auth-library-python.git", "grpc-google-iam-v1 @ git+https://github.com/googleapis/google-cloud-python#egg=grpc-google-iam-v1&subdirectory=packages/grpc-google-iam-v1", - "proto-plus @ git+https://github.com/googleapis/proto-plus-python.git", + "proto-plus @ git+https://github.com/googleapis/google-cloud-python#egg=proto-plus&subdirectory=packages/proto-plus", ] for dep in core_dependencies_from_source: diff --git a/tests/integration/goldens/logging/noxfile.py b/tests/integration/goldens/logging/noxfile.py index c2efe83be4..ebeacae6b8 100755 --- a/tests/integration/goldens/logging/noxfile.py +++ b/tests/integration/goldens/logging/noxfile.py @@ -603,10 +603,10 @@ def core_deps_from_source(session, protobuf_implementation): # the `prerel_deps` list in the `prerelease_deps` nox session should also be updated. core_dependencies_from_source = [ "googleapis-common-protos @ git+https://github.com/googleapis/google-cloud-python#egg=googleapis-common-protos&subdirectory=packages/googleapis-common-protos", - "google-api-core @ git+https://github.com/googleapis/python-api-core.git", + "google-api-core @ git+https://github.com/googleapis/google-cloud-python#egg=google-api-core&subdirectory=packages/google-api-core", "google-auth @ git+https://github.com/googleapis/google-auth-library-python.git", "grpc-google-iam-v1 @ git+https://github.com/googleapis/google-cloud-python#egg=grpc-google-iam-v1&subdirectory=packages/grpc-google-iam-v1", - "proto-plus @ git+https://github.com/googleapis/proto-plus-python.git", + "proto-plus @ git+https://github.com/googleapis/google-cloud-python#egg=proto-plus&subdirectory=packages/proto-plus", ] for dep in core_dependencies_from_source: diff --git a/tests/integration/goldens/logging_internal/noxfile.py b/tests/integration/goldens/logging_internal/noxfile.py index c2efe83be4..ebeacae6b8 100755 --- a/tests/integration/goldens/logging_internal/noxfile.py +++ b/tests/integration/goldens/logging_internal/noxfile.py @@ -603,10 +603,10 @@ def core_deps_from_source(session, protobuf_implementation): # the `prerel_deps` list in the `prerelease_deps` nox session should also be updated. core_dependencies_from_source = [ "googleapis-common-protos @ git+https://github.com/googleapis/google-cloud-python#egg=googleapis-common-protos&subdirectory=packages/googleapis-common-protos", - "google-api-core @ git+https://github.com/googleapis/python-api-core.git", + "google-api-core @ git+https://github.com/googleapis/google-cloud-python#egg=google-api-core&subdirectory=packages/google-api-core", "google-auth @ git+https://github.com/googleapis/google-auth-library-python.git", "grpc-google-iam-v1 @ git+https://github.com/googleapis/google-cloud-python#egg=grpc-google-iam-v1&subdirectory=packages/grpc-google-iam-v1", - "proto-plus @ git+https://github.com/googleapis/proto-plus-python.git", + "proto-plus @ git+https://github.com/googleapis/google-cloud-python#egg=proto-plus&subdirectory=packages/proto-plus", ] for dep in core_dependencies_from_source: diff --git a/tests/integration/goldens/redis/noxfile.py b/tests/integration/goldens/redis/noxfile.py index 0291767b81..df281e656c 100755 --- a/tests/integration/goldens/redis/noxfile.py +++ b/tests/integration/goldens/redis/noxfile.py @@ -603,10 +603,10 @@ def core_deps_from_source(session, protobuf_implementation): # the `prerel_deps` list in the `prerelease_deps` nox session should also be updated. core_dependencies_from_source = [ "googleapis-common-protos @ git+https://github.com/googleapis/google-cloud-python#egg=googleapis-common-protos&subdirectory=packages/googleapis-common-protos", - "google-api-core @ git+https://github.com/googleapis/python-api-core.git", + "google-api-core @ git+https://github.com/googleapis/google-cloud-python#egg=google-api-core&subdirectory=packages/google-api-core", "google-auth @ git+https://github.com/googleapis/google-auth-library-python.git", "grpc-google-iam-v1 @ git+https://github.com/googleapis/google-cloud-python#egg=grpc-google-iam-v1&subdirectory=packages/grpc-google-iam-v1", - "proto-plus @ git+https://github.com/googleapis/proto-plus-python.git", + "proto-plus @ git+https://github.com/googleapis/google-cloud-python#egg=proto-plus&subdirectory=packages/proto-plus", ] for dep in core_dependencies_from_source: diff --git a/tests/integration/goldens/redis_selective/noxfile.py b/tests/integration/goldens/redis_selective/noxfile.py index 0291767b81..df281e656c 100755 --- a/tests/integration/goldens/redis_selective/noxfile.py +++ b/tests/integration/goldens/redis_selective/noxfile.py @@ -603,10 +603,10 @@ def core_deps_from_source(session, protobuf_implementation): # the `prerel_deps` list in the `prerelease_deps` nox session should also be updated. core_dependencies_from_source = [ "googleapis-common-protos @ git+https://github.com/googleapis/google-cloud-python#egg=googleapis-common-protos&subdirectory=packages/googleapis-common-protos", - "google-api-core @ git+https://github.com/googleapis/python-api-core.git", + "google-api-core @ git+https://github.com/googleapis/google-cloud-python#egg=google-api-core&subdirectory=packages/google-api-core", "google-auth @ git+https://github.com/googleapis/google-auth-library-python.git", "grpc-google-iam-v1 @ git+https://github.com/googleapis/google-cloud-python#egg=grpc-google-iam-v1&subdirectory=packages/grpc-google-iam-v1", - "proto-plus @ git+https://github.com/googleapis/proto-plus-python.git", + "proto-plus @ git+https://github.com/googleapis/google-cloud-python#egg=proto-plus&subdirectory=packages/proto-plus", ] for dep in core_dependencies_from_source: