From f1f2fff528a74931a501def046ed247ee727b4ce Mon Sep 17 00:00:00 2001 From: Chip Pate Date: Sun, 4 Dec 2022 07:21:01 -0500 Subject: [PATCH 1/4] fix(cli): make config relocation instructions more explicit Fixes #6864 --- src/poetry/locations.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/poetry/locations.py b/src/poetry/locations.py index 0e3b884eb5b..ca1432efdde 100644 --- a/src/poetry/locations.py +++ b/src/poetry/locations.py @@ -34,8 +34,8 @@ if any(file.exists() for file in (auth_toml, config_toml)): logger.warning( "Configuration file exists at %s, reusing this directory.\n\nConsider" - " moving configuration to %s, as support for the legacy directory will be" - " removed in an upcoming release.", + " moving toml configuration files to %s, as support for the legacy directory" + " will be removed in an upcoming release.", _LEGACY_CONFIG_DIR, CONFIG_DIR, ) From 1ffee026b4e84c4169dd2190d773d1512f451c42 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 20 Dec 2022 20:53:30 +0000 Subject: [PATCH 2/4] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- src/poetry/locations.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/poetry/locations.py b/src/poetry/locations.py index ca1432efdde..7dd84f4b38a 100644 --- a/src/poetry/locations.py +++ b/src/poetry/locations.py @@ -34,8 +34,8 @@ if any(file.exists() for file in (auth_toml, config_toml)): logger.warning( "Configuration file exists at %s, reusing this directory.\n\nConsider" - " moving toml configuration files to %s, as support for the legacy directory" - " will be removed in an upcoming release.", + " moving toml configuration files to %s, as support for the legacy" + " directory will be removed in an upcoming release.", _LEGACY_CONFIG_DIR, CONFIG_DIR, ) From f2f3a81578261728d2f1d52150c72983aa45f1f8 Mon Sep 17 00:00:00 2001 From: Chip Pate Date: Tue, 20 Dec 2022 15:59:08 -0500 Subject: [PATCH 3/4] Update `toml` to `TOML` in string Co-authored-by: Bartosz Sokorski --- src/poetry/locations.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/poetry/locations.py b/src/poetry/locations.py index 7dd84f4b38a..bccea3b2f96 100644 --- a/src/poetry/locations.py +++ b/src/poetry/locations.py @@ -34,7 +34,7 @@ if any(file.exists() for file in (auth_toml, config_toml)): logger.warning( "Configuration file exists at %s, reusing this directory.\n\nConsider" - " moving toml configuration files to %s, as support for the legacy" + " moving TOML configuration files to %s, as support for the legacy" " directory will be removed in an upcoming release.", _LEGACY_CONFIG_DIR, CONFIG_DIR, From 7cc4ebd5dba12651d80f7dfe6164a970ce66964f Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Sun, 22 Jan 2023 21:46:12 +0000 Subject: [PATCH 4/4] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- src/poetry/locations.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/poetry/locations.py b/src/poetry/locations.py index ba5a7a01b58..7d10f7d11d8 100644 --- a/src/poetry/locations.py +++ b/src/poetry/locations.py @@ -34,9 +34,12 @@ if any(file.exists() for file in (auth_toml, config_toml)): logger.warning( ( - "Configuration file exists at %s, reusing this directory.\n\nConsider" - " moving TOML configuration files to %s, as support for the legacy" - " directory will be removed in an upcoming release.", + ( + "Configuration file exists at %s, reusing this" + " directory.\n\nConsider moving TOML configuration files to %s, as" + " support for the legacy directory will be removed in an upcoming" + " release." + ), ), _LEGACY_CONFIG_DIR, CONFIG_DIR,