diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index b668c04..44c78f7 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -13,5 +13,4 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-python:latest - digest: sha256:ed1f9983d5a935a89fe8085e8bb97d94e41015252c5b6c9771257cf8624367e6 - + digest: sha256:4e1991042fe54b991db9ca17c8fb386e61b22fe4d1472a568bf0fcac85dcf5d3 diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index f7b8344..b46d730 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -8,9 +8,9 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Setup Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v3 with: python-version: "3.10" - name: Install nox @@ -24,9 +24,9 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Setup Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v3 with: python-version: "3.10" - name: Install nox diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 1e8b05c..f512a49 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -8,9 +8,9 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Setup Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v3 with: python-version: "3.10" - name: Install nox diff --git a/.github/workflows/unittest.yml b/.github/workflows/unittest.yml index 074ee25..e5be6ed 100644 --- a/.github/workflows/unittest.yml +++ b/.github/workflows/unittest.yml @@ -11,9 +11,9 @@ jobs: python: ['3.6', '3.7', '3.8', '3.9', '3.10'] steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Setup Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v3 with: python-version: ${{ matrix.python }} - name: Install nox @@ -26,7 +26,7 @@ jobs: run: | nox -s unit-${{ matrix.python }} - name: Upload coverage results - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: coverage-artifacts path: .coverage-${{ matrix.python }} @@ -37,9 +37,9 @@ jobs: - unit steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Setup Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v3 with: python-version: "3.10" - name: Install coverage @@ -47,7 +47,7 @@ jobs: python -m pip install --upgrade setuptools pip wheel python -m pip install coverage - name: Download coverage results - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v3 with: name: coverage-artifacts path: .coverage-results/ diff --git a/CHANGELOG.md b/CHANGELOG.md index 376a660..486e8ab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +### [1.3.1](https://github.com/googleapis/python-video-transcoder/compare/v1.3.0...v1.3.1) (2022-03-05) + + +### Bug Fixes + +* **deps:** require google-api-core>=1.31.5, >=2.3.2 ([#153](https://github.com/googleapis/python-video-transcoder/issues/153)) ([03ba693](https://github.com/googleapis/python-video-transcoder/commit/03ba693031d605a3e61b3fd1e7e0c5529bc3c399)) + ## [1.3.0](https://github.com/googleapis/python-video-transcoder/compare/v1.2.1...v1.3.0) (2022-02-24) diff --git a/google/cloud/video/transcoder/__init__.py b/google/cloud/video/transcoder/__init__.py index 67b4b12..5c74336 100644 --- a/google/cloud/video/transcoder/__init__.py +++ b/google/cloud/video/transcoder/__init__.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright 2020 Google LLC +# Copyright 2022 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/google/cloud/video/transcoder_v1/__init__.py b/google/cloud/video/transcoder_v1/__init__.py index b76bfde..69f350a 100644 --- a/google/cloud/video/transcoder_v1/__init__.py +++ b/google/cloud/video/transcoder_v1/__init__.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright 2020 Google LLC +# Copyright 2022 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/google/cloud/video/transcoder_v1/services/__init__.py b/google/cloud/video/transcoder_v1/services/__init__.py index 4de6597..e8e1c38 100644 --- a/google/cloud/video/transcoder_v1/services/__init__.py +++ b/google/cloud/video/transcoder_v1/services/__init__.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright 2020 Google LLC +# Copyright 2022 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/google/cloud/video/transcoder_v1/services/transcoder_service/__init__.py b/google/cloud/video/transcoder_v1/services/transcoder_service/__init__.py index d853c3a..e133525 100644 --- a/google/cloud/video/transcoder_v1/services/transcoder_service/__init__.py +++ b/google/cloud/video/transcoder_v1/services/transcoder_service/__init__.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright 2020 Google LLC +# Copyright 2022 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/google/cloud/video/transcoder_v1/services/transcoder_service/async_client.py b/google/cloud/video/transcoder_v1/services/transcoder_service/async_client.py index 1522d5f..5af26c3 100644 --- a/google/cloud/video/transcoder_v1/services/transcoder_service/async_client.py +++ b/google/cloud/video/transcoder_v1/services/transcoder_service/async_client.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright 2020 Google LLC +# Copyright 2022 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -228,7 +228,7 @@ async def create_job( ) -> resources.Job: r"""Creates a job in the specified region. - .. code-block:: + .. code-block:: python from google.cloud.video import transcoder_v1 @@ -329,7 +329,7 @@ async def list_jobs( ) -> pagers.ListJobsAsyncPager: r"""Lists jobs in the specified region. - .. code-block:: + .. code-block:: python from google.cloud.video import transcoder_v1 @@ -429,7 +429,7 @@ async def get_job( ) -> resources.Job: r"""Returns the job data. - .. code-block:: + .. code-block:: python from google.cloud.video import transcoder_v1 @@ -517,7 +517,7 @@ async def delete_job( ) -> None: r"""Deletes a job. - .. code-block:: + .. code-block:: python from google.cloud.video import transcoder_v1 @@ -599,7 +599,7 @@ async def create_job_template( ) -> resources.JobTemplate: r"""Creates a job template in the specified region. - .. code-block:: + .. code-block:: python from google.cloud.video import transcoder_v1 @@ -712,7 +712,7 @@ async def list_job_templates( ) -> pagers.ListJobTemplatesAsyncPager: r"""Lists job templates in the specified region. - .. code-block:: + .. code-block:: python from google.cloud.video import transcoder_v1 @@ -812,7 +812,7 @@ async def get_job_template( ) -> resources.JobTemplate: r"""Returns the job template data. - .. code-block:: + .. code-block:: python from google.cloud.video import transcoder_v1 @@ -901,7 +901,7 @@ async def delete_job_template( ) -> None: r"""Deletes a job template. - .. code-block:: + .. code-block:: python from google.cloud.video import transcoder_v1 diff --git a/google/cloud/video/transcoder_v1/services/transcoder_service/client.py b/google/cloud/video/transcoder_v1/services/transcoder_service/client.py index 4380c6a..c595163 100644 --- a/google/cloud/video/transcoder_v1/services/transcoder_service/client.py +++ b/google/cloud/video/transcoder_v1/services/transcoder_service/client.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright 2020 Google LLC +# Copyright 2022 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -439,8 +439,7 @@ def create_job( ) -> resources.Job: r"""Creates a job in the specified region. - - .. code-block:: + .. code-block:: python from google.cloud.video import transcoder_v1 @@ -541,8 +540,7 @@ def list_jobs( ) -> pagers.ListJobsPager: r"""Lists jobs in the specified region. - - .. code-block:: + .. code-block:: python from google.cloud.video import transcoder_v1 @@ -642,8 +640,7 @@ def get_job( ) -> resources.Job: r"""Returns the job data. - - .. code-block:: + .. code-block:: python from google.cloud.video import transcoder_v1 @@ -731,8 +728,7 @@ def delete_job( ) -> None: r"""Deletes a job. - - .. code-block:: + .. code-block:: python from google.cloud.video import transcoder_v1 @@ -814,8 +810,7 @@ def create_job_template( ) -> resources.JobTemplate: r"""Creates a job template in the specified region. - - .. code-block:: + .. code-block:: python from google.cloud.video import transcoder_v1 @@ -928,8 +923,7 @@ def list_job_templates( ) -> pagers.ListJobTemplatesPager: r"""Lists job templates in the specified region. - - .. code-block:: + .. code-block:: python from google.cloud.video import transcoder_v1 @@ -1029,8 +1023,7 @@ def get_job_template( ) -> resources.JobTemplate: r"""Returns the job template data. - - .. code-block:: + .. code-block:: python from google.cloud.video import transcoder_v1 @@ -1119,8 +1112,7 @@ def delete_job_template( ) -> None: r"""Deletes a job template. - - .. code-block:: + .. code-block:: python from google.cloud.video import transcoder_v1 diff --git a/google/cloud/video/transcoder_v1/services/transcoder_service/pagers.py b/google/cloud/video/transcoder_v1/services/transcoder_service/pagers.py index 4d10e83..8877493 100644 --- a/google/cloud/video/transcoder_v1/services/transcoder_service/pagers.py +++ b/google/cloud/video/transcoder_v1/services/transcoder_service/pagers.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright 2020 Google LLC +# Copyright 2022 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/google/cloud/video/transcoder_v1/services/transcoder_service/transports/__init__.py b/google/cloud/video/transcoder_v1/services/transcoder_service/transports/__init__.py index f7496c0..f382a59 100644 --- a/google/cloud/video/transcoder_v1/services/transcoder_service/transports/__init__.py +++ b/google/cloud/video/transcoder_v1/services/transcoder_service/transports/__init__.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright 2020 Google LLC +# Copyright 2022 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/google/cloud/video/transcoder_v1/services/transcoder_service/transports/base.py b/google/cloud/video/transcoder_v1/services/transcoder_service/transports/base.py index 85cff1e..1c24a9f 100644 --- a/google/cloud/video/transcoder_v1/services/transcoder_service/transports/base.py +++ b/google/cloud/video/transcoder_v1/services/transcoder_service/transports/base.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright 2020 Google LLC +# Copyright 2022 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/google/cloud/video/transcoder_v1/services/transcoder_service/transports/grpc.py b/google/cloud/video/transcoder_v1/services/transcoder_service/transports/grpc.py index d13582f..6bdeddf 100644 --- a/google/cloud/video/transcoder_v1/services/transcoder_service/transports/grpc.py +++ b/google/cloud/video/transcoder_v1/services/transcoder_service/transports/grpc.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright 2020 Google LLC +# Copyright 2022 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/google/cloud/video/transcoder_v1/services/transcoder_service/transports/grpc_asyncio.py b/google/cloud/video/transcoder_v1/services/transcoder_service/transports/grpc_asyncio.py index d194152..e68807f 100644 --- a/google/cloud/video/transcoder_v1/services/transcoder_service/transports/grpc_asyncio.py +++ b/google/cloud/video/transcoder_v1/services/transcoder_service/transports/grpc_asyncio.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright 2020 Google LLC +# Copyright 2022 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/google/cloud/video/transcoder_v1/types/__init__.py b/google/cloud/video/transcoder_v1/types/__init__.py index 9544b42..50a3209 100644 --- a/google/cloud/video/transcoder_v1/types/__init__.py +++ b/google/cloud/video/transcoder_v1/types/__init__.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright 2020 Google LLC +# Copyright 2022 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/google/cloud/video/transcoder_v1/types/resources.py b/google/cloud/video/transcoder_v1/types/resources.py index 3108526..5d3e00e 100644 --- a/google/cloud/video/transcoder_v1/types/resources.py +++ b/google/cloud/video/transcoder_v1/types/resources.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright 2020 Google LLC +# Copyright 2022 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/google/cloud/video/transcoder_v1/types/services.py b/google/cloud/video/transcoder_v1/types/services.py index 4d67e83..65b5af1 100644 --- a/google/cloud/video/transcoder_v1/types/services.py +++ b/google/cloud/video/transcoder_v1/types/services.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright 2020 Google LLC +# Copyright 2022 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/samples/generated_samples/snippet_metadata_transcoder_v1.json b/samples/generated_samples/snippet_metadata_transcoder_v1.json index 68940f6..b28a2a3 100644 --- a/samples/generated_samples/snippet_metadata_transcoder_v1.json +++ b/samples/generated_samples/snippet_metadata_transcoder_v1.json @@ -10,8 +10,8 @@ "shortName": "CreateJobTemplate" } }, - "file": "transcoder_generated_transcoder_v1_transcoder_service_create_job_template_async.py", - "regionTag": "transcoder_generated_transcoder_v1_TranscoderService_CreateJobTemplate_async", + "file": "transcoder_v1_generated_transcoder_service_create_job_template_async.py", + "regionTag": "transcoder_v1_generated_TranscoderService_CreateJobTemplate_async", "segments": [ { "end": 45, @@ -54,8 +54,8 @@ "shortName": "CreateJobTemplate" } }, - "file": "transcoder_generated_transcoder_v1_transcoder_service_create_job_template_sync.py", - "regionTag": "transcoder_generated_transcoder_v1_TranscoderService_CreateJobTemplate_sync", + "file": "transcoder_v1_generated_transcoder_service_create_job_template_sync.py", + "regionTag": "transcoder_v1_generated_TranscoderService_CreateJobTemplate_sync", "segments": [ { "end": 45, @@ -99,8 +99,8 @@ "shortName": "CreateJob" } }, - "file": "transcoder_generated_transcoder_v1_transcoder_service_create_job_async.py", - "regionTag": "transcoder_generated_transcoder_v1_TranscoderService_CreateJob_async", + "file": "transcoder_v1_generated_transcoder_service_create_job_async.py", + "regionTag": "transcoder_v1_generated_TranscoderService_CreateJob_async", "segments": [ { "end": 48, @@ -143,8 +143,8 @@ "shortName": "CreateJob" } }, - "file": "transcoder_generated_transcoder_v1_transcoder_service_create_job_sync.py", - "regionTag": "transcoder_generated_transcoder_v1_TranscoderService_CreateJob_sync", + "file": "transcoder_v1_generated_transcoder_service_create_job_sync.py", + "regionTag": "transcoder_v1_generated_TranscoderService_CreateJob_sync", "segments": [ { "end": 48, @@ -188,8 +188,8 @@ "shortName": "DeleteJobTemplate" } }, - "file": "transcoder_generated_transcoder_v1_transcoder_service_delete_job_template_async.py", - "regionTag": "transcoder_generated_transcoder_v1_TranscoderService_DeleteJobTemplate_async", + "file": "transcoder_v1_generated_transcoder_service_delete_job_template_async.py", + "regionTag": "transcoder_v1_generated_TranscoderService_DeleteJobTemplate_async", "segments": [ { "end": 42, @@ -230,8 +230,8 @@ "shortName": "DeleteJobTemplate" } }, - "file": "transcoder_generated_transcoder_v1_transcoder_service_delete_job_template_sync.py", - "regionTag": "transcoder_generated_transcoder_v1_TranscoderService_DeleteJobTemplate_sync", + "file": "transcoder_v1_generated_transcoder_service_delete_job_template_sync.py", + "regionTag": "transcoder_v1_generated_TranscoderService_DeleteJobTemplate_sync", "segments": [ { "end": 42, @@ -273,8 +273,8 @@ "shortName": "DeleteJob" } }, - "file": "transcoder_generated_transcoder_v1_transcoder_service_delete_job_async.py", - "regionTag": "transcoder_generated_transcoder_v1_TranscoderService_DeleteJob_async", + "file": "transcoder_v1_generated_transcoder_service_delete_job_async.py", + "regionTag": "transcoder_v1_generated_TranscoderService_DeleteJob_async", "segments": [ { "end": 42, @@ -315,8 +315,8 @@ "shortName": "DeleteJob" } }, - "file": "transcoder_generated_transcoder_v1_transcoder_service_delete_job_sync.py", - "regionTag": "transcoder_generated_transcoder_v1_TranscoderService_DeleteJob_sync", + "file": "transcoder_v1_generated_transcoder_service_delete_job_sync.py", + "regionTag": "transcoder_v1_generated_TranscoderService_DeleteJob_sync", "segments": [ { "end": 42, @@ -358,8 +358,8 @@ "shortName": "GetJobTemplate" } }, - "file": "transcoder_generated_transcoder_v1_transcoder_service_get_job_template_async.py", - "regionTag": "transcoder_generated_transcoder_v1_TranscoderService_GetJobTemplate_async", + "file": "transcoder_v1_generated_transcoder_service_get_job_template_async.py", + "regionTag": "transcoder_v1_generated_TranscoderService_GetJobTemplate_async", "segments": [ { "end": 44, @@ -402,8 +402,8 @@ "shortName": "GetJobTemplate" } }, - "file": "transcoder_generated_transcoder_v1_transcoder_service_get_job_template_sync.py", - "regionTag": "transcoder_generated_transcoder_v1_TranscoderService_GetJobTemplate_sync", + "file": "transcoder_v1_generated_transcoder_service_get_job_template_sync.py", + "regionTag": "transcoder_v1_generated_TranscoderService_GetJobTemplate_sync", "segments": [ { "end": 44, @@ -447,8 +447,8 @@ "shortName": "GetJob" } }, - "file": "transcoder_generated_transcoder_v1_transcoder_service_get_job_async.py", - "regionTag": "transcoder_generated_transcoder_v1_TranscoderService_GetJob_async", + "file": "transcoder_v1_generated_transcoder_service_get_job_async.py", + "regionTag": "transcoder_v1_generated_TranscoderService_GetJob_async", "segments": [ { "end": 44, @@ -491,8 +491,8 @@ "shortName": "GetJob" } }, - "file": "transcoder_generated_transcoder_v1_transcoder_service_get_job_sync.py", - "regionTag": "transcoder_generated_transcoder_v1_TranscoderService_GetJob_sync", + "file": "transcoder_v1_generated_transcoder_service_get_job_sync.py", + "regionTag": "transcoder_v1_generated_TranscoderService_GetJob_sync", "segments": [ { "end": 44, @@ -536,8 +536,8 @@ "shortName": "ListJobTemplates" } }, - "file": "transcoder_generated_transcoder_v1_transcoder_service_list_job_templates_async.py", - "regionTag": "transcoder_generated_transcoder_v1_TranscoderService_ListJobTemplates_async", + "file": "transcoder_v1_generated_transcoder_service_list_job_templates_async.py", + "regionTag": "transcoder_v1_generated_TranscoderService_ListJobTemplates_async", "segments": [ { "end": 45, @@ -580,8 +580,8 @@ "shortName": "ListJobTemplates" } }, - "file": "transcoder_generated_transcoder_v1_transcoder_service_list_job_templates_sync.py", - "regionTag": "transcoder_generated_transcoder_v1_TranscoderService_ListJobTemplates_sync", + "file": "transcoder_v1_generated_transcoder_service_list_job_templates_sync.py", + "regionTag": "transcoder_v1_generated_TranscoderService_ListJobTemplates_sync", "segments": [ { "end": 45, @@ -625,8 +625,8 @@ "shortName": "ListJobs" } }, - "file": "transcoder_generated_transcoder_v1_transcoder_service_list_jobs_async.py", - "regionTag": "transcoder_generated_transcoder_v1_TranscoderService_ListJobs_async", + "file": "transcoder_v1_generated_transcoder_service_list_jobs_async.py", + "regionTag": "transcoder_v1_generated_TranscoderService_ListJobs_async", "segments": [ { "end": 45, @@ -669,8 +669,8 @@ "shortName": "ListJobs" } }, - "file": "transcoder_generated_transcoder_v1_transcoder_service_list_jobs_sync.py", - "regionTag": "transcoder_generated_transcoder_v1_TranscoderService_ListJobs_sync", + "file": "transcoder_v1_generated_transcoder_service_list_jobs_sync.py", + "regionTag": "transcoder_v1_generated_TranscoderService_ListJobs_sync", "segments": [ { "end": 45, diff --git a/samples/generated_samples/transcoder_generated_transcoder_v1_transcoder_service_create_job_async.py b/samples/generated_samples/transcoder_v1_generated_transcoder_service_create_job_async.py similarity index 88% rename from samples/generated_samples/transcoder_generated_transcoder_v1_transcoder_service_create_job_async.py rename to samples/generated_samples/transcoder_v1_generated_transcoder_service_create_job_async.py index 13dbbf6..934ee9f 100644 --- a/samples/generated_samples/transcoder_generated_transcoder_v1_transcoder_service_create_job_async.py +++ b/samples/generated_samples/transcoder_v1_generated_transcoder_service_create_job_async.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright 2020 Google LLC +# Copyright 2022 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -23,7 +23,7 @@ # python3 -m pip install google-cloud-video-transcoder -# [START transcoder_generated_transcoder_v1_TranscoderService_CreateJob_async] +# [START transcoder_v1_generated_TranscoderService_CreateJob_async] from google.cloud.video import transcoder_v1 @@ -46,4 +46,4 @@ async def sample_create_job(): # Handle the response print(response) -# [END transcoder_generated_transcoder_v1_TranscoderService_CreateJob_async] +# [END transcoder_v1_generated_TranscoderService_CreateJob_async] diff --git a/samples/generated_samples/transcoder_generated_transcoder_v1_transcoder_service_create_job_sync.py b/samples/generated_samples/transcoder_v1_generated_transcoder_service_create_job_sync.py similarity index 88% rename from samples/generated_samples/transcoder_generated_transcoder_v1_transcoder_service_create_job_sync.py rename to samples/generated_samples/transcoder_v1_generated_transcoder_service_create_job_sync.py index 537d2f2..406a4e4 100644 --- a/samples/generated_samples/transcoder_generated_transcoder_v1_transcoder_service_create_job_sync.py +++ b/samples/generated_samples/transcoder_v1_generated_transcoder_service_create_job_sync.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright 2020 Google LLC +# Copyright 2022 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -23,7 +23,7 @@ # python3 -m pip install google-cloud-video-transcoder -# [START transcoder_generated_transcoder_v1_TranscoderService_CreateJob_sync] +# [START transcoder_v1_generated_TranscoderService_CreateJob_sync] from google.cloud.video import transcoder_v1 @@ -46,4 +46,4 @@ def sample_create_job(): # Handle the response print(response) -# [END transcoder_generated_transcoder_v1_TranscoderService_CreateJob_sync] +# [END transcoder_v1_generated_TranscoderService_CreateJob_sync] diff --git a/samples/generated_samples/transcoder_generated_transcoder_v1_transcoder_service_create_job_template_async.py b/samples/generated_samples/transcoder_v1_generated_transcoder_service_create_job_template_async.py similarity index 87% rename from samples/generated_samples/transcoder_generated_transcoder_v1_transcoder_service_create_job_template_async.py rename to samples/generated_samples/transcoder_v1_generated_transcoder_service_create_job_template_async.py index 033dff6..c6a4a9a 100644 --- a/samples/generated_samples/transcoder_generated_transcoder_v1_transcoder_service_create_job_template_async.py +++ b/samples/generated_samples/transcoder_v1_generated_transcoder_service_create_job_template_async.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright 2020 Google LLC +# Copyright 2022 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -23,7 +23,7 @@ # python3 -m pip install google-cloud-video-transcoder -# [START transcoder_generated_transcoder_v1_TranscoderService_CreateJobTemplate_async] +# [START transcoder_v1_generated_TranscoderService_CreateJobTemplate_async] from google.cloud.video import transcoder_v1 @@ -43,4 +43,4 @@ async def sample_create_job_template(): # Handle the response print(response) -# [END transcoder_generated_transcoder_v1_TranscoderService_CreateJobTemplate_async] +# [END transcoder_v1_generated_TranscoderService_CreateJobTemplate_async] diff --git a/samples/generated_samples/transcoder_generated_transcoder_v1_transcoder_service_create_job_template_sync.py b/samples/generated_samples/transcoder_v1_generated_transcoder_service_create_job_template_sync.py similarity index 87% rename from samples/generated_samples/transcoder_generated_transcoder_v1_transcoder_service_create_job_template_sync.py rename to samples/generated_samples/transcoder_v1_generated_transcoder_service_create_job_template_sync.py index d2899a3..34484f9 100644 --- a/samples/generated_samples/transcoder_generated_transcoder_v1_transcoder_service_create_job_template_sync.py +++ b/samples/generated_samples/transcoder_v1_generated_transcoder_service_create_job_template_sync.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright 2020 Google LLC +# Copyright 2022 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -23,7 +23,7 @@ # python3 -m pip install google-cloud-video-transcoder -# [START transcoder_generated_transcoder_v1_TranscoderService_CreateJobTemplate_sync] +# [START transcoder_v1_generated_TranscoderService_CreateJobTemplate_sync] from google.cloud.video import transcoder_v1 @@ -43,4 +43,4 @@ def sample_create_job_template(): # Handle the response print(response) -# [END transcoder_generated_transcoder_v1_TranscoderService_CreateJobTemplate_sync] +# [END transcoder_v1_generated_TranscoderService_CreateJobTemplate_sync] diff --git a/samples/generated_samples/transcoder_generated_transcoder_v1_transcoder_service_delete_job_async.py b/samples/generated_samples/transcoder_v1_generated_transcoder_service_delete_job_async.py similarity index 87% rename from samples/generated_samples/transcoder_generated_transcoder_v1_transcoder_service_delete_job_async.py rename to samples/generated_samples/transcoder_v1_generated_transcoder_service_delete_job_async.py index e55591a..397955b 100644 --- a/samples/generated_samples/transcoder_generated_transcoder_v1_transcoder_service_delete_job_async.py +++ b/samples/generated_samples/transcoder_v1_generated_transcoder_service_delete_job_async.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright 2020 Google LLC +# Copyright 2022 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -23,7 +23,7 @@ # python3 -m pip install google-cloud-video-transcoder -# [START transcoder_generated_transcoder_v1_TranscoderService_DeleteJob_async] +# [START transcoder_v1_generated_TranscoderService_DeleteJob_async] from google.cloud.video import transcoder_v1 @@ -40,4 +40,4 @@ async def sample_delete_job(): await client.delete_job(request=request) -# [END transcoder_generated_transcoder_v1_TranscoderService_DeleteJob_async] +# [END transcoder_v1_generated_TranscoderService_DeleteJob_async] diff --git a/samples/generated_samples/transcoder_generated_transcoder_v1_transcoder_service_delete_job_sync.py b/samples/generated_samples/transcoder_v1_generated_transcoder_service_delete_job_sync.py similarity index 87% rename from samples/generated_samples/transcoder_generated_transcoder_v1_transcoder_service_delete_job_sync.py rename to samples/generated_samples/transcoder_v1_generated_transcoder_service_delete_job_sync.py index 78eae73..c148b72 100644 --- a/samples/generated_samples/transcoder_generated_transcoder_v1_transcoder_service_delete_job_sync.py +++ b/samples/generated_samples/transcoder_v1_generated_transcoder_service_delete_job_sync.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright 2020 Google LLC +# Copyright 2022 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -23,7 +23,7 @@ # python3 -m pip install google-cloud-video-transcoder -# [START transcoder_generated_transcoder_v1_TranscoderService_DeleteJob_sync] +# [START transcoder_v1_generated_TranscoderService_DeleteJob_sync] from google.cloud.video import transcoder_v1 @@ -40,4 +40,4 @@ def sample_delete_job(): client.delete_job(request=request) -# [END transcoder_generated_transcoder_v1_TranscoderService_DeleteJob_sync] +# [END transcoder_v1_generated_TranscoderService_DeleteJob_sync] diff --git a/samples/generated_samples/transcoder_generated_transcoder_v1_transcoder_service_delete_job_template_async.py b/samples/generated_samples/transcoder_v1_generated_transcoder_service_delete_job_template_async.py similarity index 86% rename from samples/generated_samples/transcoder_generated_transcoder_v1_transcoder_service_delete_job_template_async.py rename to samples/generated_samples/transcoder_v1_generated_transcoder_service_delete_job_template_async.py index 18a7fd4..53b2fd2 100644 --- a/samples/generated_samples/transcoder_generated_transcoder_v1_transcoder_service_delete_job_template_async.py +++ b/samples/generated_samples/transcoder_v1_generated_transcoder_service_delete_job_template_async.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright 2020 Google LLC +# Copyright 2022 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -23,7 +23,7 @@ # python3 -m pip install google-cloud-video-transcoder -# [START transcoder_generated_transcoder_v1_TranscoderService_DeleteJobTemplate_async] +# [START transcoder_v1_generated_TranscoderService_DeleteJobTemplate_async] from google.cloud.video import transcoder_v1 @@ -40,4 +40,4 @@ async def sample_delete_job_template(): await client.delete_job_template(request=request) -# [END transcoder_generated_transcoder_v1_TranscoderService_DeleteJobTemplate_async] +# [END transcoder_v1_generated_TranscoderService_DeleteJobTemplate_async] diff --git a/samples/generated_samples/transcoder_generated_transcoder_v1_transcoder_service_delete_job_template_sync.py b/samples/generated_samples/transcoder_v1_generated_transcoder_service_delete_job_template_sync.py similarity index 86% rename from samples/generated_samples/transcoder_generated_transcoder_v1_transcoder_service_delete_job_template_sync.py rename to samples/generated_samples/transcoder_v1_generated_transcoder_service_delete_job_template_sync.py index b6f9cb2..4a4b724 100644 --- a/samples/generated_samples/transcoder_generated_transcoder_v1_transcoder_service_delete_job_template_sync.py +++ b/samples/generated_samples/transcoder_v1_generated_transcoder_service_delete_job_template_sync.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright 2020 Google LLC +# Copyright 2022 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -23,7 +23,7 @@ # python3 -m pip install google-cloud-video-transcoder -# [START transcoder_generated_transcoder_v1_TranscoderService_DeleteJobTemplate_sync] +# [START transcoder_v1_generated_TranscoderService_DeleteJobTemplate_sync] from google.cloud.video import transcoder_v1 @@ -40,4 +40,4 @@ def sample_delete_job_template(): client.delete_job_template(request=request) -# [END transcoder_generated_transcoder_v1_TranscoderService_DeleteJobTemplate_sync] +# [END transcoder_v1_generated_TranscoderService_DeleteJobTemplate_sync] diff --git a/samples/generated_samples/transcoder_generated_transcoder_v1_transcoder_service_get_job_async.py b/samples/generated_samples/transcoder_v1_generated_transcoder_service_get_job_async.py similarity index 87% rename from samples/generated_samples/transcoder_generated_transcoder_v1_transcoder_service_get_job_async.py rename to samples/generated_samples/transcoder_v1_generated_transcoder_service_get_job_async.py index e381d4f..012c4c2 100644 --- a/samples/generated_samples/transcoder_generated_transcoder_v1_transcoder_service_get_job_async.py +++ b/samples/generated_samples/transcoder_v1_generated_transcoder_service_get_job_async.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright 2020 Google LLC +# Copyright 2022 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -23,7 +23,7 @@ # python3 -m pip install google-cloud-video-transcoder -# [START transcoder_generated_transcoder_v1_TranscoderService_GetJob_async] +# [START transcoder_v1_generated_TranscoderService_GetJob_async] from google.cloud.video import transcoder_v1 @@ -42,4 +42,4 @@ async def sample_get_job(): # Handle the response print(response) -# [END transcoder_generated_transcoder_v1_TranscoderService_GetJob_async] +# [END transcoder_v1_generated_TranscoderService_GetJob_async] diff --git a/samples/generated_samples/transcoder_generated_transcoder_v1_transcoder_service_get_job_sync.py b/samples/generated_samples/transcoder_v1_generated_transcoder_service_get_job_sync.py similarity index 87% rename from samples/generated_samples/transcoder_generated_transcoder_v1_transcoder_service_get_job_sync.py rename to samples/generated_samples/transcoder_v1_generated_transcoder_service_get_job_sync.py index b828c2f..5d1c20b 100644 --- a/samples/generated_samples/transcoder_generated_transcoder_v1_transcoder_service_get_job_sync.py +++ b/samples/generated_samples/transcoder_v1_generated_transcoder_service_get_job_sync.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright 2020 Google LLC +# Copyright 2022 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -23,7 +23,7 @@ # python3 -m pip install google-cloud-video-transcoder -# [START transcoder_generated_transcoder_v1_TranscoderService_GetJob_sync] +# [START transcoder_v1_generated_TranscoderService_GetJob_sync] from google.cloud.video import transcoder_v1 @@ -42,4 +42,4 @@ def sample_get_job(): # Handle the response print(response) -# [END transcoder_generated_transcoder_v1_TranscoderService_GetJob_sync] +# [END transcoder_v1_generated_TranscoderService_GetJob_sync] diff --git a/samples/generated_samples/transcoder_generated_transcoder_v1_transcoder_service_get_job_template_async.py b/samples/generated_samples/transcoder_v1_generated_transcoder_service_get_job_template_async.py similarity index 87% rename from samples/generated_samples/transcoder_generated_transcoder_v1_transcoder_service_get_job_template_async.py rename to samples/generated_samples/transcoder_v1_generated_transcoder_service_get_job_template_async.py index b6f6834..f86fecc 100644 --- a/samples/generated_samples/transcoder_generated_transcoder_v1_transcoder_service_get_job_template_async.py +++ b/samples/generated_samples/transcoder_v1_generated_transcoder_service_get_job_template_async.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright 2020 Google LLC +# Copyright 2022 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -23,7 +23,7 @@ # python3 -m pip install google-cloud-video-transcoder -# [START transcoder_generated_transcoder_v1_TranscoderService_GetJobTemplate_async] +# [START transcoder_v1_generated_TranscoderService_GetJobTemplate_async] from google.cloud.video import transcoder_v1 @@ -42,4 +42,4 @@ async def sample_get_job_template(): # Handle the response print(response) -# [END transcoder_generated_transcoder_v1_TranscoderService_GetJobTemplate_async] +# [END transcoder_v1_generated_TranscoderService_GetJobTemplate_async] diff --git a/samples/generated_samples/transcoder_generated_transcoder_v1_transcoder_service_get_job_template_sync.py b/samples/generated_samples/transcoder_v1_generated_transcoder_service_get_job_template_sync.py similarity index 87% rename from samples/generated_samples/transcoder_generated_transcoder_v1_transcoder_service_get_job_template_sync.py rename to samples/generated_samples/transcoder_v1_generated_transcoder_service_get_job_template_sync.py index 29df7fe..a9f65b2 100644 --- a/samples/generated_samples/transcoder_generated_transcoder_v1_transcoder_service_get_job_template_sync.py +++ b/samples/generated_samples/transcoder_v1_generated_transcoder_service_get_job_template_sync.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright 2020 Google LLC +# Copyright 2022 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -23,7 +23,7 @@ # python3 -m pip install google-cloud-video-transcoder -# [START transcoder_generated_transcoder_v1_TranscoderService_GetJobTemplate_sync] +# [START transcoder_v1_generated_TranscoderService_GetJobTemplate_sync] from google.cloud.video import transcoder_v1 @@ -42,4 +42,4 @@ def sample_get_job_template(): # Handle the response print(response) -# [END transcoder_generated_transcoder_v1_TranscoderService_GetJobTemplate_sync] +# [END transcoder_v1_generated_TranscoderService_GetJobTemplate_sync] diff --git a/samples/generated_samples/transcoder_generated_transcoder_v1_transcoder_service_list_job_templates_async.py b/samples/generated_samples/transcoder_v1_generated_transcoder_service_list_job_templates_async.py similarity index 87% rename from samples/generated_samples/transcoder_generated_transcoder_v1_transcoder_service_list_job_templates_async.py rename to samples/generated_samples/transcoder_v1_generated_transcoder_service_list_job_templates_async.py index 387bcaa..8461850 100644 --- a/samples/generated_samples/transcoder_generated_transcoder_v1_transcoder_service_list_job_templates_async.py +++ b/samples/generated_samples/transcoder_v1_generated_transcoder_service_list_job_templates_async.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright 2020 Google LLC +# Copyright 2022 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -23,7 +23,7 @@ # python3 -m pip install google-cloud-video-transcoder -# [START transcoder_generated_transcoder_v1_TranscoderService_ListJobTemplates_async] +# [START transcoder_v1_generated_TranscoderService_ListJobTemplates_async] from google.cloud.video import transcoder_v1 @@ -43,4 +43,4 @@ async def sample_list_job_templates(): async for response in page_result: print(response) -# [END transcoder_generated_transcoder_v1_TranscoderService_ListJobTemplates_async] +# [END transcoder_v1_generated_TranscoderService_ListJobTemplates_async] diff --git a/samples/generated_samples/transcoder_generated_transcoder_v1_transcoder_service_list_job_templates_sync.py b/samples/generated_samples/transcoder_v1_generated_transcoder_service_list_job_templates_sync.py similarity index 87% rename from samples/generated_samples/transcoder_generated_transcoder_v1_transcoder_service_list_job_templates_sync.py rename to samples/generated_samples/transcoder_v1_generated_transcoder_service_list_job_templates_sync.py index 80683dd..30ac526 100644 --- a/samples/generated_samples/transcoder_generated_transcoder_v1_transcoder_service_list_job_templates_sync.py +++ b/samples/generated_samples/transcoder_v1_generated_transcoder_service_list_job_templates_sync.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright 2020 Google LLC +# Copyright 2022 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -23,7 +23,7 @@ # python3 -m pip install google-cloud-video-transcoder -# [START transcoder_generated_transcoder_v1_TranscoderService_ListJobTemplates_sync] +# [START transcoder_v1_generated_TranscoderService_ListJobTemplates_sync] from google.cloud.video import transcoder_v1 @@ -43,4 +43,4 @@ def sample_list_job_templates(): for response in page_result: print(response) -# [END transcoder_generated_transcoder_v1_TranscoderService_ListJobTemplates_sync] +# [END transcoder_v1_generated_TranscoderService_ListJobTemplates_sync] diff --git a/samples/generated_samples/transcoder_generated_transcoder_v1_transcoder_service_list_jobs_async.py b/samples/generated_samples/transcoder_v1_generated_transcoder_service_list_jobs_async.py similarity index 88% rename from samples/generated_samples/transcoder_generated_transcoder_v1_transcoder_service_list_jobs_async.py rename to samples/generated_samples/transcoder_v1_generated_transcoder_service_list_jobs_async.py index 656a52e..597d30b 100644 --- a/samples/generated_samples/transcoder_generated_transcoder_v1_transcoder_service_list_jobs_async.py +++ b/samples/generated_samples/transcoder_v1_generated_transcoder_service_list_jobs_async.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright 2020 Google LLC +# Copyright 2022 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -23,7 +23,7 @@ # python3 -m pip install google-cloud-video-transcoder -# [START transcoder_generated_transcoder_v1_TranscoderService_ListJobs_async] +# [START transcoder_v1_generated_TranscoderService_ListJobs_async] from google.cloud.video import transcoder_v1 @@ -43,4 +43,4 @@ async def sample_list_jobs(): async for response in page_result: print(response) -# [END transcoder_generated_transcoder_v1_TranscoderService_ListJobs_async] +# [END transcoder_v1_generated_TranscoderService_ListJobs_async] diff --git a/samples/generated_samples/transcoder_generated_transcoder_v1_transcoder_service_list_jobs_sync.py b/samples/generated_samples/transcoder_v1_generated_transcoder_service_list_jobs_sync.py similarity index 88% rename from samples/generated_samples/transcoder_generated_transcoder_v1_transcoder_service_list_jobs_sync.py rename to samples/generated_samples/transcoder_v1_generated_transcoder_service_list_jobs_sync.py index 352587f..20b6d35 100644 --- a/samples/generated_samples/transcoder_generated_transcoder_v1_transcoder_service_list_jobs_sync.py +++ b/samples/generated_samples/transcoder_v1_generated_transcoder_service_list_jobs_sync.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright 2020 Google LLC +# Copyright 2022 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -23,7 +23,7 @@ # python3 -m pip install google-cloud-video-transcoder -# [START transcoder_generated_transcoder_v1_TranscoderService_ListJobs_sync] +# [START transcoder_v1_generated_TranscoderService_ListJobs_sync] from google.cloud.video import transcoder_v1 @@ -43,4 +43,4 @@ def sample_list_jobs(): for response in page_result: print(response) -# [END transcoder_generated_transcoder_v1_TranscoderService_ListJobs_sync] +# [END transcoder_v1_generated_TranscoderService_ListJobs_sync] diff --git a/samples/snippets/noxfile.py b/samples/snippets/noxfile.py index 20cdfc6..85f5836 100644 --- a/samples/snippets/noxfile.py +++ b/samples/snippets/noxfile.py @@ -188,42 +188,52 @@ def _session_tests( # check for presence of tests test_list = glob.glob("*_test.py") + glob.glob("test_*.py") test_list.extend(glob.glob("tests")) + if len(test_list) == 0: print("No tests found, skipping directory.") - else: - if TEST_CONFIG["pip_version_override"]: - pip_version = TEST_CONFIG["pip_version_override"] - session.install(f"pip=={pip_version}") - """Runs py.test for a particular project.""" - if os.path.exists("requirements.txt"): - if os.path.exists("constraints.txt"): - session.install("-r", "requirements.txt", "-c", "constraints.txt") - else: - session.install("-r", "requirements.txt") - - if os.path.exists("requirements-test.txt"): - if os.path.exists("constraints-test.txt"): - session.install( - "-r", "requirements-test.txt", "-c", "constraints-test.txt" - ) - else: - session.install("-r", "requirements-test.txt") - - if INSTALL_LIBRARY_FROM_SOURCE: - session.install("-e", _get_repo_root()) - - if post_install: - post_install(session) - - session.run( - "pytest", - *(PYTEST_COMMON_ARGS + session.posargs), - # Pytest will return 5 when no tests are collected. This can happen - # on travis where slow and flaky tests are excluded. - # See http://doc.pytest.org/en/latest/_modules/_pytest/main.html - success_codes=[0, 5], - env=get_pytest_env_vars(), - ) + return + + if TEST_CONFIG["pip_version_override"]: + pip_version = TEST_CONFIG["pip_version_override"] + session.install(f"pip=={pip_version}") + """Runs py.test for a particular project.""" + concurrent_args = [] + if os.path.exists("requirements.txt"): + if os.path.exists("constraints.txt"): + session.install("-r", "requirements.txt", "-c", "constraints.txt") + else: + session.install("-r", "requirements.txt") + with open("requirements.txt") as rfile: + packages = rfile.read() + + if os.path.exists("requirements-test.txt"): + if os.path.exists("constraints-test.txt"): + session.install("-r", "requirements-test.txt", "-c", "constraints-test.txt") + else: + session.install("-r", "requirements-test.txt") + with open("requirements-test.txt") as rtfile: + packages += rtfile.read() + + if INSTALL_LIBRARY_FROM_SOURCE: + session.install("-e", _get_repo_root()) + + if post_install: + post_install(session) + + if "pytest-parallel" in packages: + concurrent_args.extend(["--workers", "auto", "--tests-per-worker", "auto"]) + elif "pytest-xdist" in packages: + concurrent_args.extend(["-n", "auto"]) + + session.run( + "pytest", + *(PYTEST_COMMON_ARGS + session.posargs + concurrent_args), + # Pytest will return 5 when no tests are collected. This can happen + # on travis where slow and flaky tests are excluded. + # See http://doc.pytest.org/en/latest/_modules/_pytest/main.html + success_codes=[0, 5], + env=get_pytest_env_vars(), + ) @nox.session(python=ALL_VERSIONS) diff --git a/samples/snippets/requirements.txt b/samples/snippets/requirements.txt index f219cba..9d4974e 100644 --- a/samples/snippets/requirements.txt +++ b/samples/snippets/requirements.txt @@ -1,3 +1,3 @@ -google-api-python-client==2.38.0 +google-api-python-client==2.39.0 grpcio==1.44.0 -google-cloud-video-transcoder==1.2.1 +google-cloud-video-transcoder==1.3.0 diff --git a/scripts/fixup_transcoder_v1_keywords.py b/scripts/fixup_transcoder_v1_keywords.py index 45f161d..667e582 100644 --- a/scripts/fixup_transcoder_v1_keywords.py +++ b/scripts/fixup_transcoder_v1_keywords.py @@ -1,6 +1,6 @@ #! /usr/bin/env python3 # -*- coding: utf-8 -*- -# Copyright 2020 Google LLC +# Copyright 2022 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/setup.py b/setup.py index a3653ee..8724b25 100644 --- a/setup.py +++ b/setup.py @@ -19,7 +19,7 @@ import os import setuptools # type: ignore -version = "1.3.0" +version = "1.3.1" package_root = os.path.abspath(os.path.dirname(__file__)) @@ -44,7 +44,7 @@ # NOTE: Maintainers, please do not require google-api-core>=2.x.x # Until this issue is closed # https://github.com/googleapis/google-cloud-python/issues/10566 - "google-api-core[grpc] >= 1.28.0, <3.0.0dev", + "google-api-core[grpc] >= 1.31.5, <3.0.0dev,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.0", "proto-plus >= 1.20.3", ), python_requires=">=3.6", diff --git a/testing/constraints-3.6.txt b/testing/constraints-3.6.txt index 05bdbbf..523c46f 100644 --- a/testing/constraints-3.6.txt +++ b/testing/constraints-3.6.txt @@ -5,5 +5,5 @@ # # e.g., if setup.py has "foo >= 1.14.0, < 2.0.0dev", # Then this file should have foo==1.14.0 -google-api-core==1.28.0 +google-api-core==1.31.5 proto-plus==1.20.3 diff --git a/tests/__init__.py b/tests/__init__.py index 4de6597..e8e1c38 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright 2020 Google LLC +# Copyright 2022 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/unit/__init__.py b/tests/unit/__init__.py index 4de6597..e8e1c38 100644 --- a/tests/unit/__init__.py +++ b/tests/unit/__init__.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright 2020 Google LLC +# Copyright 2022 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/unit/gapic/__init__.py b/tests/unit/gapic/__init__.py index 4de6597..e8e1c38 100644 --- a/tests/unit/gapic/__init__.py +++ b/tests/unit/gapic/__init__.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright 2020 Google LLC +# Copyright 2022 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/unit/gapic/transcoder_v1/__init__.py b/tests/unit/gapic/transcoder_v1/__init__.py index 4de6597..e8e1c38 100644 --- a/tests/unit/gapic/transcoder_v1/__init__.py +++ b/tests/unit/gapic/transcoder_v1/__init__.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright 2020 Google LLC +# Copyright 2022 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/unit/gapic/transcoder_v1/test_transcoder_service.py b/tests/unit/gapic/transcoder_v1/test_transcoder_service.py index 8248f64..522a05e 100644 --- a/tests/unit/gapic/transcoder_v1/test_transcoder_service.py +++ b/tests/unit/gapic/transcoder_v1/test_transcoder_service.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright 2020 Google LLC +# Copyright 2022 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License.