Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

DO NOT MERGE: scrambles exceptions #251

Closed
wants to merge 1 commit into from
Closed

DO NOT MERGE: scrambles exceptions #251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 5 additions & 5 deletions google/cloud/firestore_admin_v1/services/firestore_admin/async_client.py
View file
Open in desktop
Expand Up @@ -273,9 +273,9 @@ async def list_indexes(
maximum=60.0,
multiplier=1.3,
predicate=retries.if_exception_type(
exceptions.DeadlineExceeded,
exceptions.InternalServerError,
exceptions.ServiceUnavailable,
exceptions.DeadlineExceeded,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@crwilcox How is this still happening, given that the googleapis WORKSPACE now uses `gapic-generator-0.35.9.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Interestingly, PR #252 does not generate this mess.

),
),
default_timeout=60.0,
Expand Down Expand Up @@ -361,9 +361,9 @@ async def get_index(
maximum=60.0,
multiplier=1.3,
predicate=retries.if_exception_type(
exceptions.DeadlineExceeded,
exceptions.InternalServerError,
exceptions.ServiceUnavailable,
exceptions.DeadlineExceeded,
),
),
default_timeout=60.0,
Expand Down Expand Up @@ -436,9 +436,9 @@ async def delete_index(
maximum=60.0,
multiplier=1.3,
predicate=retries.if_exception_type(
exceptions.DeadlineExceeded,
exceptions.InternalServerError,
exceptions.ServiceUnavailable,
exceptions.DeadlineExceeded,
),
),
default_timeout=60.0,
Expand Down Expand Up @@ -519,9 +519,9 @@ async def get_field(
maximum=60.0,
multiplier=1.3,
predicate=retries.if_exception_type(
exceptions.DeadlineExceeded,
exceptions.InternalServerError,
exceptions.ServiceUnavailable,
exceptions.DeadlineExceeded,
),
),
default_timeout=60.0,
Expand Down Expand Up @@ -712,9 +712,9 @@ async def list_fields(
maximum=60.0,
multiplier=1.3,
predicate=retries.if_exception_type(
exceptions.DeadlineExceeded,
exceptions.InternalServerError,
exceptions.ServiceUnavailable,
exceptions.DeadlineExceeded,
),
),
default_timeout=60.0,
Expand Down
10 changes: 5 additions & 5 deletions google/cloud/firestore_admin_v1/services/firestore_admin/transports/base.py
View file
Open in desktop
Expand Up @@ -124,9 +124,9 @@ def _prep_wrapped_messages(self, client_info):
maximum=60.0,
multiplier=1.3,
predicate=retries.if_exception_type(
exceptions.DeadlineExceeded,
exceptions.InternalServerError,
exceptions.ServiceUnavailable,
exceptions.DeadlineExceeded,
),
),
default_timeout=60.0,
Expand All @@ -139,9 +139,9 @@ def _prep_wrapped_messages(self, client_info):
maximum=60.0,
multiplier=1.3,
predicate=retries.if_exception_type(
exceptions.DeadlineExceeded,
exceptions.InternalServerError,
exceptions.ServiceUnavailable,
exceptions.DeadlineExceeded,
),
),
default_timeout=60.0,
Expand All @@ -154,9 +154,9 @@ def _prep_wrapped_messages(self, client_info):
maximum=60.0,
multiplier=1.3,
predicate=retries.if_exception_type(
exceptions.DeadlineExceeded,
exceptions.InternalServerError,
exceptions.ServiceUnavailable,
exceptions.DeadlineExceeded,
),
),
default_timeout=60.0,
Expand All @@ -169,9 +169,9 @@ def _prep_wrapped_messages(self, client_info):
maximum=60.0,
multiplier=1.3,
predicate=retries.if_exception_type(
exceptions.DeadlineExceeded,
exceptions.InternalServerError,
exceptions.ServiceUnavailable,
exceptions.DeadlineExceeded,
),
),
default_timeout=60.0,
Expand All @@ -187,9 +187,9 @@ def _prep_wrapped_messages(self, client_info):
maximum=60.0,
multiplier=1.3,
predicate=retries.if_exception_type(
exceptions.DeadlineExceeded,
exceptions.InternalServerError,
exceptions.ServiceUnavailable,
exceptions.DeadlineExceeded,
),
),
default_timeout=60.0,
Expand Down
20 changes: 10 additions & 10 deletions google/cloud/firestore_v1/services/firestore/async_client.py
View file
Open in desktop
Expand Up @@ -154,9 +154,9 @@ async def get_document(
maximum=60.0,
multiplier=1.3,
predicate=retries.if_exception_type(
exceptions.DeadlineExceeded,
exceptions.InternalServerError,
exceptions.ServiceUnavailable,
exceptions.DeadlineExceeded,
),
),
default_timeout=60.0,
Expand Down Expand Up @@ -218,9 +218,9 @@ async def list_documents(
maximum=60.0,
multiplier=1.3,
predicate=retries.if_exception_type(
exceptions.DeadlineExceeded,
exceptions.InternalServerError,
exceptions.ServiceUnavailable,
exceptions.DeadlineExceeded,
),
),
default_timeout=60.0,
Expand Down Expand Up @@ -396,9 +396,9 @@ async def delete_document(
maximum=60.0,
multiplier=1.3,
predicate=retries.if_exception_type(
exceptions.DeadlineExceeded,
exceptions.InternalServerError,
exceptions.ServiceUnavailable,
exceptions.DeadlineExceeded,
),
),
default_timeout=60.0,
Expand Down Expand Up @@ -458,9 +458,9 @@ def batch_get_documents(
maximum=60.0,
multiplier=1.3,
predicate=retries.if_exception_type(
exceptions.DeadlineExceeded,
exceptions.InternalServerError,
exceptions.ServiceUnavailable,
exceptions.DeadlineExceeded,
),
),
default_timeout=300.0,
Expand Down Expand Up @@ -539,9 +539,9 @@ async def begin_transaction(
maximum=60.0,
multiplier=1.3,
predicate=retries.if_exception_type(
exceptions.DeadlineExceeded,
exceptions.InternalServerError,
exceptions.ServiceUnavailable,
exceptions.DeadlineExceeded,
),
),
default_timeout=60.0,
Expand Down Expand Up @@ -710,9 +710,9 @@ async def rollback(
maximum=60.0,
multiplier=1.3,
predicate=retries.if_exception_type(
exceptions.DeadlineExceeded,
exceptions.InternalServerError,
exceptions.ServiceUnavailable,
exceptions.DeadlineExceeded,
),
),
default_timeout=60.0,
Expand Down Expand Up @@ -770,9 +770,9 @@ def run_query(
maximum=60.0,
multiplier=1.3,
predicate=retries.if_exception_type(
exceptions.DeadlineExceeded,
exceptions.InternalServerError,
exceptions.ServiceUnavailable,
exceptions.DeadlineExceeded,
),
),
default_timeout=300.0,
Expand Down Expand Up @@ -838,9 +838,9 @@ async def partition_query(
maximum=60.0,
multiplier=1.3,
predicate=retries.if_exception_type(
exceptions.DeadlineExceeded,
exceptions.InternalServerError,
exceptions.ServiceUnavailable,
exceptions.DeadlineExceeded,
),
),
default_timeout=300.0,
Expand Down Expand Up @@ -957,9 +957,9 @@ def listen(
maximum=60.0,
multiplier=1.3,
predicate=retries.if_exception_type(
exceptions.DeadlineExceeded,
exceptions.InternalServerError,
exceptions.ServiceUnavailable,
exceptions.DeadlineExceeded,
),
),
default_timeout=86400.0,
Expand Down Expand Up @@ -1041,9 +1041,9 @@ async def list_collection_ids(
maximum=60.0,
multiplier=1.3,
predicate=retries.if_exception_type(
exceptions.DeadlineExceeded,
exceptions.InternalServerError,
exceptions.ServiceUnavailable,
exceptions.DeadlineExceeded,
),
),
default_timeout=60.0,
Expand Down
20 changes: 10 additions & 10 deletions google/cloud/firestore_v1/services/firestore/transports/base.py
View file
Open in desktop
Expand Up @@ -117,9 +117,9 @@ def _prep_wrapped_messages(self, client_info):
maximum=60.0,
multiplier=1.3,
predicate=retries.if_exception_type(
exceptions.DeadlineExceeded,
exceptions.InternalServerError,
exceptions.ServiceUnavailable,
exceptions.DeadlineExceeded,
),
),
default_timeout=60.0,
Expand All @@ -132,9 +132,9 @@ def _prep_wrapped_messages(self, client_info):
maximum=60.0,
multiplier=1.3,
predicate=retries.if_exception_type(
exceptions.DeadlineExceeded,
exceptions.InternalServerError,
exceptions.ServiceUnavailable,
exceptions.DeadlineExceeded,
),
),
default_timeout=60.0,
Expand All @@ -158,9 +158,9 @@ def _prep_wrapped_messages(self, client_info):
maximum=60.0,
multiplier=1.3,
predicate=retries.if_exception_type(
exceptions.DeadlineExceeded,
exceptions.InternalServerError,
exceptions.ServiceUnavailable,
exceptions.DeadlineExceeded,
),
),
default_timeout=60.0,
Expand All @@ -173,9 +173,9 @@ def _prep_wrapped_messages(self, client_info):
maximum=60.0,
multiplier=1.3,
predicate=retries.if_exception_type(
exceptions.DeadlineExceeded,
exceptions.InternalServerError,
exceptions.ServiceUnavailable,
exceptions.DeadlineExceeded,
),
),
default_timeout=300.0,
Expand All @@ -188,9 +188,9 @@ def _prep_wrapped_messages(self, client_info):
maximum=60.0,
multiplier=1.3,
predicate=retries.if_exception_type(
exceptions.DeadlineExceeded,
exceptions.InternalServerError,
exceptions.ServiceUnavailable,
exceptions.DeadlineExceeded,
),
),
default_timeout=60.0,
Expand All @@ -214,9 +214,9 @@ def _prep_wrapped_messages(self, client_info):
maximum=60.0,
multiplier=1.3,
predicate=retries.if_exception_type(
exceptions.DeadlineExceeded,
exceptions.InternalServerError,
exceptions.ServiceUnavailable,
exceptions.DeadlineExceeded,
),
),
default_timeout=60.0,
Expand All @@ -229,9 +229,9 @@ def _prep_wrapped_messages(self, client_info):
maximum=60.0,
multiplier=1.3,
predicate=retries.if_exception_type(
exceptions.DeadlineExceeded,
exceptions.InternalServerError,
exceptions.ServiceUnavailable,
exceptions.DeadlineExceeded,
),
),
default_timeout=300.0,
Expand All @@ -244,9 +244,9 @@ def _prep_wrapped_messages(self, client_info):
maximum=60.0,
multiplier=1.3,
predicate=retries.if_exception_type(
exceptions.DeadlineExceeded,
exceptions.InternalServerError,
exceptions.ServiceUnavailable,
exceptions.DeadlineExceeded,
),
),
default_timeout=300.0,
Expand All @@ -262,9 +262,9 @@ def _prep_wrapped_messages(self, client_info):
maximum=60.0,
multiplier=1.3,
predicate=retries.if_exception_type(
exceptions.DeadlineExceeded,
exceptions.InternalServerError,
exceptions.ServiceUnavailable,
exceptions.DeadlineExceeded,
),
),
default_timeout=86400.0,
Expand All @@ -277,9 +277,9 @@ def _prep_wrapped_messages(self, client_info):
maximum=60.0,
multiplier=1.3,
predicate=retries.if_exception_type(
exceptions.DeadlineExceeded,
exceptions.InternalServerError,
exceptions.ServiceUnavailable,
exceptions.DeadlineExceeded,
),
),
default_timeout=60.0,
Expand Down
8 changes: 5 additions & 3 deletions noxfile.py
View file
Open in desktop
Expand Up @@ -27,9 +27,10 @@
BLACK_VERSION = "black==19.10b0"
BLACK_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"]

DEFAULT_PYTHON_VERSION = "3.9"
SYSTEM_TEST_PYTHON_VERSIONS = ["3.9"]
UNIT_TEST_PYTHON_VERSIONS = ["3.6", "3.7", "3.8", "3.9"]
DEFAULT_PYTHON_VERSION = "3.8"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Look into updating noxfile template.

SYSTEM_TEST_PYTHON_VERSIONS = ["3.7"]
UNIT_TEST_PYTHON_VERSIONS = ["3.6", "3.7", "3.8"]


@nox.session(python=DEFAULT_PYTHON_VERSION)
def lint(session):
Expand Down Expand Up @@ -98,6 +99,7 @@ def default(session):
*session.posargs,
)


@nox.session(python=UNIT_TEST_PYTHON_VERSIONS)
def unit(session):
"""Run the unit test suite."""
Expand Down