From 1db2cd436b200927927a411e30ea02e3ae47de4e Mon Sep 17 00:00:00 2001 From: Ramin Gharib Date: Wed, 25 Sep 2024 15:33:27 +0200 Subject: [PATCH] Upgrade typer to support union types (#533) --- docs/docs/user/references/cli-commands.md | 12 +++--- kpops/cli/main.py | 45 ++++++++++---------- poetry.lock | 51 +++++++++-------------- pyproject.toml | 3 +- 4 files changed, 49 insertions(+), 62 deletions(-) diff --git a/docs/docs/user/references/cli-commands.md b/docs/docs/user/references/cli-commands.md index 0a187f139..d10ba44cc 100644 --- a/docs/docs/user/references/cli-commands.md +++ b/docs/docs/user/references/cli-commands.md @@ -43,7 +43,7 @@ $ kpops clean [OPTIONS] PIPELINE_PATHS... * `--dotenv FILE`: Path to dotenv file. Multiple files can be provided. The files will be loaded in order, with each file overriding the previous one. [env var: KPOPS_DOTENV_PATH] * `--config DIRECTORY`: Path to the dir containing config.yaml files [env var: KPOPS_CONFIG_PATH; default: .] * `--steps TEXT`: Comma separated list of steps to apply the command on [env var: KPOPS_PIPELINE_STEPS] -* `--filter-type [include|exclude]`: Whether the --steps option should include/exclude the steps [default: FilterType.INCLUDE] +* `--filter-type [include|exclude]`: Whether the --steps option should include/exclude the steps [default: include] * `--environment TEXT`: The environment you want to generate and deploy the pipeline to. Suffix your environment files with this value (e.g. defaults_development.yaml for environment=development). [env var: KPOPS_ENVIRONMENT] * `--dry-run / --execute`: Whether to dry run the command or execute it [default: dry-run] * `--verbose / --no-verbose`: Enable verbose printing [default: no-verbose] @@ -69,7 +69,7 @@ $ kpops deploy [OPTIONS] PIPELINE_PATHS... * `--dotenv FILE`: Path to dotenv file. Multiple files can be provided. The files will be loaded in order, with each file overriding the previous one. [env var: KPOPS_DOTENV_PATH] * `--config DIRECTORY`: Path to the dir containing config.yaml files [env var: KPOPS_CONFIG_PATH; default: .] * `--steps TEXT`: Comma separated list of steps to apply the command on [env var: KPOPS_PIPELINE_STEPS] -* `--filter-type [include|exclude]`: Whether the --steps option should include/exclude the steps [default: FilterType.INCLUDE] +* `--filter-type [include|exclude]`: Whether the --steps option should include/exclude the steps [default: include] * `--environment TEXT`: The environment you want to generate and deploy the pipeline to. Suffix your environment files with this value (e.g. defaults_development.yaml for environment=development). [env var: KPOPS_ENVIRONMENT] * `--dry-run / --execute`: Whether to dry run the command or execute it [default: dry-run] * `--verbose / --no-verbose`: Enable verbose printing [default: no-verbose] @@ -95,7 +95,7 @@ $ kpops destroy [OPTIONS] PIPELINE_PATHS... * `--dotenv FILE`: Path to dotenv file. Multiple files can be provided. The files will be loaded in order, with each file overriding the previous one. [env var: KPOPS_DOTENV_PATH] * `--config DIRECTORY`: Path to the dir containing config.yaml files [env var: KPOPS_CONFIG_PATH; default: .] * `--steps TEXT`: Comma separated list of steps to apply the command on [env var: KPOPS_PIPELINE_STEPS] -* `--filter-type [include|exclude]`: Whether the --steps option should include/exclude the steps [default: FilterType.INCLUDE] +* `--filter-type [include|exclude]`: Whether the --steps option should include/exclude the steps [default: include] * `--environment TEXT`: The environment you want to generate and deploy the pipeline to. Suffix your environment files with this value (e.g. defaults_development.yaml for environment=development). [env var: KPOPS_ENVIRONMENT] * `--dry-run / --execute`: Whether to dry run the command or execute it [default: dry-run] * `--verbose / --no-verbose`: Enable verbose printing [default: no-verbose] @@ -121,7 +121,7 @@ $ kpops generate [OPTIONS] PIPELINE_PATHS... * `--dotenv FILE`: Path to dotenv file. Multiple files can be provided. The files will be loaded in order, with each file overriding the previous one. [env var: KPOPS_DOTENV_PATH] * `--config DIRECTORY`: Path to the dir containing config.yaml files [env var: KPOPS_CONFIG_PATH; default: .] * `--steps TEXT`: Comma separated list of steps to apply the command on [env var: KPOPS_PIPELINE_STEPS] -* `--filter-type [include|exclude]`: Whether the --steps option should include/exclude the steps [default: FilterType.INCLUDE] +* `--filter-type [include|exclude]`: Whether the --steps option should include/exclude the steps [default: include] * `--environment TEXT`: The environment you want to generate and deploy the pipeline to. Suffix your environment files with this value (e.g. defaults_development.yaml for environment=development). [env var: KPOPS_ENVIRONMENT] * `--verbose / --no-verbose`: Enable verbose printing [default: no-verbose] * `--help`: Show this message and exit. @@ -164,7 +164,7 @@ $ kpops manifest [OPTIONS] PIPELINE_PATHS... * `--dotenv FILE`: Path to dotenv file. Multiple files can be provided. The files will be loaded in order, with each file overriding the previous one. [env var: KPOPS_DOTENV_PATH] * `--config DIRECTORY`: Path to the dir containing config.yaml files [env var: KPOPS_CONFIG_PATH; default: .] * `--steps TEXT`: Comma separated list of steps to apply the command on [env var: KPOPS_PIPELINE_STEPS] -* `--filter-type [include|exclude]`: Whether the --steps option should include/exclude the steps [default: FilterType.INCLUDE] +* `--filter-type [include|exclude]`: Whether the --steps option should include/exclude the steps [default: include] * `--environment TEXT`: The environment you want to generate and deploy the pipeline to. Suffix your environment files with this value (e.g. defaults_development.yaml for environment=development). [env var: KPOPS_ENVIRONMENT] * `--verbose / --no-verbose`: Enable verbose printing [default: no-verbose] * `--help`: Show this message and exit. @@ -188,7 +188,7 @@ $ kpops reset [OPTIONS] PIPELINE_PATHS... * `--dotenv FILE`: Path to dotenv file. Multiple files can be provided. The files will be loaded in order, with each file overriding the previous one. [env var: KPOPS_DOTENV_PATH] * `--config DIRECTORY`: Path to the dir containing config.yaml files [env var: KPOPS_CONFIG_PATH; default: .] * `--steps TEXT`: Comma separated list of steps to apply the command on [env var: KPOPS_PIPELINE_STEPS] -* `--filter-type [include|exclude]`: Whether the --steps option should include/exclude the steps [default: FilterType.INCLUDE] +* `--filter-type [include|exclude]`: Whether the --steps option should include/exclude the steps [default: include] * `--environment TEXT`: The environment you want to generate and deploy the pipeline to. Suffix your environment files with this value (e.g. defaults_development.yaml for environment=development). [env var: KPOPS_ENVIRONMENT] * `--dry-run / --execute`: Whether to dry run the command or execute it [default: dry-run] * `--verbose / --no-verbose`: Enable verbose printing [default: no-verbose] diff --git a/kpops/cli/main.py b/kpops/cli/main.py index 28cca3a44..ff0a77338 100644 --- a/kpops/cli/main.py +++ b/kpops/cli/main.py @@ -1,7 +1,6 @@ from __future__ import annotations from pathlib import Path -from typing import Optional import typer @@ -27,7 +26,7 @@ app = typer.Typer(pretty_exceptions_enable=False) -DOTENV_PATH_OPTION: Optional[list[Path]] = typer.Option( +DOTENV_PATH_OPTION: list[Path] | None = typer.Option( default=None, exists=True, dir_okay=False, @@ -74,7 +73,7 @@ help="Whether to include non-required settings in the generated 'config.yaml'", ) -PIPELINE_STEPS: Optional[str] = typer.Option( +PIPELINE_STEPS: str | None = typer.Option( default=None, envvar=f"{ENV_PREFIX}PIPELINE_STEPS", help="Comma separated list of steps to apply the command on", @@ -100,8 +99,8 @@ help="Whether the --steps option should include/exclude the steps", ) -OUTPUT_OPTION = typer.Option(True, help="Enable output printing") -VERBOSE_OPTION = typer.Option(False, help="Enable verbose printing") +OUTPUT_OPTION: bool = typer.Option(True, help="Enable output printing") +VERBOSE_OPTION: bool = typer.Option(False, help="Enable verbose printing") ENVIRONMENT: str | None = typer.Option( default=None, @@ -161,11 +160,11 @@ def schema( ) def generate( pipeline_paths: list[Path] = PIPELINE_PATHS_ARG, - dotenv: Optional[list[Path]] = DOTENV_PATH_OPTION, + dotenv: list[Path] | None = DOTENV_PATH_OPTION, config: Path = CONFIG_PATH_OPTION, - steps: Optional[str] = PIPELINE_STEPS, + steps: str | None = PIPELINE_STEPS, filter_type: FilterType = FILTER_TYPE, - environment: Optional[str] = ENVIRONMENT, + environment: str | None = ENVIRONMENT, verbose: bool = VERBOSE_OPTION, ): for pipeline_file_path in collect_pipeline_paths(pipeline_paths): @@ -187,11 +186,11 @@ def generate( ) def manifest( pipeline_paths: list[Path] = PIPELINE_PATHS_ARG, - dotenv: Optional[list[Path]] = DOTENV_PATH_OPTION, + dotenv: list[Path] | None = DOTENV_PATH_OPTION, config: Path = CONFIG_PATH_OPTION, - steps: Optional[str] = PIPELINE_STEPS, + steps: str | None = PIPELINE_STEPS, filter_type: FilterType = FILTER_TYPE, - environment: Optional[str] = ENVIRONMENT, + environment: str | None = ENVIRONMENT, verbose: bool = VERBOSE_OPTION, ): for pipeline_file_path in collect_pipeline_paths(pipeline_paths): @@ -212,11 +211,11 @@ def manifest( @app.command(help="Deploy pipeline steps") def deploy( pipeline_paths: list[Path] = PIPELINE_PATHS_ARG, - dotenv: Optional[list[Path]] = DOTENV_PATH_OPTION, + dotenv: list[Path] | None = DOTENV_PATH_OPTION, config: Path = CONFIG_PATH_OPTION, - steps: Optional[str] = PIPELINE_STEPS, + steps: str | None = PIPELINE_STEPS, filter_type: FilterType = FILTER_TYPE, - environment: Optional[str] = ENVIRONMENT, + environment: str | None = ENVIRONMENT, dry_run: bool = DRY_RUN, verbose: bool = VERBOSE_OPTION, parallel: bool = PARALLEL, @@ -238,11 +237,11 @@ def deploy( @app.command(help="Destroy pipeline steps") def destroy( pipeline_paths: list[Path] = PIPELINE_PATHS_ARG, - dotenv: Optional[list[Path]] = DOTENV_PATH_OPTION, + dotenv: list[Path] | None = DOTENV_PATH_OPTION, config: Path = CONFIG_PATH_OPTION, - steps: Optional[str] = PIPELINE_STEPS, + steps: str | None = PIPELINE_STEPS, filter_type: FilterType = FILTER_TYPE, - environment: Optional[str] = ENVIRONMENT, + environment: str | None = ENVIRONMENT, dry_run: bool = DRY_RUN, verbose: bool = VERBOSE_OPTION, parallel: bool = PARALLEL, @@ -264,11 +263,11 @@ def destroy( @app.command(help="Reset pipeline steps") def reset( pipeline_paths: list[Path] = PIPELINE_PATHS_ARG, - dotenv: Optional[list[Path]] = DOTENV_PATH_OPTION, + dotenv: list[Path] | None = DOTENV_PATH_OPTION, config: Path = CONFIG_PATH_OPTION, - steps: Optional[str] = PIPELINE_STEPS, + steps: str | None = PIPELINE_STEPS, filter_type: FilterType = FILTER_TYPE, - environment: Optional[str] = ENVIRONMENT, + environment: str | None = ENVIRONMENT, dry_run: bool = DRY_RUN, verbose: bool = VERBOSE_OPTION, parallel: bool = PARALLEL, @@ -290,11 +289,11 @@ def reset( @app.command(help="Clean pipeline steps") def clean( pipeline_paths: list[Path] = PIPELINE_PATHS_ARG, - dotenv: Optional[list[Path]] = DOTENV_PATH_OPTION, + dotenv: list[Path] | None = DOTENV_PATH_OPTION, config: Path = CONFIG_PATH_OPTION, - steps: Optional[str] = PIPELINE_STEPS, + steps: str | None = PIPELINE_STEPS, filter_type: FilterType = FILTER_TYPE, - environment: Optional[str] = ENVIRONMENT, + environment: str | None = ENVIRONMENT, dry_run: bool = DRY_RUN, verbose: bool = VERBOSE_OPTION, parallel: bool = PARALLEL, diff --git a/poetry.lock b/poetry.lock index 2702caa49..78add035b 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,4 +1,4 @@ -# This file is automatically @generated by Poetry 1.8.3 and should not be changed by hand. +# This file is automatically @generated by Poetry 1.8.2 and should not be changed by hand. [[package]] name = "aiofiles" @@ -1441,6 +1441,7 @@ files = [ {file = "PyYAML-6.0.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:69b023b2b4daa7548bcfbd4aa3da05b3a74b772db9e23b982788168117739938"}, {file = "PyYAML-6.0.1-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:81e0b275a9ecc9c0c0c07b4b90ba548307583c125f54d5b6946cfee6360c733d"}, {file = "PyYAML-6.0.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ba336e390cd8e4d1739f42dfe9bb83a3cc2e80f567d8805e11b46f4a943f5515"}, + {file = "PyYAML-6.0.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:326c013efe8048858a6d312ddd31d56e468118ad4cdeda36c719bf5bb6192290"}, {file = "PyYAML-6.0.1-cp310-cp310-win32.whl", hash = "sha256:bd4af7373a854424dabd882decdc5579653d7868b8fb26dc7d0e99f823aa5924"}, {file = "PyYAML-6.0.1-cp310-cp310-win_amd64.whl", hash = "sha256:fd1592b3fdf65fff2ad0004b5e363300ef59ced41c2e6b3a99d4089fa8c5435d"}, {file = "PyYAML-6.0.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:6965a7bc3cf88e5a1c3bd2e0b5c22f8d677dc88a455344035f03399034eb3007"}, @@ -1448,8 +1449,16 @@ files = [ {file = "PyYAML-6.0.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:42f8152b8dbc4fe7d96729ec2b99c7097d656dc1213a3229ca5383f973a5ed6d"}, {file = "PyYAML-6.0.1-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:062582fca9fabdd2c8b54a3ef1c978d786e0f6b3a1510e0ac93ef59e0ddae2bc"}, {file = "PyYAML-6.0.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d2b04aac4d386b172d5b9692e2d2da8de7bfb6c387fa4f801fbf6fb2e6ba4673"}, + {file = "PyYAML-6.0.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:e7d73685e87afe9f3b36c799222440d6cf362062f78be1013661b00c5c6f678b"}, {file = "PyYAML-6.0.1-cp311-cp311-win32.whl", hash = "sha256:1635fd110e8d85d55237ab316b5b011de701ea0f29d07611174a1b42f1444741"}, {file = "PyYAML-6.0.1-cp311-cp311-win_amd64.whl", hash = "sha256:bf07ee2fef7014951eeb99f56f39c9bb4af143d8aa3c21b1677805985307da34"}, + {file = "PyYAML-6.0.1-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:855fb52b0dc35af121542a76b9a84f8d1cd886ea97c84703eaa6d88e37a2ad28"}, + {file = "PyYAML-6.0.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:40df9b996c2b73138957fe23a16a4f0ba614f4c0efce1e9406a184b6d07fa3a9"}, + {file = "PyYAML-6.0.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a08c6f0fe150303c1c6b71ebcd7213c2858041a7e01975da3a99aed1e7a378ef"}, + {file = "PyYAML-6.0.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6c22bec3fbe2524cde73d7ada88f6566758a8f7227bfbf93a408a9d86bcc12a0"}, + {file = "PyYAML-6.0.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:8d4e9c88387b0f5c7d5f281e55304de64cf7f9c0021a3525bd3b1c542da3b0e4"}, + {file = "PyYAML-6.0.1-cp312-cp312-win32.whl", hash = "sha256:d483d2cdf104e7c9fa60c544d92981f12ad66a457afae824d146093b8c294c54"}, + {file = "PyYAML-6.0.1-cp312-cp312-win_amd64.whl", hash = "sha256:0d3304d8c0adc42be59c5f8a4d9e3d7379e6955ad754aa9d6ab7a398b59dd1df"}, {file = "PyYAML-6.0.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:50550eb667afee136e9a77d6dc71ae76a44df8b3e51e41b77f6de2932bfe0f47"}, {file = "PyYAML-6.0.1-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1fe35611261b29bd1de0070f0b2f47cb6ff71fa6595c077e42bd0c419fa27b98"}, {file = "PyYAML-6.0.1-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:704219a11b772aea0d8ecd7058d0082713c3562b4e271b849ad7dc4a5c90c13c"}, @@ -1466,6 +1475,7 @@ files = [ {file = "PyYAML-6.0.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a0cd17c15d3bb3fa06978b4e8958dcdc6e0174ccea823003a106c7d4d7899ac5"}, {file = "PyYAML-6.0.1-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:28c119d996beec18c05208a8bd78cbe4007878c6dd15091efb73a30e90539696"}, {file = "PyYAML-6.0.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7e07cbde391ba96ab58e532ff4803f79c4129397514e1413a7dc761ccd755735"}, + {file = "PyYAML-6.0.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:49a183be227561de579b4a36efbb21b3eab9651dd81b1858589f796549873dd6"}, {file = "PyYAML-6.0.1-cp38-cp38-win32.whl", hash = "sha256:184c5108a2aca3c5b3d3bf9395d50893a7ab82a38004c8f61c258d4428e80206"}, {file = "PyYAML-6.0.1-cp38-cp38-win_amd64.whl", hash = "sha256:1e2722cc9fbb45d9b87631ac70924c11d3a401b2d7f410cc0e3bbf249f2dca62"}, {file = "PyYAML-6.0.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:9eb6caa9a297fc2c2fb8862bc5370d0303ddba53ba97e71f08023b6cd73d16a8"}, @@ -1473,6 +1483,7 @@ files = [ {file = "PyYAML-6.0.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5773183b6446b2c99bb77e77595dd486303b4faab2b086e7b17bc6bef28865f6"}, {file = "PyYAML-6.0.1-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b786eecbdf8499b9ca1d697215862083bd6d2a99965554781d0d8d1ad31e13a0"}, {file = "PyYAML-6.0.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bc1bf2925a1ecd43da378f4db9e4f799775d6367bdb94671027b73b393a7c42c"}, + {file = "PyYAML-6.0.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:04ac92ad1925b2cff1db0cfebffb6ffc43457495c9b3c39d3fcae417d7125dc5"}, {file = "PyYAML-6.0.1-cp39-cp39-win32.whl", hash = "sha256:faca3bdcf85b2fc05d06ff3fbc1f83e1391b3e724afa3feba7d13eeab355484c"}, {file = "PyYAML-6.0.1-cp39-cp39-win_amd64.whl", hash = "sha256:510c9deebc5c0225e8c96813043e62b680ba2f9c50a08d3724c7f28a747d1486"}, {file = "PyYAML-6.0.1.tar.gz", hash = "sha256:bfdf460b1736c775f2ba9f6a92bca30bc2095067b8a9d77876d1fad6cc3b4a43"}, @@ -1807,42 +1818,20 @@ test = ["packaging", "pytest (>=6.0.1)", "python-dateutil (>=2.8.0,<3.0.0)", "py [[package]] name = "typer" -version = "0.6.1" +version = "0.12.5" description = "Typer, build great CLIs. Easy to code. Based on Python type hints." optional = false -python-versions = ">=3.6" -files = [ - {file = "typer-0.6.1-py3-none-any.whl", hash = "sha256:54b19e5df18654070a82f8c2aa1da456a4ac16a2a83e6dcd9f170e291c56338e"}, - {file = "typer-0.6.1.tar.gz", hash = "sha256:2d5720a5e63f73eaf31edaa15f6ab87f35f0690f8ca233017d7d23d743a91d73"}, -] - -[package.dependencies] -click = ">=7.1.1,<9.0.0" -colorama = {version = ">=0.4.3,<0.5.0", optional = true, markers = "extra == \"all\""} -rich = {version = ">=10.11.0,<13.0.0", optional = true, markers = "extra == \"all\""} -shellingham = {version = ">=1.3.0,<2.0.0", optional = true, markers = "extra == \"all\""} - -[package.extras] -all = ["colorama (>=0.4.3,<0.5.0)", "rich (>=10.11.0,<13.0.0)", "shellingham (>=1.3.0,<2.0.0)"] -dev = ["autoflake (>=1.3.1,<2.0.0)", "flake8 (>=3.8.3,<4.0.0)", "pre-commit (>=2.17.0,<3.0.0)"] -doc = ["mdx-include (>=1.4.1,<2.0.0)", "mkdocs (>=1.1.2,<2.0.0)", "mkdocs-material (>=8.1.4,<9.0.0)"] -test = ["black (>=22.3.0,<23.0.0)", "coverage (>=5.2,<6.0)", "isort (>=5.0.6,<6.0.0)", "mypy (==0.910)", "pytest (>=4.4.0,<5.4.0)", "pytest-cov (>=2.10.0,<3.0.0)", "pytest-sugar (>=0.9.4,<0.10.0)", "pytest-xdist (>=1.32.0,<2.0.0)", "rich (>=10.11.0,<13.0.0)", "shellingham (>=1.3.0,<2.0.0)"] - -[[package]] -name = "typer-cli" -version = "0.0.13" -description = "Run Typer scripts with completion, without having to create a package, using Typer CLI." -optional = false python-versions = ">=3.7" files = [ - {file = "typer_cli-0.0.13-py3-none-any.whl", hash = "sha256:5ae0f99dce8f8f9669137a2c98eb42485cd4412e0ec225c8eb29ce8ac3378731"}, - {file = "typer_cli-0.0.13.tar.gz", hash = "sha256:f5b85764e56fb3fe835ed008ad5bc7db4961f7bcce1f1c1698ac46b6c5d9b86f"}, + {file = "typer-0.12.5-py3-none-any.whl", hash = "sha256:62fe4e471711b147e3365034133904df3e235698399bc4de2b36c8579298d52b"}, + {file = "typer-0.12.5.tar.gz", hash = "sha256:f592f089bedcc8ec1b974125d64851029c3b1af145f04aca64d69410f0c9b722"}, ] [package.dependencies] -colorama = ">=0.4.3,<=0.5.0" -shellingham = ">=1.3.2,<=1.4.0" -typer = ">=0.4.0,<=0.7.0" +click = ">=8.0.0" +rich = ">=10.11.0" +shellingham = ">=1.3.0" +typing-extensions = ">=3.7.4.3" [[package]] name = "typing-extensions" @@ -1948,4 +1937,4 @@ watchmedo = ["PyYAML (>=3.10)"] [metadata] lock-version = "2.0" python-versions = ">=3.10, <3.13" -content-hash = "4a7605caf837fed1f9ab0a2a744c3db291773320ba0d3987b4f3470cb76e5749" +content-hash = "3b1404726419c634df55ab2da6a4d407e52b0cba9fc8f4e44896e34c46461776" diff --git a/pyproject.toml b/pyproject.toml index d3d54703c..e952719c4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -28,7 +28,7 @@ pydantic = "^2.5.3" pydantic-settings = "^2.0.3" rich = "^12.4.4" PyYAML = "^6.0" -typer = { extras = ["all"], version = "^0.6.1" } +typer = { extras = ["all"], version = "^0.12.5" } pyhumps = "^3.7.3" cachetools = "^5.2.0" dictdiffer = "^0.9.0" @@ -47,7 +47,6 @@ pytest-asyncio = "^0.23.8" pytest-httpx = "^0.30.0" pre-commit = "^2.19.0" ruff = "^0.5.5" -typer-cli = "^0.0.13" pyright = "^1.1.352" pytablewriter = { extras = ["from"], version = "^1.0.0" } polyfactory = "^2.13.0"