Skip to content

Commit bcc0e94

Browse files
chore: auto-fix lint and format issues
1 parent a6a4f6b commit bcc0e94

File tree

174 files changed

+148
-313
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

174 files changed

+148
-313
lines changed

airbyte-ci/connectors/base_images/base_images/java/bases.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
from __future__ import annotations
55

6-
from typing import Callable, Final
6+
from typing import Final
77

88
import dagger
99

@@ -48,7 +48,7 @@ def get_container(self, platform: dagger.Platform) -> dagger.Container:
4848
# tar is equired to untar java connector binary distributions.
4949
# openssl is required because we need to ssh and scp sometimes.
5050
# findutils is required for xargs, which is shipped as part of findutils.
51-
f"yum install -y shadow-utils tar openssl findutils",
51+
"yum install -y shadow-utils tar openssl findutils",
5252
# Update first, but in the same .with_exec step as the package installation.
5353
# Otherwise, we risk caching stale package URLs.
5454
"yum update -y --security",

airbyte-ci/connectors/base_images/base_images/version_registry.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import json
88
from dataclasses import dataclass
99
from pathlib import Path
10-
from typing import Dict, List, Mapping, Optional, Tuple, Type
10+
from typing import Dict, List, Optional, Tuple, Type
1111

1212
import dagger
1313
import semver

airbyte-ci/connectors/connectors_insights/src/connectors_insights/hacks.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ def get_ci_on_master_report(connector: Connector) -> Dict | None:
6161
json_report = get_ci_json_report(json_report_url)
6262
if json_report["connector_version"] == connector.version:
6363
return json_report
64-
except Exception as e:
64+
except Exception:
6565
continue
6666
return None
6767

airbyte-ci/connectors/connectors_insights/src/connectors_insights/utils.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
from pathlib import Path
77
from typing import TYPE_CHECKING
88

9-
import requests
10-
119
if TYPE_CHECKING:
1210
from typing import Callable, List, Set, Tuple
1311

airbyte-ci/connectors/connectors_qa/src/connectors_qa/checks/documentation/helpers.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
from pathlib import Path
66
from typing import Any
77

8-
from connector_ops.utils import Connector # type: ignore
98
from jinja2 import Environment, FileSystemLoader
109
from markdown_it import MarkdownIt
1110
from markdown_it.tree import SyntaxTreeNode

airbyte-ci/connectors/connectors_qa/src/connectors_qa/checks/documentation/models.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import re
44
from pathlib import Path
5-
from typing import Any, Dict, List
5+
from typing import Dict, List
66

77
from connector_ops.utils import Connector # type: ignore
88
from jinja2 import Environment, FileSystemLoader

airbyte-ci/connectors/connectors_qa/src/connectors_qa/checks/metadata.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# Copyright (c) 2023 Airbyte, Inc., all rights reserved.
22

3-
import os
43
from datetime import datetime, timedelta
54

65
import toml

