diff --git a/README.md b/README.md index b27a971b..8276deae 100644 --- a/README.md +++ b/README.md @@ -13,5 +13,4 @@ This package was kindly donated to the [Pydantic organisation](https://github.co For the old "Hipster-orgazmic tool to manage application settings" package, see [version 0.2.5](https://pypi.org/project/pydantic-settings/0.2.5/). - See [documentation](https://docs.pydantic.dev/latest/concepts/pydantic_settings/) for more details. diff --git a/pydantic_settings/main.py b/pydantic_settings/main.py index 7ae08a61..8a6e2f2e 100644 --- a/pydantic_settings/main.py +++ b/pydantic_settings/main.py @@ -121,7 +121,7 @@ class BaseSettings(BaseModel): into `None` type(None). Defaults to `None` type(None), which means no parsing should occur. _env_parse_enums: Parse enum field names to values. Defaults to `None.`, which means no parsing should occur. _cli_prog_name: The CLI program name to display in help text. Defaults to `None` if _cli_parse_args is `None`. - Otherwse, defaults to sys.argv[0]. + Otherwise, defaults to sys.argv[0]. _cli_parse_args: The list of CLI arguments to parse. Defaults to None. If set to `True`, defaults to sys.argv[1:]. _cli_settings_source: Override the default CLI settings source with a user defined instance. Defaults to None. diff --git a/pydantic_settings/sources/providers/cli.py b/pydantic_settings/sources/providers/cli.py index 3fe92e42..3504724e 100644 --- a/pydantic_settings/sources/providers/cli.py +++ b/pydantic_settings/sources/providers/cli.py @@ -548,11 +548,11 @@ def _sort_arg_fields(self, model: type[BaseModel]) -> list[tuple[str, FieldInfo] if positional_variadic_arg: if len(positional_variadic_arg) > 1: field_names = ', '.join([name for name, info in positional_variadic_arg]) - raise SettingsError(f'{model.__name__} has multiple variadic positonal arguments: {field_names}') + raise SettingsError(f'{model.__name__} has multiple variadic positional arguments: {field_names}') elif subcommand_args: field_names = ', '.join([name for name, info in positional_variadic_arg + subcommand_args]) raise SettingsError( - f'{model.__name__} has variadic positonal arguments and subcommand arguments: {field_names}' + f'{model.__name__} has variadic positional arguments and subcommand arguments: {field_names}' ) return positional_args + positional_variadic_arg + subcommand_args + optional_args diff --git a/tests/test_settings.py b/tests/test_settings.py index fa4a6bf8..5ca14d85 100644 --- a/tests/test_settings.py +++ b/tests/test_settings.py @@ -913,7 +913,7 @@ class Settings(BaseSettings, env_nested_delimiter='__'): assert s.n.bar == 'bar value' -def test_nested_vanila_dataclass(env): +def test_nested_vanilla_dataclass(env): @dataclasses.dataclass class MyDataclass: value: str @@ -1732,7 +1732,9 @@ class Settings(BaseSettings): model_config = SettingsConfigDict(secrets_dir=tmp_path) - with pytest.warns(UserWarning, match=f'attempted to load secret file "{tmp_path}/foo" but found a directory inste'): + with pytest.warns( + UserWarning, match=f'attempted to load secret file "{tmp_path}/foo" but found a directory instead' + ): Settings() diff --git a/tests/test_source_cli.py b/tests/test_source_cli.py index e01d5460..681e9743 100644 --- a/tests/test_source_cli.py +++ b/tests/test_source_cli.py @@ -1450,25 +1450,25 @@ class PositionalArgNotOutermost(BaseSettings, cli_parse_args=True): with pytest.raises( SettingsError, - match='MultipleVariadicPositionialArgs has multiple variadic positonal arguments: strings, numbers', + match='MultipleVariadicPositionalArgs has multiple variadic positional arguments: strings, numbers', ): - class MultipleVariadicPositionialArgs(BaseSettings, cli_parse_args=True): + class MultipleVariadicPositionalArgs(BaseSettings, cli_parse_args=True): strings: CliPositionalArg[list[str]] numbers: CliPositionalArg[list[int]] - MultipleVariadicPositionialArgs() + MultipleVariadicPositionalArgs() with pytest.raises( SettingsError, - match='VariadicPositionialArgAndSubCommand has variadic positonal arguments and subcommand arguments: strings, sub_cmd', + match='VariadicPositionalArgAndSubCommand has variadic positional arguments and subcommand arguments: strings, sub_cmd', ): - class VariadicPositionialArgAndSubCommand(BaseSettings, cli_parse_args=True): + class VariadicPositionalArgAndSubCommand(BaseSettings, cli_parse_args=True): strings: CliPositionalArg[list[str]] sub_cmd: CliSubCommand[SubCmd] - VariadicPositionialArgAndSubCommand() + VariadicPositionalArgAndSubCommand() with pytest.raises( SettingsError, match=re.escape("cli_parse_args must be a list or tuple of strings, received ")