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 e84424b..ae99497 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 2983d0a..bcc26dc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +### [0.11.1](https://github.com/googleapis/python-analytics-data/compare/v0.11.0...v0.11.1) (2022-03-05) + + +### Bug Fixes + +* **deps:** require google-api-core>=1.31.5, >=2.3.2 ([#202](https://github.com/googleapis/python-analytics-data/issues/202)) ([cc351cd](https://github.com/googleapis/python-analytics-data/commit/cc351cd9d65daf9d6546717cebf212bcb2ddf16e)) +* **deps:** require proto-plus>=1.15.0 ([cc351cd](https://github.com/googleapis/python-analytics-data/commit/cc351cd9d65daf9d6546717cebf212bcb2ddf16e)) + ## [0.11.0](https://github.com/googleapis/python-analytics-data/compare/v0.10.0...v0.11.0) (2022-02-24) diff --git a/google/analytics/data/__init__.py b/google/analytics/data/__init__.py index 4dd9061..682c3f0 100644 --- a/google/analytics/data/__init__.py +++ b/google/analytics/data/__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/analytics/data_v1beta/__init__.py b/google/analytics/data_v1beta/__init__.py index ca076de..a9e8c4b 100644 --- a/google/analytics/data_v1beta/__init__.py +++ b/google/analytics/data_v1beta/__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/analytics/data_v1beta/services/__init__.py b/google/analytics/data_v1beta/services/__init__.py index 4de6597..e8e1c38 100644 --- a/google/analytics/data_v1beta/services/__init__.py +++ b/google/analytics/data_v1beta/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/analytics/data_v1beta/services/beta_analytics_data/__init__.py b/google/analytics/data_v1beta/services/beta_analytics_data/__init__.py index 526cdcd..1064618 100644 --- a/google/analytics/data_v1beta/services/beta_analytics_data/__init__.py +++ b/google/analytics/data_v1beta/services/beta_analytics_data/__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/analytics/data_v1beta/services/beta_analytics_data/async_client.py b/google/analytics/data_v1beta/services/beta_analytics_data/async_client.py index 55b5855..851c455 100644 --- a/google/analytics/data_v1beta/services/beta_analytics_data/async_client.py +++ b/google/analytics/data_v1beta/services/beta_analytics_data/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. @@ -221,7 +221,7 @@ async def run_report( criteria, such as country or event name. - .. code-block:: + .. code-block:: python from google.analytics import data_v1beta @@ -293,7 +293,7 @@ async def run_pivot_report( dissect your data. - .. code-block:: + .. code-block:: python from google.analytics import data_v1beta @@ -362,7 +362,7 @@ async def batch_run_reports( be for the same GA4 Property. - .. code-block:: + .. code-block:: python from google.analytics import data_v1beta @@ -431,7 +431,7 @@ async def batch_run_pivot_reports( reports must be for the same GA4 Property. - .. code-block:: + .. code-block:: python from google.analytics import data_v1beta @@ -510,7 +510,7 @@ async def get_metadata( such as ``country`` and ``totalUsers``. - .. code-block:: + .. code-block:: python from google.analytics import data_v1beta @@ -613,7 +613,7 @@ async def run_realtime_report( last 30 minutes. - .. code-block:: + .. code-block:: python from google.analytics import data_v1beta @@ -691,7 +691,7 @@ async def check_compatibility( for Core reports. - .. code-block:: + .. code-block:: python from google.analytics import data_v1beta diff --git a/google/analytics/data_v1beta/services/beta_analytics_data/client.py b/google/analytics/data_v1beta/services/beta_analytics_data/client.py index 45216d4..9c28c87 100644 --- a/google/analytics/data_v1beta/services/beta_analytics_data/client.py +++ b/google/analytics/data_v1beta/services/beta_analytics_data/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. @@ -415,8 +415,7 @@ def run_report( criteria, such as country or event name. - - .. code-block:: + .. code-block:: python from google.analytics import data_v1beta @@ -489,8 +488,7 @@ def run_pivot_report( dissect your data. - - .. code-block:: + .. code-block:: python from google.analytics import data_v1beta @@ -560,8 +558,7 @@ def batch_run_reports( be for the same GA4 Property. - - .. code-block:: + .. code-block:: python from google.analytics import data_v1beta @@ -631,8 +628,7 @@ def batch_run_pivot_reports( reports must be for the same GA4 Property. - - .. code-block:: + .. code-block:: python from google.analytics import data_v1beta @@ -712,8 +708,7 @@ def get_metadata( such as ``country`` and ``totalUsers``. - - .. code-block:: + .. code-block:: python from google.analytics import data_v1beta @@ -816,8 +811,7 @@ def run_realtime_report( last 30 minutes. - - .. code-block:: + .. code-block:: python from google.analytics import data_v1beta @@ -896,8 +890,7 @@ def check_compatibility( for Core reports. - - .. code-block:: + .. code-block:: python from google.analytics import data_v1beta diff --git a/google/analytics/data_v1beta/services/beta_analytics_data/transports/__init__.py b/google/analytics/data_v1beta/services/beta_analytics_data/transports/__init__.py index c921785..f3bb656 100644 --- a/google/analytics/data_v1beta/services/beta_analytics_data/transports/__init__.py +++ b/google/analytics/data_v1beta/services/beta_analytics_data/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/analytics/data_v1beta/services/beta_analytics_data/transports/base.py b/google/analytics/data_v1beta/services/beta_analytics_data/transports/base.py index 63f81ed..88fc7d8 100644 --- a/google/analytics/data_v1beta/services/beta_analytics_data/transports/base.py +++ b/google/analytics/data_v1beta/services/beta_analytics_data/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/analytics/data_v1beta/services/beta_analytics_data/transports/grpc.py b/google/analytics/data_v1beta/services/beta_analytics_data/transports/grpc.py index b1f1b6e..d2d4298 100644 --- a/google/analytics/data_v1beta/services/beta_analytics_data/transports/grpc.py +++ b/google/analytics/data_v1beta/services/beta_analytics_data/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/analytics/data_v1beta/services/beta_analytics_data/transports/grpc_asyncio.py b/google/analytics/data_v1beta/services/beta_analytics_data/transports/grpc_asyncio.py index 4163d3b..926a22a 100644 --- a/google/analytics/data_v1beta/services/beta_analytics_data/transports/grpc_asyncio.py +++ b/google/analytics/data_v1beta/services/beta_analytics_data/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/analytics/data_v1beta/types/__init__.py b/google/analytics/data_v1beta/types/__init__.py index 61c607e..70424cc 100644 --- a/google/analytics/data_v1beta/types/__init__.py +++ b/google/analytics/data_v1beta/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/analytics/data_v1beta/types/analytics_data_api.py b/google/analytics/data_v1beta/types/analytics_data_api.py index ee3837a..80dfa30 100644 --- a/google/analytics/data_v1beta/types/analytics_data_api.py +++ b/google/analytics/data_v1beta/types/analytics_data_api.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/analytics/data_v1beta/types/data.py b/google/analytics/data_v1beta/types/data.py index 19e8ddd..9afb17b 100644 --- a/google/analytics/data_v1beta/types/data.py +++ b/google/analytics/data_v1beta/types/data.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/analyticsdata_generated_data_v1beta_beta_analytics_data_batch_run_pivot_reports_async.py b/samples/generated_samples/analyticsdata_v1beta_generated_beta_analytics_data_batch_run_pivot_reports_async.py similarity index 86% rename from samples/generated_samples/analyticsdata_generated_data_v1beta_beta_analytics_data_batch_run_pivot_reports_async.py rename to samples/generated_samples/analyticsdata_v1beta_generated_beta_analytics_data_batch_run_pivot_reports_async.py index 364ec7f..2e46243 100644 --- a/samples/generated_samples/analyticsdata_generated_data_v1beta_beta_analytics_data_batch_run_pivot_reports_async.py +++ b/samples/generated_samples/analyticsdata_v1beta_generated_beta_analytics_data_batch_run_pivot_reports_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-analytics-data -# [START analyticsdata_generated_data_v1beta_BetaAnalyticsData_BatchRunPivotReports_async] +# [START analyticsdata_v1beta_generated_BetaAnalyticsData_BatchRunPivotReports_async] from google.analytics import data_v1beta @@ -41,4 +41,4 @@ async def sample_batch_run_pivot_reports(): # Handle the response print(response) -# [END analyticsdata_generated_data_v1beta_BetaAnalyticsData_BatchRunPivotReports_async] +# [END analyticsdata_v1beta_generated_BetaAnalyticsData_BatchRunPivotReports_async] diff --git a/samples/generated_samples/analyticsdata_generated_data_v1beta_beta_analytics_data_batch_run_pivot_reports_sync.py b/samples/generated_samples/analyticsdata_v1beta_generated_beta_analytics_data_batch_run_pivot_reports_sync.py similarity index 86% rename from samples/generated_samples/analyticsdata_generated_data_v1beta_beta_analytics_data_batch_run_pivot_reports_sync.py rename to samples/generated_samples/analyticsdata_v1beta_generated_beta_analytics_data_batch_run_pivot_reports_sync.py index 33ffcb3..618cf5d 100644 --- a/samples/generated_samples/analyticsdata_generated_data_v1beta_beta_analytics_data_batch_run_pivot_reports_sync.py +++ b/samples/generated_samples/analyticsdata_v1beta_generated_beta_analytics_data_batch_run_pivot_reports_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-analytics-data -# [START analyticsdata_generated_data_v1beta_BetaAnalyticsData_BatchRunPivotReports_sync] +# [START analyticsdata_v1beta_generated_BetaAnalyticsData_BatchRunPivotReports_sync] from google.analytics import data_v1beta @@ -41,4 +41,4 @@ def sample_batch_run_pivot_reports(): # Handle the response print(response) -# [END analyticsdata_generated_data_v1beta_BetaAnalyticsData_BatchRunPivotReports_sync] +# [END analyticsdata_v1beta_generated_BetaAnalyticsData_BatchRunPivotReports_sync] diff --git a/samples/generated_samples/analyticsdata_generated_data_v1beta_beta_analytics_data_batch_run_reports_async.py b/samples/generated_samples/analyticsdata_v1beta_generated_beta_analytics_data_batch_run_reports_async.py similarity index 86% rename from samples/generated_samples/analyticsdata_generated_data_v1beta_beta_analytics_data_batch_run_reports_async.py rename to samples/generated_samples/analyticsdata_v1beta_generated_beta_analytics_data_batch_run_reports_async.py index d7391ed..22050be 100644 --- a/samples/generated_samples/analyticsdata_generated_data_v1beta_beta_analytics_data_batch_run_reports_async.py +++ b/samples/generated_samples/analyticsdata_v1beta_generated_beta_analytics_data_batch_run_reports_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-analytics-data -# [START analyticsdata_generated_data_v1beta_BetaAnalyticsData_BatchRunReports_async] +# [START analyticsdata_v1beta_generated_BetaAnalyticsData_BatchRunReports_async] from google.analytics import data_v1beta @@ -41,4 +41,4 @@ async def sample_batch_run_reports(): # Handle the response print(response) -# [END analyticsdata_generated_data_v1beta_BetaAnalyticsData_BatchRunReports_async] +# [END analyticsdata_v1beta_generated_BetaAnalyticsData_BatchRunReports_async] diff --git a/samples/generated_samples/analyticsdata_generated_data_v1beta_beta_analytics_data_batch_run_reports_sync.py b/samples/generated_samples/analyticsdata_v1beta_generated_beta_analytics_data_batch_run_reports_sync.py similarity index 86% rename from samples/generated_samples/analyticsdata_generated_data_v1beta_beta_analytics_data_batch_run_reports_sync.py rename to samples/generated_samples/analyticsdata_v1beta_generated_beta_analytics_data_batch_run_reports_sync.py index 9f70791..cf6c88f 100644 --- a/samples/generated_samples/analyticsdata_generated_data_v1beta_beta_analytics_data_batch_run_reports_sync.py +++ b/samples/generated_samples/analyticsdata_v1beta_generated_beta_analytics_data_batch_run_reports_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-analytics-data -# [START analyticsdata_generated_data_v1beta_BetaAnalyticsData_BatchRunReports_sync] +# [START analyticsdata_v1beta_generated_BetaAnalyticsData_BatchRunReports_sync] from google.analytics import data_v1beta @@ -41,4 +41,4 @@ def sample_batch_run_reports(): # Handle the response print(response) -# [END analyticsdata_generated_data_v1beta_BetaAnalyticsData_BatchRunReports_sync] +# [END analyticsdata_v1beta_generated_BetaAnalyticsData_BatchRunReports_sync] diff --git a/samples/generated_samples/analyticsdata_generated_data_v1beta_beta_analytics_data_check_compatibility_async.py b/samples/generated_samples/analyticsdata_v1beta_generated_beta_analytics_data_check_compatibility_async.py similarity index 86% rename from samples/generated_samples/analyticsdata_generated_data_v1beta_beta_analytics_data_check_compatibility_async.py rename to samples/generated_samples/analyticsdata_v1beta_generated_beta_analytics_data_check_compatibility_async.py index c709d9d..2c73355 100644 --- a/samples/generated_samples/analyticsdata_generated_data_v1beta_beta_analytics_data_check_compatibility_async.py +++ b/samples/generated_samples/analyticsdata_v1beta_generated_beta_analytics_data_check_compatibility_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-analytics-data -# [START analyticsdata_generated_data_v1beta_BetaAnalyticsData_CheckCompatibility_async] +# [START analyticsdata_v1beta_generated_BetaAnalyticsData_CheckCompatibility_async] from google.analytics import data_v1beta @@ -41,4 +41,4 @@ async def sample_check_compatibility(): # Handle the response print(response) -# [END analyticsdata_generated_data_v1beta_BetaAnalyticsData_CheckCompatibility_async] +# [END analyticsdata_v1beta_generated_BetaAnalyticsData_CheckCompatibility_async] diff --git a/samples/generated_samples/analyticsdata_generated_data_v1beta_beta_analytics_data_check_compatibility_sync.py b/samples/generated_samples/analyticsdata_v1beta_generated_beta_analytics_data_check_compatibility_sync.py similarity index 86% rename from samples/generated_samples/analyticsdata_generated_data_v1beta_beta_analytics_data_check_compatibility_sync.py rename to samples/generated_samples/analyticsdata_v1beta_generated_beta_analytics_data_check_compatibility_sync.py index 6e07165..4f9a426 100644 --- a/samples/generated_samples/analyticsdata_generated_data_v1beta_beta_analytics_data_check_compatibility_sync.py +++ b/samples/generated_samples/analyticsdata_v1beta_generated_beta_analytics_data_check_compatibility_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-analytics-data -# [START analyticsdata_generated_data_v1beta_BetaAnalyticsData_CheckCompatibility_sync] +# [START analyticsdata_v1beta_generated_BetaAnalyticsData_CheckCompatibility_sync] from google.analytics import data_v1beta @@ -41,4 +41,4 @@ def sample_check_compatibility(): # Handle the response print(response) -# [END analyticsdata_generated_data_v1beta_BetaAnalyticsData_CheckCompatibility_sync] +# [END analyticsdata_v1beta_generated_BetaAnalyticsData_CheckCompatibility_sync] diff --git a/samples/generated_samples/analyticsdata_generated_data_v1beta_beta_analytics_data_get_metadata_async.py b/samples/generated_samples/analyticsdata_v1beta_generated_beta_analytics_data_get_metadata_async.py similarity index 87% rename from samples/generated_samples/analyticsdata_generated_data_v1beta_beta_analytics_data_get_metadata_async.py rename to samples/generated_samples/analyticsdata_v1beta_generated_beta_analytics_data_get_metadata_async.py index 061bf19..b218ba1 100644 --- a/samples/generated_samples/analyticsdata_generated_data_v1beta_beta_analytics_data_get_metadata_async.py +++ b/samples/generated_samples/analyticsdata_v1beta_generated_beta_analytics_data_get_metadata_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-analytics-data -# [START analyticsdata_generated_data_v1beta_BetaAnalyticsData_GetMetadata_async] +# [START analyticsdata_v1beta_generated_BetaAnalyticsData_GetMetadata_async] from google.analytics import data_v1beta @@ -42,4 +42,4 @@ async def sample_get_metadata(): # Handle the response print(response) -# [END analyticsdata_generated_data_v1beta_BetaAnalyticsData_GetMetadata_async] +# [END analyticsdata_v1beta_generated_BetaAnalyticsData_GetMetadata_async] diff --git a/samples/generated_samples/analyticsdata_generated_data_v1beta_beta_analytics_data_get_metadata_sync.py b/samples/generated_samples/analyticsdata_v1beta_generated_beta_analytics_data_get_metadata_sync.py similarity index 87% rename from samples/generated_samples/analyticsdata_generated_data_v1beta_beta_analytics_data_get_metadata_sync.py rename to samples/generated_samples/analyticsdata_v1beta_generated_beta_analytics_data_get_metadata_sync.py index 824990e..7a66485 100644 --- a/samples/generated_samples/analyticsdata_generated_data_v1beta_beta_analytics_data_get_metadata_sync.py +++ b/samples/generated_samples/analyticsdata_v1beta_generated_beta_analytics_data_get_metadata_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-analytics-data -# [START analyticsdata_generated_data_v1beta_BetaAnalyticsData_GetMetadata_sync] +# [START analyticsdata_v1beta_generated_BetaAnalyticsData_GetMetadata_sync] from google.analytics import data_v1beta @@ -42,4 +42,4 @@ def sample_get_metadata(): # Handle the response print(response) -# [END analyticsdata_generated_data_v1beta_BetaAnalyticsData_GetMetadata_sync] +# [END analyticsdata_v1beta_generated_BetaAnalyticsData_GetMetadata_sync] diff --git a/samples/generated_samples/analyticsdata_generated_data_v1beta_beta_analytics_data_run_pivot_report_async.py b/samples/generated_samples/analyticsdata_v1beta_generated_beta_analytics_data_run_pivot_report_async.py similarity index 86% rename from samples/generated_samples/analyticsdata_generated_data_v1beta_beta_analytics_data_run_pivot_report_async.py rename to samples/generated_samples/analyticsdata_v1beta_generated_beta_analytics_data_run_pivot_report_async.py index 3029d66..31de80d 100644 --- a/samples/generated_samples/analyticsdata_generated_data_v1beta_beta_analytics_data_run_pivot_report_async.py +++ b/samples/generated_samples/analyticsdata_v1beta_generated_beta_analytics_data_run_pivot_report_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-analytics-data -# [START analyticsdata_generated_data_v1beta_BetaAnalyticsData_RunPivotReport_async] +# [START analyticsdata_v1beta_generated_BetaAnalyticsData_RunPivotReport_async] from google.analytics import data_v1beta @@ -41,4 +41,4 @@ async def sample_run_pivot_report(): # Handle the response print(response) -# [END analyticsdata_generated_data_v1beta_BetaAnalyticsData_RunPivotReport_async] +# [END analyticsdata_v1beta_generated_BetaAnalyticsData_RunPivotReport_async] diff --git a/samples/generated_samples/analyticsdata_generated_data_v1beta_beta_analytics_data_run_pivot_report_sync.py b/samples/generated_samples/analyticsdata_v1beta_generated_beta_analytics_data_run_pivot_report_sync.py similarity index 86% rename from samples/generated_samples/analyticsdata_generated_data_v1beta_beta_analytics_data_run_pivot_report_sync.py rename to samples/generated_samples/analyticsdata_v1beta_generated_beta_analytics_data_run_pivot_report_sync.py index 697aedf..00c7149 100644 --- a/samples/generated_samples/analyticsdata_generated_data_v1beta_beta_analytics_data_run_pivot_report_sync.py +++ b/samples/generated_samples/analyticsdata_v1beta_generated_beta_analytics_data_run_pivot_report_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-analytics-data -# [START analyticsdata_generated_data_v1beta_BetaAnalyticsData_RunPivotReport_sync] +# [START analyticsdata_v1beta_generated_BetaAnalyticsData_RunPivotReport_sync] from google.analytics import data_v1beta @@ -41,4 +41,4 @@ def sample_run_pivot_report(): # Handle the response print(response) -# [END analyticsdata_generated_data_v1beta_BetaAnalyticsData_RunPivotReport_sync] +# [END analyticsdata_v1beta_generated_BetaAnalyticsData_RunPivotReport_sync] diff --git a/samples/generated_samples/analyticsdata_generated_data_v1beta_beta_analytics_data_run_realtime_report_async.py b/samples/generated_samples/analyticsdata_v1beta_generated_beta_analytics_data_run_realtime_report_async.py similarity index 86% rename from samples/generated_samples/analyticsdata_generated_data_v1beta_beta_analytics_data_run_realtime_report_async.py rename to samples/generated_samples/analyticsdata_v1beta_generated_beta_analytics_data_run_realtime_report_async.py index d55a368..ea8081f 100644 --- a/samples/generated_samples/analyticsdata_generated_data_v1beta_beta_analytics_data_run_realtime_report_async.py +++ b/samples/generated_samples/analyticsdata_v1beta_generated_beta_analytics_data_run_realtime_report_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-analytics-data -# [START analyticsdata_generated_data_v1beta_BetaAnalyticsData_RunRealtimeReport_async] +# [START analyticsdata_v1beta_generated_BetaAnalyticsData_RunRealtimeReport_async] from google.analytics import data_v1beta @@ -41,4 +41,4 @@ async def sample_run_realtime_report(): # Handle the response print(response) -# [END analyticsdata_generated_data_v1beta_BetaAnalyticsData_RunRealtimeReport_async] +# [END analyticsdata_v1beta_generated_BetaAnalyticsData_RunRealtimeReport_async] diff --git a/samples/generated_samples/analyticsdata_generated_data_v1beta_beta_analytics_data_run_realtime_report_sync.py b/samples/generated_samples/analyticsdata_v1beta_generated_beta_analytics_data_run_realtime_report_sync.py similarity index 86% rename from samples/generated_samples/analyticsdata_generated_data_v1beta_beta_analytics_data_run_realtime_report_sync.py rename to samples/generated_samples/analyticsdata_v1beta_generated_beta_analytics_data_run_realtime_report_sync.py index ac27be4..8cf7e35 100644 --- a/samples/generated_samples/analyticsdata_generated_data_v1beta_beta_analytics_data_run_realtime_report_sync.py +++ b/samples/generated_samples/analyticsdata_v1beta_generated_beta_analytics_data_run_realtime_report_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-analytics-data -# [START analyticsdata_generated_data_v1beta_BetaAnalyticsData_RunRealtimeReport_sync] +# [START analyticsdata_v1beta_generated_BetaAnalyticsData_RunRealtimeReport_sync] from google.analytics import data_v1beta @@ -41,4 +41,4 @@ def sample_run_realtime_report(): # Handle the response print(response) -# [END analyticsdata_generated_data_v1beta_BetaAnalyticsData_RunRealtimeReport_sync] +# [END analyticsdata_v1beta_generated_BetaAnalyticsData_RunRealtimeReport_sync] diff --git a/samples/generated_samples/analyticsdata_generated_data_v1beta_beta_analytics_data_run_report_async.py b/samples/generated_samples/analyticsdata_v1beta_generated_beta_analytics_data_run_report_async.py similarity index 87% rename from samples/generated_samples/analyticsdata_generated_data_v1beta_beta_analytics_data_run_report_async.py rename to samples/generated_samples/analyticsdata_v1beta_generated_beta_analytics_data_run_report_async.py index e15981c..bc1c46d 100644 --- a/samples/generated_samples/analyticsdata_generated_data_v1beta_beta_analytics_data_run_report_async.py +++ b/samples/generated_samples/analyticsdata_v1beta_generated_beta_analytics_data_run_report_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-analytics-data -# [START analyticsdata_generated_data_v1beta_BetaAnalyticsData_RunReport_async] +# [START analyticsdata_v1beta_generated_BetaAnalyticsData_RunReport_async] from google.analytics import data_v1beta @@ -41,4 +41,4 @@ async def sample_run_report(): # Handle the response print(response) -# [END analyticsdata_generated_data_v1beta_BetaAnalyticsData_RunReport_async] +# [END analyticsdata_v1beta_generated_BetaAnalyticsData_RunReport_async] diff --git a/samples/generated_samples/analyticsdata_generated_data_v1beta_beta_analytics_data_run_report_sync.py b/samples/generated_samples/analyticsdata_v1beta_generated_beta_analytics_data_run_report_sync.py similarity index 87% rename from samples/generated_samples/analyticsdata_generated_data_v1beta_beta_analytics_data_run_report_sync.py rename to samples/generated_samples/analyticsdata_v1beta_generated_beta_analytics_data_run_report_sync.py index d0b888a..bb79afe 100644 --- a/samples/generated_samples/analyticsdata_generated_data_v1beta_beta_analytics_data_run_report_sync.py +++ b/samples/generated_samples/analyticsdata_v1beta_generated_beta_analytics_data_run_report_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-analytics-data -# [START analyticsdata_generated_data_v1beta_BetaAnalyticsData_RunReport_sync] +# [START analyticsdata_v1beta_generated_BetaAnalyticsData_RunReport_sync] from google.analytics import data_v1beta @@ -41,4 +41,4 @@ def sample_run_report(): # Handle the response print(response) -# [END analyticsdata_generated_data_v1beta_BetaAnalyticsData_RunReport_sync] +# [END analyticsdata_v1beta_generated_BetaAnalyticsData_RunReport_sync] diff --git a/samples/generated_samples/snippet_metadata_data_v1beta.json b/samples/generated_samples/snippet_metadata_data_v1beta.json index da72466..1aff2ab 100644 --- a/samples/generated_samples/snippet_metadata_data_v1beta.json +++ b/samples/generated_samples/snippet_metadata_data_v1beta.json @@ -10,8 +10,8 @@ "shortName": "BatchRunPivotReports" } }, - "file": "analyticsdata_generated_data_v1beta_beta_analytics_data_batch_run_pivot_reports_async.py", - "regionTag": "analyticsdata_generated_data_v1beta_BetaAnalyticsData_BatchRunPivotReports_async", + "file": "analyticsdata_v1beta_generated_beta_analytics_data_batch_run_pivot_reports_async.py", + "regionTag": "analyticsdata_v1beta_generated_BetaAnalyticsData_BatchRunPivotReports_async", "segments": [ { "end": 43, @@ -54,8 +54,8 @@ "shortName": "BatchRunPivotReports" } }, - "file": "analyticsdata_generated_data_v1beta_beta_analytics_data_batch_run_pivot_reports_sync.py", - "regionTag": "analyticsdata_generated_data_v1beta_BetaAnalyticsData_BatchRunPivotReports_sync", + "file": "analyticsdata_v1beta_generated_beta_analytics_data_batch_run_pivot_reports_sync.py", + "regionTag": "analyticsdata_v1beta_generated_BetaAnalyticsData_BatchRunPivotReports_sync", "segments": [ { "end": 43, @@ -99,8 +99,8 @@ "shortName": "BatchRunReports" } }, - "file": "analyticsdata_generated_data_v1beta_beta_analytics_data_batch_run_reports_async.py", - "regionTag": "analyticsdata_generated_data_v1beta_BetaAnalyticsData_BatchRunReports_async", + "file": "analyticsdata_v1beta_generated_beta_analytics_data_batch_run_reports_async.py", + "regionTag": "analyticsdata_v1beta_generated_BetaAnalyticsData_BatchRunReports_async", "segments": [ { "end": 43, @@ -143,8 +143,8 @@ "shortName": "BatchRunReports" } }, - "file": "analyticsdata_generated_data_v1beta_beta_analytics_data_batch_run_reports_sync.py", - "regionTag": "analyticsdata_generated_data_v1beta_BetaAnalyticsData_BatchRunReports_sync", + "file": "analyticsdata_v1beta_generated_beta_analytics_data_batch_run_reports_sync.py", + "regionTag": "analyticsdata_v1beta_generated_BetaAnalyticsData_BatchRunReports_sync", "segments": [ { "end": 43, @@ -188,8 +188,8 @@ "shortName": "CheckCompatibility" } }, - "file": "analyticsdata_generated_data_v1beta_beta_analytics_data_check_compatibility_async.py", - "regionTag": "analyticsdata_generated_data_v1beta_BetaAnalyticsData_CheckCompatibility_async", + "file": "analyticsdata_v1beta_generated_beta_analytics_data_check_compatibility_async.py", + "regionTag": "analyticsdata_v1beta_generated_BetaAnalyticsData_CheckCompatibility_async", "segments": [ { "end": 43, @@ -232,8 +232,8 @@ "shortName": "CheckCompatibility" } }, - "file": "analyticsdata_generated_data_v1beta_beta_analytics_data_check_compatibility_sync.py", - "regionTag": "analyticsdata_generated_data_v1beta_BetaAnalyticsData_CheckCompatibility_sync", + "file": "analyticsdata_v1beta_generated_beta_analytics_data_check_compatibility_sync.py", + "regionTag": "analyticsdata_v1beta_generated_BetaAnalyticsData_CheckCompatibility_sync", "segments": [ { "end": 43, @@ -277,8 +277,8 @@ "shortName": "GetMetadata" } }, - "file": "analyticsdata_generated_data_v1beta_beta_analytics_data_get_metadata_async.py", - "regionTag": "analyticsdata_generated_data_v1beta_BetaAnalyticsData_GetMetadata_async", + "file": "analyticsdata_v1beta_generated_beta_analytics_data_get_metadata_async.py", + "regionTag": "analyticsdata_v1beta_generated_BetaAnalyticsData_GetMetadata_async", "segments": [ { "end": 44, @@ -321,8 +321,8 @@ "shortName": "GetMetadata" } }, - "file": "analyticsdata_generated_data_v1beta_beta_analytics_data_get_metadata_sync.py", - "regionTag": "analyticsdata_generated_data_v1beta_BetaAnalyticsData_GetMetadata_sync", + "file": "analyticsdata_v1beta_generated_beta_analytics_data_get_metadata_sync.py", + "regionTag": "analyticsdata_v1beta_generated_BetaAnalyticsData_GetMetadata_sync", "segments": [ { "end": 44, @@ -366,8 +366,8 @@ "shortName": "RunPivotReport" } }, - "file": "analyticsdata_generated_data_v1beta_beta_analytics_data_run_pivot_report_async.py", - "regionTag": "analyticsdata_generated_data_v1beta_BetaAnalyticsData_RunPivotReport_async", + "file": "analyticsdata_v1beta_generated_beta_analytics_data_run_pivot_report_async.py", + "regionTag": "analyticsdata_v1beta_generated_BetaAnalyticsData_RunPivotReport_async", "segments": [ { "end": 43, @@ -410,8 +410,8 @@ "shortName": "RunPivotReport" } }, - "file": "analyticsdata_generated_data_v1beta_beta_analytics_data_run_pivot_report_sync.py", - "regionTag": "analyticsdata_generated_data_v1beta_BetaAnalyticsData_RunPivotReport_sync", + "file": "analyticsdata_v1beta_generated_beta_analytics_data_run_pivot_report_sync.py", + "regionTag": "analyticsdata_v1beta_generated_BetaAnalyticsData_RunPivotReport_sync", "segments": [ { "end": 43, @@ -455,8 +455,8 @@ "shortName": "RunRealtimeReport" } }, - "file": "analyticsdata_generated_data_v1beta_beta_analytics_data_run_realtime_report_async.py", - "regionTag": "analyticsdata_generated_data_v1beta_BetaAnalyticsData_RunRealtimeReport_async", + "file": "analyticsdata_v1beta_generated_beta_analytics_data_run_realtime_report_async.py", + "regionTag": "analyticsdata_v1beta_generated_BetaAnalyticsData_RunRealtimeReport_async", "segments": [ { "end": 43, @@ -499,8 +499,8 @@ "shortName": "RunRealtimeReport" } }, - "file": "analyticsdata_generated_data_v1beta_beta_analytics_data_run_realtime_report_sync.py", - "regionTag": "analyticsdata_generated_data_v1beta_BetaAnalyticsData_RunRealtimeReport_sync", + "file": "analyticsdata_v1beta_generated_beta_analytics_data_run_realtime_report_sync.py", + "regionTag": "analyticsdata_v1beta_generated_BetaAnalyticsData_RunRealtimeReport_sync", "segments": [ { "end": 43, @@ -544,8 +544,8 @@ "shortName": "RunReport" } }, - "file": "analyticsdata_generated_data_v1beta_beta_analytics_data_run_report_async.py", - "regionTag": "analyticsdata_generated_data_v1beta_BetaAnalyticsData_RunReport_async", + "file": "analyticsdata_v1beta_generated_beta_analytics_data_run_report_async.py", + "regionTag": "analyticsdata_v1beta_generated_BetaAnalyticsData_RunReport_async", "segments": [ { "end": 43, @@ -588,8 +588,8 @@ "shortName": "RunReport" } }, - "file": "analyticsdata_generated_data_v1beta_beta_analytics_data_run_report_sync.py", - "regionTag": "analyticsdata_generated_data_v1beta_BetaAnalyticsData_RunReport_sync", + "file": "analyticsdata_v1beta_generated_beta_analytics_data_run_report_sync.py", + "regionTag": "analyticsdata_v1beta_generated_BetaAnalyticsData_RunReport_sync", "segments": [ { "end": 43, diff --git a/samples/snippets/noxfile.py b/samples/snippets/noxfile.py index 20cdfc6..4c808af 100644 --- a/samples/snippets/noxfile.py +++ b/samples/snippets/noxfile.py @@ -188,42 +188,54 @@ 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 91f58db..7399868 100644 --- a/samples/snippets/requirements.txt +++ b/samples/snippets/requirements.txt @@ -1,2 +1,2 @@ -google-analytics-data==0.10.0 +google-analytics-data==0.11.0 google-auth-oauthlib==0.5.0 \ No newline at end of file diff --git a/samples/snippets/run_batch_report.py b/samples/snippets/run_batch_report.py index dfd155e..1915dbc 100644 --- a/samples/snippets/run_batch_report.py +++ b/samples/snippets/run_batch_report.py @@ -56,9 +56,7 @@ def run_batch_report(property_id="YOUR-GA4-PROPERTY-ID"): date_ranges=[DateRange(start_date="2021-01-03", end_date="2021-01-09")], ), RunReportRequest( - dimensions=[ - Dimension(name="browser"), - ], + dimensions=[Dimension(name="browser")], metrics=[Metric(name="activeUsers")], date_ranges=[DateRange(start_date="2021-01-01", end_date="2021-01-31")], ), diff --git a/samples/snippets/run_pivot_report.py b/samples/snippets/run_pivot_report.py index dc3ce91..3400870 100644 --- a/samples/snippets/run_pivot_report.py +++ b/samples/snippets/run_pivot_report.py @@ -45,9 +45,7 @@ def run_pivot_report(property_id="YOUR-GA4-PROPERTY-ID"): request = RunPivotReportRequest( property=f"properties/{property_id}", - date_ranges=[ - DateRange(start_date="2021-01-01", end_date="2021-01-30"), - ], + date_ranges=[DateRange(start_date="2021-01-01", end_date="2021-01-30")], pivots=[ Pivot( field_names=["country"], @@ -70,10 +68,7 @@ def run_pivot_report(property_id="YOUR-GA4-PROPERTY-ID"): ), ], metrics=[Metric(name="sessions")], - dimensions=[ - Dimension(name="country"), - Dimension(name="browser"), - ], + dimensions=[Dimension(name="country"), Dimension(name="browser")], ) response = client.run_pivot_report(request) print_run_pivot_report_response(response) diff --git a/samples/snippets/run_report_with_property_quota.py b/samples/snippets/run_report_with_property_quota.py index f62414a..76bc3d3 100644 --- a/samples/snippets/run_report_with_property_quota.py +++ b/samples/snippets/run_report_with_property_quota.py @@ -44,9 +44,7 @@ def run_report_with_property_quota(property_id="YOUR-GA4-PROPERTY-ID"): property=f"properties/{property_id}", return_property_quota=True, dimensions=[Dimension(name="country")], - metrics=[ - Metric(name="activeUsers"), - ], + metrics=[Metric(name="activeUsers")], date_ranges=[DateRange(start_date="7daysAgo", end_date="today")], ) response = client.run_report(request) diff --git a/setup.py b/setup.py index 6dba6c2..5042d70 100644 --- a/setup.py +++ b/setup.py @@ -19,7 +19,7 @@ import os import setuptools # type: ignore -version = "0.11.0" +version = "0.11.1" package_root = os.path.abspath(os.path.dirname(__file__)) @@ -48,8 +48,8 @@ # 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", - "proto-plus >= 1.4.0", + "google-api-core[grpc] >= 1.31.5, <3.0.0dev,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.0", + "proto-plus >= 1.15.0", "packaging >= 14.3", ), python_requires=">=3.6", diff --git a/testing/constraints-3.6.txt b/testing/constraints-3.6.txt index 5c1659b..766f288 100644 --- a/testing/constraints-3.6.txt +++ b/testing/constraints-3.6.txt @@ -5,6 +5,6 @@ # # 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 -proto-plus==1.4.0 +google-api-core==1.31.5 +proto-plus==1.15.0 packaging==14.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/data_v1beta/__init__.py b/tests/unit/gapic/data_v1beta/__init__.py index 4de6597..e8e1c38 100644 --- a/tests/unit/gapic/data_v1beta/__init__.py +++ b/tests/unit/gapic/data_v1beta/__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/data_v1beta/test_beta_analytics_data.py b/tests/unit/gapic/data_v1beta/test_beta_analytics_data.py index 1ab02ae..0bfbb4a 100644 --- a/tests/unit/gapic/data_v1beta/test_beta_analytics_data.py +++ b/tests/unit/gapic/data_v1beta/test_beta_analytics_data.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.