airbyte-ci/connectors/connectors_qa/tests/unit_tests/test_checks/test_documentation.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -481,4 +481,4 @@ def test_pass_when_documentation_file_has_changelog_entry(self, mocker, tmp_path
481481

482482
# Assert
483483
assert result.status == CheckStatus.PASSED
484-
assert f"Changelog entry found for version 1.0.0" in result.message
484+
assert "Changelog entry found for version 1.0.0" in result.message

airbyte-ci/connectors/connectors_qa/tests/unit_tests/test_checks/test_metadata.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
# Copyright (c) 2023 Airbyte, Inc., all rights reserved.
22
from __future__ import annotations
33

4-
import os
5-
6-
import pytest
7-
84
from connectors_qa import consts
95
from connectors_qa.checks import metadata
106
from connectors_qa.models import CheckStatus

airbyte-ci/connectors/connectors_qa/tests/unit_tests/test_checks/test_security.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ def test_pass_when_https_url(self, mocker, tmp_path):
8080
# Arrange
8181
connector = mocker.MagicMock(code_directory=tmp_path)
8282
file_with_http_url = tmp_path / "file.py"
83-
file_with_http_url.write_text(f"https://example.com")
83+
file_with_http_url.write_text("https://example.com")
8484

8585
# Act
8686
result = security.CheckConnectorUsesHTTPSOnly()._run(connector)

airbyte-ci/connectors/metadata_service/lib/tests/test_validators/test_metadata_validators.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
# Copyright (c) 2024 Airbyte, Inc., all rights reserved.
22

33
import pytest
4-
import requests
54
import semver
6-
import yaml
75

8-
from metadata_service.docker_hub import get_latest_version_on_dockerhub
96
from metadata_service.models.generated.ConnectorMetadataDefinitionV0 import ConnectorMetadataDefinitionV0
107
from metadata_service.validators import metadata_validator
118

airbyte-ci/connectors/metadata_service/orchestrator/orchestrator/assets/connector_test_report.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
import json
66
import os
7-
import re
87
from datetime import datetime
98
from typing import List, Type, TypeVar
109

airbyte-ci/connectors/metadata_service/orchestrator/orchestrator/assets/metadata.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,12 @@
55
import os
66
from typing import List
77

8-
import numpy as np
9-
import pandas as pd
108
import yaml
119
from dagster import OpExecutionContext, Output, asset
1210
from metadata_service.constants import ICON_FILE_NAME, METADATA_FILE_NAME
13-
from metadata_service.models.generated.ConnectorMetadataDefinitionV0 import ConnectorMetadataDefinitionV0
1411
from orchestrator.config import get_public_url_for_gcs_file
1512
from orchestrator.logging import sentry
16-
from orchestrator.models.metadata import LatestMetadataEntry, MetadataDefinition, PartialMetadataDefinition
13+
from orchestrator.models.metadata import LatestMetadataEntry, MetadataDefinition
1714
from orchestrator.utils.object_helpers import are_values_equal, merge_values
1815

1916

airbyte-ci/connectors/metadata_service/orchestrator/orchestrator/assets/registry_entry.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
import orchestrator.hacks as HACKS
1313
import pandas as pd
14-
import semver
1514
import sentry_sdk
1615
from dagster import AutoMaterializePolicy, DynamicPartitionsDefinition, MetadataValue, OpExecutionContext, Output, asset
1716
from dagster_gcp.gcs.file_manager import GCSFileHandle, GCSFileManager

airbyte-ci/connectors/metadata_service/orchestrator/orchestrator/assets/slack.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import os
66

77
import pandas as pd
8-
from dagster import AutoMaterializePolicy, FreshnessPolicy, OpExecutionContext, Output, asset
8+
from dagster import AutoMaterializePolicy, FreshnessPolicy, OpExecutionContext, asset
99
from orchestrator.utils.dagster_helpers import OutputDataFrame, output_dataframe
1010

1111

airbyte-ci/connectors/metadata_service/orchestrator/orchestrator/config.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
NIGHTLY_INDIVIDUAL_TEST_REPORT_FILE_NAME = "output.json"
1818
NIGHTLY_GHA_WORKFLOW_ID = "connector_nightly_builds_dagger.yml"
1919
CI_TEST_REPORT_PREFIX = "airbyte-ci/connectors/test"
20-
CI_MASTER_TEST_OUTPUT_REGEX = f".*master.*output.json$"
20+
CI_MASTER_TEST_OUTPUT_REGEX = ".*master.*output.json$"
2121
ANALYTICS_BUCKET = "ab-analytics-connector-metrics"
2222
ANALYTICS_FOLDER = "data/connector_quality_metrics"
2323

airbyte-ci/connectors/metadata_service/orchestrator/orchestrator/jobs/registry.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44

55
from dagster import AssetSelection, SkipReason, define_asset_job, job, op
6-
from orchestrator.assets import metadata, registry, registry_entry, specs_secrets_mask
6+
from orchestrator.assets import registry_entry
77
from orchestrator.config import HIGH_QUEUE_PRIORITY, MAX_METADATA_PARTITION_RUN_REQUEST
88
from orchestrator.logging.publish_connector_lifecycle import PublishConnectorLifecycle, PublishConnectorLifecycleStage, StageStatus
99

@@ -103,7 +103,7 @@ def add_new_metadata_partitions_op(context):
103103
context.log.info(f"New etags found: {new_etags_found}")
104104

105105
if not new_etags_found:
106-
return SkipReason(f"No new metadata files to process in GCS bucket")
106+
return SkipReason("No new metadata files to process in GCS bucket")
107107

108108
# if there are more than the MAX_METADATA_PARTITION_RUN_REQUEST, we need to split them into multiple runs
109109
etags_to_process = new_etags_found

airbyte-ci/connectors/metadata_service/orchestrator/orchestrator/logging/sentry.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ def _get_context_from_args_kwargs(args, kwargs):
8282

8383
# otherwise raise an error
8484
raise Exception(
85-
f"No context provided to Sentry Transaction. When using @instrument, ensure that the asset/op has a context as the first argument."
85+
"No context provided to Sentry Transaction. When using @instrument, ensure that the asset/op has a context as the first argument."
8686
)
8787

8888

airbyte-ci/connectors/metadata_service/orchestrator/orchestrator/ops/slack.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@
44

55
import os
66

7-
from dagster import OpExecutionContext, op
8-
from dagster_slack import SlackResource
9-
from slack_sdk import WebhookClient
7+
from dagster import OpExecutionContext
108

119

1210
def chunk_messages(report):

airbyte-ci/connectors/metadata_service/orchestrator/orchestrator/resources/gcp.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
from typing import List, Optional, Union
99

1010
import dagster._check as check
11-
from dagster import BoolSource, Field, InitResourceContext, Noneable, StringSource, resource
11+
from dagster import Field, InitResourceContext, Noneable, StringSource, resource
1212
from dagster._core.storage.file_manager import check_file_like_obj
1313
from dagster_gcp.gcs.file_manager import GCSFileHandle, GCSFileManager
1414
from google.cloud import storage

airbyte-ci/connectors/metadata_service/orchestrator/orchestrator/resources/github.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
from typing import List
77

88
from dagster import InitResourceContext, StringSource, resource
9-
from dateutil.parser import parse
10-
from github import ContentFile, Github, GitTreeElement, Repository
9+
from github import ContentFile, Github, Repository
1110
from metadata_service.constants import METADATA_FILE_NAME
1211
from orchestrator.config import CONNECTORS_PATH
1312

@@ -64,7 +63,7 @@ def get_latest_commit_for_file(github_connector_repo: Repository, path: str) ->
6463
config_schema={"connectors_path": StringSource},
6564
)
6665
def github_connectors_metadata_files(resource_context: InitResourceContext) -> List[dict]:
67-
resource_context.log.info(f"retrieving github metadata files")
66+
resource_context.log.info("retrieving github metadata files")
6867

