Skip to content

Commit 621bd82

Browse files
alafanecherejatinyadav-cc
authored andcommitted
airbyte-ci: fix inconsistent log path typing (airbytehq#34490)
1 parent 4c0e5a4 commit 621bd82

File tree

3 files changed

+14
-12
lines changed

3 files changed

+14
-12
lines changed

airbyte-ci/connectors/pipelines/README.md

+10-9
Original file line numberDiff line numberDiff line change
@@ -499,9 +499,9 @@ Available commands:
499499

500500
### Options
501501

502-
| Option | Required | Default | Mapped environment variable | Description |
503-
| ------------------- | -------- | ------- | --------------------------- | ------------------------------------------------------------------------------------------- |
504-
| `--package-path` | True | | | The path to the python package to execute a poetry command on. |
502+
| Option | Required | Default | Mapped environment variable | Description |
503+
| ---------------- | -------- | ------- | --------------------------- | -------------------------------------------------------------- |
504+
| `--package-path` | True | | | The path to the python package to execute a poetry command on. |
505505

506506
### Examples
507507

@@ -515,12 +515,12 @@ For poetry packages, the package name and version can be taken from the `pyproje
515515

516516
#### Options
517517

518-
| Option | Required | Default | Mapped environment variable | Description |
519-
| ------------------------- | -------- | ----------------------- | --------------------------- | --------------------------------------------------------------------------------------------------------------- |
520-
| `--publish-name` | False | | | The name of the package. Not required for poetry packages that define it in the `pyproject.toml` file |
521-
| `--publish-version` | False | | | The version of the package. Not required for poetry packages that define it in the `pyproject.toml` file |
522-
| `--python-registry-token` | True | | PYTHON_REGISTRY_TOKEN | The API token to authenticate with the registry. For pypi, the `pypi-` prefix needs to be specified |
523-
| `--registry-url` | False | https://pypi.org/simple | | The python registry to publish to. Defaults to main pypi |
518+
| Option | Required | Default | Mapped environment variable | Description |
519+
| ------------------------- | -------- | ----------------------- | --------------------------- | -------------------------------------------------------------------------------------------------------- |
520+
| `--publish-name` | False | | | The name of the package. Not required for poetry packages that define it in the `pyproject.toml` file |
521+
| `--publish-version` | False | | | The version of the package. Not required for poetry packages that define it in the `pyproject.toml` file |
522+
| `--python-registry-token` | True | | PYTHON_REGISTRY_TOKEN | The API token to authenticate with the registry. For pypi, the `pypi-` prefix needs to be specified |
523+
| `--registry-url` | False | https://pypi.org/simple | | The python registry to publish to. Defaults to main pypi |
524524

525525
### <a id="metadata-validate-command-subgroup"></a>`metadata` command subgroup
526526

@@ -578,6 +578,7 @@ E.G.: running `pytest` on a specific test folder:
578578

579579
| Version | PR | Description |
580580
| ------- | ---------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------- |
581+
| 3.6.1 | [#34490](https://github.com/airbytehq/airbyte/pull/34490) | Fix inconsistent dagger log path typing |
581582
| 3.6.0 | [#34111](https://github.com/airbytehq/airbyte/pull/34111) | Add python registry publishing |
582583
| 3.5.3 | [#34339](https://github.com/airbytehq/airbyte/pull/34339) | only do minimal changes on a connector version_bump |
583584
| 3.5.2 | [#34381](https://github.com/airbytehq/airbyte/pull/34381) | Bind a sidecar docker host for `airbyte-ci test` |

airbyte-ci/connectors/pipelines/pipelines/models/contexts/click_pipeline_context.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import io
66
import sys
77
import tempfile
8+
from pathlib import Path
89
from typing import Any, Callable, Dict, Optional, TextIO, Tuple
910

1011
import anyio
@@ -108,13 +109,13 @@ def get_log_output(self) -> TextIO:
108109
log_output, self._click_context().obj["dagger_logs_path"] = self._create_dagger_client_log_file()
109110
return log_output
110111

111-
def _create_dagger_client_log_file(self) -> Tuple[TextIO, str]:
112+
def _create_dagger_client_log_file(self) -> Tuple[TextIO, Path]:
112113
"""
113114
Create the dagger client log file.
114115
"""
115116
dagger_logs_file_descriptor, dagger_logs_temp_file_path = tempfile.mkstemp(dir="/tmp", prefix="dagger_client_", suffix=".log")
116117
main_logger.info(f"Dagger client logs stored in {dagger_logs_temp_file_path}")
117-
return io.TextIOWrapper(io.FileIO(dagger_logs_file_descriptor, "w+")), dagger_logs_temp_file_path
118+
return io.TextIOWrapper(io.FileIO(dagger_logs_file_descriptor, "w+")), Path(dagger_logs_temp_file_path)
118119

119120

120121
# Create @pass_pipeline_context decorator for use in click commands

airbyte-ci/connectors/pipelines/pyproject.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
44

55
[tool.poetry]
66
name = "pipelines"
7-
version = "3.6.0"
7+
version = "3.6.1"
88
description = "Packaged maintained by the connector operations team to perform CI for connectors' pipelines"
99
authors = ["Airbyte <[email protected]>"]
1010

0 commit comments

Comments
 (0)