googleapis · parthea · Nov 8, 2022 · Oct 29, 2022 · Oct 29, 2022 · Nov 5, 2022
diff --git a/.github/release-please.yml b/.github/release-please.yml
@@ -1,2 +1,3 @@
 releaseType: python
 handleGHRelease: true
+manifest: true
diff --git a/.github/workflows/unittest.yml b/.github/workflows/unittest.yml
@@ -54,4 +54,4 @@ jobs:
     - name: Report coverage results
       run: |
         coverage combine .coverage-results/.coverage*
-        coverage report --show-missing --fail-under=99
+        coverage report --show-missing --fail-under=100
diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -0,0 +1,3 @@
+{
+  ".": "0.14.2"
+}
diff --git a/docs/conf.py b/docs/conf.py
@@ -24,9 +24,9 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-import sys
 import os
 import shlex
+import sys
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the

diff --git a/docs/index.rst b/docs/index.rst
@@ -2,22 +2,33 @@
 
 .. include:: multiprocessing.rst
 
+This package includes clients for multiple versions of Analytics Data.
+By default, you will get version ``data_v1beta``.
+
+
 API Reference
 -------------
 .. toctree::
     :maxdepth: 2
 
     data_v1beta/services
     data_v1beta/types
+
+API Reference
+-------------
+.. toctree::
+    :maxdepth: 2
+
     data_v1alpha/services
     data_v1alpha/types
 
+
 Changelog
 ---------
 
 For a list of all ``google-analytics-data`` releases:
 
 .. toctree::
-   :maxdepth: 2
+    :maxdepth: 2
 
-   changelog
+    changelog
diff --git a/google/analytics/data/__init__.py b/google/analytics/data/__init__.py
@@ -13,75 +13,68 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+from google.analytics.data import gapic_version as package_version
+
+__version__ = package_version.__version__
+
 
-from google.analytics.data_v1beta.services.beta_analytics_data.client import (
-    BetaAnalyticsDataClient,
-)
 from google.analytics.data_v1beta.services.beta_analytics_data.async_client import (
     BetaAnalyticsDataAsyncClient,
 )