6968
github_connector_repo = resource_context.resources.github_connector_repo
7069
repo_file_tree = github_connector_repo.get_git_tree("master", recursive=True).tree
@@ -78,7 +77,7 @@ def github_connectors_metadata_files(resource_context: InitResourceContext) -> L
7877
if _valid_metadata_file_path(github_file.path)
7978
]
8079

81-
resource_context.log.info(f"finished retrieving github metadata files")
80+
resource_context.log.info("finished retrieving github metadata files")
8281
return metadata_file_paths
8382

8483

airbyte-ci/connectors/metadata_service/orchestrator/orchestrator/utils/dagster_helpers.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44

55
import hashlib
6-
from typing import List, Optional
6+
from typing import List
77

88
import pandas as pd
99
from dagster import MetadataValue, Output

airbyte-ci/connectors/pipelines/pipelines/airbyte_ci/connectors/test/steps/java_connectors.py

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,30 +8,24 @@
88

99
from typing import TYPE_CHECKING
1010

11-
import anyio
12-
from dagger import File, QueryError
13-
1411
from pipelines.airbyte_ci.connectors.build_image.steps.common import LoadContainerToLocalDockerHost
1512
from pipelines.airbyte_ci.connectors.build_image.steps.java_connectors import (
1613
BuildConnectorDistributionTar,
1714
BuildConnectorImages,
18-
dist_tar_directory_path,
1915
)
2016
from pipelines.airbyte_ci.connectors.build_image.steps.normalization import BuildOrPullNormalization
2117
from pipelines.airbyte_ci.connectors.consts import CONNECTOR_TEST_STEP_ID
2218
from pipelines.airbyte_ci.connectors.test.context import ConnectorTestContext
2319
from pipelines.airbyte_ci.connectors.test.steps.common import AcceptanceTests
2420
from pipelines.airbyte_ci.steps.gradle import GradleTask
2521
from pipelines.consts import LOCAL_BUILD_PLATFORM
26-
from pipelines.dagger.actions.system import docker
2722
from pipelines.helpers.execution.run_steps import StepToRun
28-
from pipelines.helpers.utils import export_container_to_tarball
29-
from pipelines.models.steps import STEP_PARAMS, StepResult, StepStatus
23+
from pipelines.models.steps import STEP_PARAMS
3024

3125
if TYPE_CHECKING:
32-
from typing import Callable, Dict, List, Optional
26+
from typing import List
3327

34-
from pipelines.helpers.execution.run_steps import RESULTS_DICT, STEP_TREE
28+
from pipelines.helpers.execution.run_steps import STEP_TREE
3529

3630

3731
class IntegrationTests(GradleTask):

airbyte-ci/connectors/pipelines/pipelines/airbyte_ci/steps/gradle.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
from pathlib import Path
1313
from typing import Any, ClassVar, Dict, Generator, List, Optional, Tuple, cast
1414

15-
from dagger import Container, ExecError
15+
from dagger import ExecError
1616

1717
from pipelines.airbyte_ci.connectors.context import ConnectorContext
1818
from pipelines.helpers.utils import dagger_directory_as_zip_file

airbyte-ci/connectors/pipelines/tests/test_build_image/test_python_connectors.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
from pathlib import Path
66

7-
import asyncclick as click
87
import pytest
98

109
from pipelines.airbyte_ci.connectors.build_image.steps import build_customization, python_connectors

airbyte-ci/connectors/pipelines/tests/test_dagger/test_actions/test_python/test_common.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,10 @@
33
#
44
import datetime
55

6-
import asyncclick as click
76
import pytest
87
import requests
98

10-
from pipelines.airbyte_ci.connectors.build_image.steps.python_connectors import BuildConnectorImages
119
from pipelines.airbyte_ci.connectors.context import ConnectorContext
12-
from pipelines.dagger.actions.python import common
1310

1411
pytestmark = [
1512
pytest.mark.anyio,

airbyte-ci/connectors/pipelines/tests/test_helpers/test_execution/test_argument_parsing.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
# Copyright (c) 2023 Airbyte, Inc., all rights reserved.
22

33
import enum
4-
import time
5-
6-
import anyio
7-
import pytest
84

95
from pipelines.helpers.execution import argument_parsing
106

airbyte-ci/connectors/pipelines/tests/test_publish.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
# Copyright (c) 2023 Airbyte, Inc., all rights reserved.
33
#
44
import json
5-
import os
65
import random
76
from typing import List
87

airbyte-ci/connectors/pipelines/tests/test_tests/test_common.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import time
88
from typing import List
99

10-
import asyncclick as click
1110
import dagger
1211
import pytest
1312
import yaml

airbyte-ci/connectors/pipelines/tests/test_tests/test_python_connectors.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
from unittest.mock import patch
66

7-
import asyncclick as click
87
import pytest
98
from connector_ops.utils import Connector, ConnectorLanguage
109

airbyte-ci/connectors/pipelines/tests/test_upgrade_java_cdk.py

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,13 @@
22
# Copyright (c) 2023 Airbyte, Inc., all rights reserved.
33
#
44

5-
import json
6-
import random
7-
from pathlib import Path
8-
from typing import List
95
from unittest.mock import AsyncMock, MagicMock
106

11-
import anyio
12-
import asyncclick as click
137
import pytest
14-
from connector_ops.utils import Connector, ConnectorLanguage
8+
from connector_ops.utils import Connector
159
from dagger import Directory
1610

1711
from pipelines.airbyte_ci.connectors.context import ConnectorContext
18-
from pipelines.airbyte_ci.connectors.publish import pipeline as publish_pipeline
1912
from pipelines.airbyte_ci.connectors.upgrade_cdk import pipeline as upgrade_cdk_pipeline
2013
from pipelines.models.steps import StepStatus
2114

airbyte-integrations/bases/connector-acceptance-test/connector_acceptance_test/utils/compare.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
import functools
66
from typing import List, Mapping, Optional
77

8-
import dpath.exceptions
9-
import dpath.util
108
import icdiff
119
import py
1210
from pprintpp import pformat

airbyte-integrations/bases/connector-acceptance-test/unit_tests/test_core.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1768,7 +1768,7 @@ async def test_read_validate_stream_statuses_exceptions(mocker, output):
17681768
configured_catalog = ConfiguredAirbyteCatalog(
17691769
streams=[
17701770
ConfiguredAirbyteStream(
1771-
stream=AirbyteStream.parse_obj({"name": f"test_stream_0", "json_schema": {}, "supported_sync_modes": ["full_refresh"]}),
1771+
stream=AirbyteStream.parse_obj({"name": "test_stream_0", "json_schema": {}, "supported_sync_modes": ["full_refresh"]}),
17721772
sync_mode="full_refresh",
17731773
destination_sync_mode="overwrite",
17741774
)
@@ -1919,7 +1919,7 @@ async def test_read_validate_async_output_state_messages(mocker, state_message_p
19191919
configured_catalog = ConfiguredAirbyteCatalog(
19201920
streams=[
19211921
ConfiguredAirbyteStream(
1922-
stream=AirbyteStream.parse_obj({"name": f"test_stream_0", "json_schema": {}, "supported_sync_modes": ["full_refresh"]}),
1922+
stream=AirbyteStream.parse_obj({"name": "test_stream_0", "json_schema": {}, "supported_sync_modes": ["full_refresh"]}),
19231923
sync_mode="full_refresh",
19241924
destination_sync_mode="overwrite",
19251925
)

airbyte-integrations/bases/connector-acceptance-test/unit_tests/test_global_fixtures.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
Config,
1313
EmptyStreamConfiguration,
1414
ExpectedRecordsConfig,
15-
IgnoredFieldsConfiguration,
1615
)
1716

1817
from airbyte_protocol.models import AirbyteStream, ConfiguredAirbyteCatalog, ConfiguredAirbyteStream, DestinationSyncMode, SyncMode

0 commit comments

Comments
 (0)