Skip to content

Commit

Permalink
Remove unnecessary newlines around single arg in signature (#27525)
Browse files Browse the repository at this point in the history
  • Loading branch information
dstandish committed Nov 7, 2022
1 parent 1242057 commit 7297892
Show file tree
Hide file tree
Showing 14 changed files with 25 additions and 75 deletions.
4 changes: 1 addition & 3 deletions airflow/providers/google/cloud/hooks/cloud_composer.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,7 @@ def get_environment_client(self) -> EnvironmentsClient:
client_options=self.client_options,
)

def get_image_versions_client(
self,
) -> ImageVersionsClient:
def get_image_versions_client(self) -> ImageVersionsClient:
"""Retrieves client library object that allow access Image Versions service."""
return ImageVersionsClient(
credentials=self.get_credentials(),
Expand Down
4 changes: 1 addition & 3 deletions airflow/providers/google/cloud/hooks/cloud_memorystore.py
Original file line number Diff line number Diff line change
Expand Up @@ -520,9 +520,7 @@ def __init__(
)
self._client: CloudMemcacheClient | None = None

def get_conn(
self,
):
def get_conn(self):
"""Retrieves client library object that allow access to Cloud Memorystore Memcached service."""
if not self._client:
self._client = CloudMemcacheClient(credentials=self.get_credentials())
Expand Down
4 changes: 1 addition & 3 deletions airflow/providers/google/cloud/hooks/dataform.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,7 @@
class DataformHook(GoogleBaseHook):
"""Hook for Google Cloud DataForm APIs."""

def get_dataform_client(
self,
) -> DataformClient:
def get_dataform_client(self) -> DataformClient:
"""Retrieves client library object that allow access to Cloud Dataform service."""
return DataformClient(credentials=self.get_credentials())

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -113,9 +113,7 @@ def get_query(self, query_id: str) -> dict:
response = self.get_conn().queries().getquery(queryId=query_id).execute(num_retries=self.num_retries)
return response

def list_queries(
self,
) -> list[dict]:
def list_queries(self) -> list[dict]:
"""Retrieves stored queries."""
response = self.get_conn().queries().listqueries().execute(num_retries=self.num_retries)
return response.get("queries", [])
Expand Down
4 changes: 1 addition & 3 deletions airflow/providers/microsoft/mssql/hooks/mssql.py
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,7 @@ def get_sqlalchemy_connection(
engine = self.get_sqlalchemy_engine(engine_kwargs=engine_kwargs)
return engine.connect(**(connect_kwargs or {}))

def get_conn(
self,
) -> pymssql.connect:
def get_conn(self) -> pymssql.connect:
"""Returns a mssql connection object"""
conn = self.get_connection(self.mssql_conn_id) # type: ignore[attr-defined]

Expand Down
4 changes: 1 addition & 3 deletions dev/provider_packages/prepare_provider_packages.py
Original file line number Diff line number Diff line change
Expand Up @@ -732,9 +732,7 @@ def make_sure_remote_apache_exists_and_fetch(git_update: bool, verbose: bool):
if verbose:
console.print(f"Running command: '{' '.join(fetch_command)}'")
try:
subprocess.check_call(
fetch_command,
)
subprocess.check_call(fetch_command)
except subprocess.CalledProcessError as e:
console.print(
"[yellow]Error when fetching tags from remote. Your tags might not be refreshed. "
Expand Down
4 changes: 1 addition & 3 deletions tests/operators/test_python.py
Original file line number Diff line number Diff line change
Expand Up @@ -1185,9 +1185,7 @@ def test_context_removed_after_exit(self):

with set_current_context(example_context):
pass
with pytest.raises(
AirflowException,
):
with pytest.raises(AirflowException):
get_current_context()

def test_nested_context(self):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -179,9 +179,7 @@ def test_container_security_context(self):
pod = k.build_pod_request_obj(create_context(k))
assert pod.spec.containers[0].security_context == container_security_context

def test_envs_from_configmaps(
self,
):
def test_envs_from_configmaps(self):
env_from = [k8s.V1EnvFromSource(config_map_ref=k8s.V1ConfigMapEnvSource(name="test-config-map"))]
k = KubernetesPodOperator(
task_id="task",
Expand Down
8 changes: 2 additions & 6 deletions tests/providers/google/cloud/hooks/test_cloud_composer.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,7 @@ def mock_init(*args, **kwargs):


class TestCloudComposerHook(unittest.TestCase):
def setUp(
self,
) -> None:
def setUp(self) -> None:
with mock.patch(BASE_STRING.format("GoogleBaseHook.__init__"), new=mock_init):
self.hook = CloudComposerHook(gcp_conn_id="test")

Expand Down Expand Up @@ -197,9 +195,7 @@ def test_list_image_versions(self, mock_client) -> None:


class TestCloudComposerAsyncHook(unittest.TestCase):
def setUp(
self,
) -> None:
def setUp(self) -> None:
with mock.patch(BASE_STRING.format("GoogleBaseHook.__init__"), new=mock_init):
self.hook = CloudComposerAsyncHook(gcp_conn_id="test")

Expand Down
12 changes: 3 additions & 9 deletions tests/providers/google/cloud/hooks/test_cloud_memorystore.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,7 @@


class TestCloudMemorystoreWithDefaultProjectIdHook(TestCase):
def setUp(
self,
):
def setUp(self):
with mock.patch(
"airflow.providers.google.cloud.hooks.cloud_memorystore.CloudMemorystoreHook.__init__",
new=mock_base_gcp_hook_default_project_id,
Expand Down Expand Up @@ -230,9 +228,7 @@ def test_update_instance(self, mock_get_conn, mock_project_id):


class TestCloudMemorystoreWithoutDefaultProjectIdHook(TestCase):
def setUp(
self,
):
def setUp(self):
with mock.patch(
"airflow.providers.google.cloud.hooks.cloud_memorystore.CloudMemorystoreHook.__init__",
new=mock_base_gcp_hook_no_default_project_id,
Expand Down Expand Up @@ -460,9 +456,7 @@ def test_update_instance_without_project_id(self, mock_get_conn, mock_project_id


class TestCloudMemorystoreMemcachedWithDefaultProjectIdHook(TestCase):
def setUp(
self,
):
def setUp(self):
with mock.patch(
"airflow.providers.google.cloud.hooks.cloud_memorystore.CloudMemorystoreMemcachedHook.__init__",
new=mock_base_gcp_hook_default_project_id,
Expand Down
16 changes: 4 additions & 12 deletions tests/providers/google/cloud/hooks/test_datacatalog.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,7 @@


class TestCloudDataCatalog(TestCase):
def setUp(
self,
) -> None:
def setUp(self) -> None:
with mock.patch(
"airflow.providers.google.cloud.hooks.datacatalog.CloudDataCatalogHook.__init__",
new=mock_base_gcp_hook_default_project_id,
Expand Down Expand Up @@ -164,9 +162,7 @@ def test_search_catalog(self, mock_get_conn, mock_get_creds_and_project_id) -> N


class TestCloudDataCatalogWithDefaultProjectIdHook(TestCase):
def setUp(
self,
) -> None:
def setUp(self) -> None:
with mock.patch(
"airflow.providers.google.cloud.hooks.datacatalog.CloudDataCatalogHook.__init__",
new=mock_base_gcp_hook_default_project_id,
Expand Down Expand Up @@ -695,9 +691,7 @@ def test_update_tag_template_field(self, mock_get_conn, mock_get_creds_and_proje


class TestCloudDataCatalogWithoutDefaultProjectIdHook(TestCase):
def setUp(
self,
) -> None:
def setUp(self) -> None:
with mock.patch(
"airflow.providers.google.cloud.hooks.datacatalog.CloudDataCatalogHook.__init__",
new=mock_base_gcp_hook_no_default_project_id,
Expand Down Expand Up @@ -1233,9 +1227,7 @@ def test_update_tag_template_field(self, mock_get_conn, mock_get_creds_and_proje


class TestCloudDataCatalogMissingProjectIdHook(TestCase):
def setUp(
self,
) -> None:
def setUp(self) -> None:
with mock.patch(
"airflow.providers.google.cloud.hooks.datacatalog.CloudDataCatalogHook.__init__",
new=mock_base_gcp_hook_no_default_project_id,
Expand Down
16 changes: 4 additions & 12 deletions tests/providers/google/cloud/hooks/test_os_login.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,7 @@


class TestOSLoginHook(TestCase):
def setUp(
self,
) -> None:
def setUp(self) -> None:
with mock.patch(
"airflow.providers.google.cloud.hooks.os_login.OSLoginHook.__init__",
new=mock_base_gcp_hook_default_project_id,
Expand Down Expand Up @@ -82,9 +80,7 @@ def test_import_ssh_public_key(self, mock_get_conn, mock_get_creds_and_project_i


class TestOSLoginHookWithDefaultProjectIdHook(TestCase):
def setUp(
self,
) -> None:
def setUp(self) -> None:
with mock.patch(
"airflow.providers.google.cloud.hooks.os_login.OSLoginHook.__init__",
new=mock_base_gcp_hook_default_project_id,
Expand Down Expand Up @@ -118,9 +114,7 @@ def test_import_ssh_public_key(self, mock_get_conn, mock_get_creds_and_project_i


class TestOSLoginHookWithoutDefaultProjectIdHook(TestCase):
def setUp(
self,
) -> None:
def setUp(self) -> None:
with mock.patch(
"airflow.providers.google.cloud.hooks.os_login.OSLoginHook.__init__",
new=mock_base_gcp_hook_no_default_project_id,
Expand Down Expand Up @@ -156,9 +150,7 @@ def test_import_ssh_public_key(self, mock_get_conn, mock_get_creds_and_project_i


class TestOSLoginHookMissingProjectIdHook(TestCase):
def setUp(
self,
) -> None:
def setUp(self) -> None:
with mock.patch(
"airflow.providers.google.cloud.hooks.os_login.OSLoginHook.__init__",
new=mock_base_gcp_hook_no_default_project_id,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -321,9 +321,7 @@ def test_get_credentials_and_project_id_with_key_secret_name_when_key_is_invalid
):
get_credentials_and_project_id(key_secret_name="secret name")

def test_get_credentials_and_project_id_with_mutually_exclusive_configuration(
self,
):
def test_get_credentials_and_project_id_with_mutually_exclusive_configuration(self):
with pytest.raises(
AirflowException,
match=re.escape(
Expand Down Expand Up @@ -404,9 +402,7 @@ def test_get_target_principal_and_delegates_with_input(


class TestGetProjectIdFromServiceAccountEmail(unittest.TestCase):
def test_get_project_id_from_service_account_email(
self,
):
def test_get_project_id_from_service_account_email(self):
assert _get_project_id_from_service_account_email(ACCOUNT_3_ANOTHER_PROJECT) == ANOTHER_PROJECT_ID

def test_get_project_id_from_service_account_email_wrong_input(self):
Expand Down
8 changes: 2 additions & 6 deletions tests/providers/google/common/hooks/test_base_google.py
Original file line number Diff line number Diff line change
Expand Up @@ -461,9 +461,7 @@ def test_get_credentials_and_project_id_with_default_auth_and_overridden_project
)
assert ("CREDENTIALS", "SECOND_PROJECT_ID") == result

def test_get_credentials_and_project_id_with_mutually_exclusive_configuration(
self,
):
def test_get_credentials_and_project_id_with_mutually_exclusive_configuration(self):
self.instance.extras = {
"project": "PROJECT_ID",
"key_path": "KEY_PATH",
Expand All @@ -477,9 +475,7 @@ def test_get_credentials_and_project_id_with_mutually_exclusive_configuration(
):
self.instance.get_credentials_and_project_id()

def test_get_credentials_and_project_id_with_invalid_keyfile_dict(
self,
):
def test_get_credentials_and_project_id_with_invalid_keyfile_dict(self):
self.instance.extras = {
"keyfile_dict": "INVALID_DICT",
}
Expand Down

0 comments on commit 7297892

Please sign in to comment.