-
-from google.analytics.data_v1beta.types.analytics_data_api import (
-    BatchRunPivotReportsRequest,
+from google.analytics.data_v1beta.services.beta_analytics_data.client import (
+    BetaAnalyticsDataClient,
 )
 from google.analytics.data_v1beta.types.analytics_data_api import (
+    BatchRunPivotReportsRequest,
     BatchRunPivotReportsResponse,
-)
-from google.analytics.data_v1beta.types.analytics_data_api import BatchRunReportsRequest
-from google.analytics.data_v1beta.types.analytics_data_api import (
+    BatchRunReportsRequest,
     BatchRunReportsResponse,
-)
-from google.analytics.data_v1beta.types.analytics_data_api import (
     CheckCompatibilityRequest,
-)
-from google.analytics.data_v1beta.types.analytics_data_api import (
     CheckCompatibilityResponse,
-)
-from google.analytics.data_v1beta.types.analytics_data_api import GetMetadataRequest
-from google.analytics.data_v1beta.types.analytics_data_api import Metadata
-from google.analytics.data_v1beta.types.analytics_data_api import RunPivotReportRequest
-from google.analytics.data_v1beta.types.analytics_data_api import RunPivotReportResponse
-from google.analytics.data_v1beta.types.analytics_data_api import (
+    GetMetadataRequest,
+    Metadata,
+    RunPivotReportRequest,
+    RunPivotReportResponse,
     RunRealtimeReportRequest,
-)
-from google.analytics.data_v1beta.types.analytics_data_api import (
     RunRealtimeReportResponse,
+    RunReportRequest,
+    RunReportResponse,
+)
+from google.analytics.data_v1beta.types.data import (
+    Cohort,
+    CohortReportSettings,
+    CohortSpec,
+    CohortsRange,
+    Compatibility,
+    DateRange,
+    Dimension,
+    DimensionCompatibility,
+    DimensionExpression,
+    DimensionHeader,
+    DimensionMetadata,
+    DimensionValue,
+    Filter,
+    FilterExpression,
+    FilterExpressionList,
+    Metric,
+    MetricAggregation,
+    MetricCompatibility,
+    MetricHeader,
+    MetricMetadata,
+    MetricType,
+    MetricValue,
+    MinuteRange,
+    NumericValue,
+    OrderBy,
+    Pivot,
+    PivotDimensionHeader,
+    PivotHeader,
+    PropertyQuota,
+    QuotaStatus,
+    ResponseMetaData,
+    RestrictedMetricType,
+    Row,
 )
-from google.analytics.data_v1beta.types.analytics_data_api import RunReportRequest
-from google.analytics.data_v1beta.types.analytics_data_api import RunReportResponse
-from google.analytics.data_v1beta.types.data import Cohort
-from google.analytics.data_v1beta.types.data import CohortReportSettings
-from google.analytics.data_v1beta.types.data import CohortSpec
-from google.analytics.data_v1beta.types.data import CohortsRange
-from google.analytics.data_v1beta.types.data import DateRange
-from google.analytics.data_v1beta.types.data import Dimension
-from google.analytics.data_v1beta.types.data import DimensionCompatibility
-from google.analytics.data_v1beta.types.data import DimensionExpression
-from google.analytics.data_v1beta.types.data import DimensionHeader
-from google.analytics.data_v1beta.types.data import DimensionMetadata
-from google.analytics.data_v1beta.types.data import DimensionValue
-from google.analytics.data_v1beta.types.data import Filter
-from google.analytics.data_v1beta.types.data import FilterExpression
-from google.analytics.data_v1beta.types.data import FilterExpressionList
-from google.analytics.data_v1beta.types.data import Metric
-from google.analytics.data_v1beta.types.data import MetricCompatibility
-from google.analytics.data_v1beta.types.data import MetricHeader
-from google.analytics.data_v1beta.types.data import MetricMetadata
-from google.analytics.data_v1beta.types.data import MetricValue
-from google.analytics.data_v1beta.types.data import MinuteRange
-from google.analytics.data_v1beta.types.data import NumericValue
-from google.analytics.data_v1beta.types.data import OrderBy
-from google.analytics.data_v1beta.types.data import Pivot
-from google.analytics.data_v1beta.types.data import PivotDimensionHeader
-from google.analytics.data_v1beta.types.data import PivotHeader
-from google.analytics.data_v1beta.types.data import PropertyQuota
-from google.analytics.data_v1beta.types.data import QuotaStatus
-from google.analytics.data_v1beta.types.data import ResponseMetaData
-from google.analytics.data_v1beta.types.data import Row
-from google.analytics.data_v1beta.types.data import Compatibility
-from google.analytics.data_v1beta.types.data import MetricAggregation
-from google.analytics.data_v1beta.types.data import MetricType
-from google.analytics.data_v1beta.types.data import RestrictedMetricType
 
 __all__ = (
     "BetaAnalyticsDataClient",

diff --git a/google/analytics/data/gapic_version.py b/google/analytics/data/gapic_version.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# 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.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+__version__ = "0.14.2"  # {x-release-please-version}
diff --git a/google/analytics/data_v1alpha/__init__.py b/google/analytics/data_v1alpha/__init__.py
@@ -13,75 +13,81 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+from google.analytics.data import gapic_version as package_version
 
-from .services.alpha_analytics_data import AlphaAnalyticsDataClient
-from .services.alpha_analytics_data import AlphaAnalyticsDataAsyncClient
+__version__ = package_version.__version__
 
-from .types.analytics_data_api import RunFunnelReportRequest
-from .types.analytics_data_api import RunFunnelReportResponse
-from .types.data import BetweenFilter
-from .types.data import DateRange
-from .types.data import Dimension
-from .types.data import DimensionExpression
-from .types.data import DimensionHeader
-from .types.data import DimensionValue
-from .types.data import EventSegment
-from .types.data import EventSegmentConditionGroup
-from .types.data import EventSegmentCriteria
-from .types.data import EventSegmentExclusion
-from .types.data import Filter
-from .types.data import FilterExpression
-from .types.data import FilterExpressionList
-from .types.data import Funnel
-from .types.data import FunnelBreakdown
-from .types.data import FunnelEventFilter
-from .types.data import FunnelFieldFilter
-from .types.data import FunnelFilterExpression
-from .types.data import FunnelFilterExpressionList
-from .types.data import FunnelNextAction
-from .types.data import FunnelParameterFilter
-from .types.data import FunnelParameterFilterExpression
-from .types.data import FunnelParameterFilterExpressionList
-from .types.data import FunnelResponseMetadata
-from .types.data import FunnelStep
-from .types.data import FunnelSubReport
-from .types.data import InListFilter
-from .types.data import MetricHeader
-from .types.data import MetricValue
-from .types.data import NumericFilter
-from .types.data import NumericValue
-from .types.data import PropertyQuota
-from .types.data import QuotaStatus
-from .types.data import Row
-from .types.data import SamplingMetadata
-from .types.data import Segment
-from .types.data import SegmentEventFilter
-from .types.data import SegmentFilter
-from .types.data import SegmentFilterExpression
-from .types.data import SegmentFilterExpressionList
-from .types.data import SegmentFilterScoping
-from .types.data import SegmentParameterFilter
-from .types.data import SegmentParameterFilterExpression
-from .types.data import SegmentParameterFilterExpressionList
-from .types.data import SegmentParameterFilterScoping
-from .types.data import SessionSegment
-from .types.data import SessionSegmentConditionGroup
-from .types.data import SessionSegmentCriteria
-from .types.data import SessionSegmentExclusion
-from .types.data import StringFilter
-from .types.data import UserSegment
-from .types.data import UserSegmentConditionGroup
-from .types.data import UserSegmentCriteria
-from .types.data import UserSegmentExclusion
-from .types.data import UserSegmentSequenceGroup
-from .types.data import UserSequenceStep
-from .types.data import EventCriteriaScoping
-from .types.data import EventExclusionDuration
-from .types.data import MetricType
-from .types.data import SessionCriteriaScoping
-from .types.data import SessionExclusionDuration
-from .types.data import UserCriteriaScoping
-from .types.data import UserExclusionDuration
+
+from .services.alpha_analytics_data import (
+    AlphaAnalyticsDataAsyncClient,
+    AlphaAnalyticsDataClient,
+)
+from .types.analytics_data_api import RunFunnelReportRequest, RunFunnelReportResponse
+from .types.data import (
+    BetweenFilter,
+    DateRange,
+    Dimension,
+    DimensionExpression,
+    DimensionHeader,
+    DimensionValue,
+    EventCriteriaScoping,
+    EventExclusionDuration,
+    EventSegment,
+    EventSegmentConditionGroup,
+    EventSegmentCriteria,
+    EventSegmentExclusion,
+    Filter,
+    FilterExpression,
+    FilterExpressionList,
+    Funnel,
+    FunnelBreakdown,
+    FunnelEventFilter,
+    FunnelFieldFilter,
+    FunnelFilterExpression,
+    FunnelFilterExpressionList,
+    FunnelNextAction,
+    FunnelParameterFilter,
+    FunnelParameterFilterExpression,
+    FunnelParameterFilterExpressionList,
+    FunnelResponseMetadata,
+    FunnelStep,
+    FunnelSubReport,
+    InListFilter,
+    MetricHeader,
+    MetricType,
+    MetricValue,
+    NumericFilter,
+    NumericValue,
+    PropertyQuota,
+    QuotaStatus,
+    Row,
+    SamplingMetadata,
+    Segment,
+    SegmentEventFilter,
+    SegmentFilter,
+    SegmentFilterExpression,
+    SegmentFilterExpressionList,
+    SegmentFilterScoping,
+    SegmentParameterFilter,
+    SegmentParameterFilterExpression,
+    SegmentParameterFilterExpressionList,
+    SegmentParameterFilterScoping,
+    SessionCriteriaScoping,
+    SessionExclusionDuration,
+    SessionSegment,
+    SessionSegmentConditionGroup,
+    SessionSegmentCriteria,
+    SessionSegmentExclusion,
+    StringFilter,
+    UserCriteriaScoping,
+    UserExclusionDuration,
+    UserSegment,
+    UserSegmentConditionGroup,
+    UserSegmentCriteria,
+    UserSegmentExclusion,
+    UserSegmentSequenceGroup,
+    UserSequenceStep,
+)
 
 __all__ = (
     "AlphaAnalyticsDataAsyncClient",

diff --git a/google/analytics/data_v1alpha/services/alpha_analytics_data/__init__.py b/google/analytics/data_v1alpha/services/alpha_analytics_data/__init__.py
@@ -13,8 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-from .client import AlphaAnalyticsDataClient
 from .async_client import AlphaAnalyticsDataAsyncClient
+from .client import AlphaAnalyticsDataClient
 
 __all__ = (
     "AlphaAnalyticsDataClient",

diff --git a/google/analytics/data_v1alpha/services/alpha_analytics_data/async_client.py b/google/analytics/data_v1alpha/services/alpha_analytics_data/async_client.py
@@ -17,25 +17,25 @@
 import functools
 import re
 from typing import Dict, Mapping, Optional, Sequence, Tuple, Type, Union
-import pkg_resources
 
-from google.api_core.client_options import ClientOptions
 from google.api_core import exceptions as core_exceptions
 from google.api_core import gapic_v1
 from google.api_core import retry as retries
+from google.api_core.client_options import ClientOptions
 from google.auth import credentials as ga_credentials  # type: ignore
 from google.oauth2 import service_account  # type: ignore
+import pkg_resources
 
 try:
     OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault]
 except AttributeError:  # pragma: NO COVER
     OptionalRetry = Union[retries.Retry, object]  # type: ignore
 
-from google.analytics.data_v1alpha.types import analytics_data_api
-from google.analytics.data_v1alpha.types import data
-from .transports.base import AlphaAnalyticsDataTransport, DEFAULT_CLIENT_INFO
-from .transports.grpc_asyncio import AlphaAnalyticsDataGrpcAsyncIOTransport
+from google.analytics.data_v1alpha.types import analytics_data_api, data
+
 from .client import AlphaAnalyticsDataClient
+from .transports.base import DEFAULT_CLIENT_INFO, AlphaAnalyticsDataTransport
+from .transports.grpc_asyncio import AlphaAnalyticsDataGrpcAsyncIOTransport
 
 
 class AlphaAnalyticsDataAsyncClient: