Complete the removal of poetry-export

This reverts commit f59728d.
python-poetry · Nov 11, 2023 · aaeb67d · aaeb67d
1 parent 8c7f3be
commit aaeb67d
Show file tree

Hide file tree

Showing 8 changed files with 2 additions and 83 deletions.
diff --git a/docs/cli.md b/docs/cli.md
@@ -720,17 +720,9 @@ This command exports the lock file to other formats.
 poetry export -f requirements.txt --output requirements.txt
 ```
 
-{{% warning %}}
-This command is provided by the [Export Poetry Plugin](https://github.com/python-poetry/poetry-plugin-export).
-In a future version of Poetry this plugin will not be installed by default anymore.
-In order to avoid a breaking change and make your automation forward-compatible,
-please install poetry-plugin-export explicitly.
-See [Using plugins]({{< relref "plugins#using-plugins" >}}) for details on how to install a plugin.
-{{% /warning %}}
-
 {{% note %}}
-This command is also available as a pre-commit hook.
-See [pre-commit hooks]({{< relref "pre-commit-hooks#poetry-export" >}}) for more information.
+This command is provided by the [Export Poetry Plugin](https://github.com/python-poetry/poetry-plugin-export)
+and is also available as a pre-commit hook. See [pre-commit hooks]({{< relref "pre-commit-hooks#poetry-export" >}}) for more information.
 {{% /note %}}
 
 {{% note %}}

diff --git a/docs/pre-commit-hooks.md b/docs/pre-commit-hooks.md
@@ -53,10 +53,6 @@ For more information see the [lock command]({{< relref "cli#lock" >}}).
 The `poetry-export` hook calls the `poetry export` command
 to sync your `requirements.txt` file with your current dependencies.
 
-{{% warning %}}
-This hook is provided by the [Export Poetry Plugin](https://github.com/python-poetry/poetry-plugin-export).
-{{% /warning %}}
-
 {{% note %}}
 This hook is provided by the [Export Poetry Plugin](https://github.com/python-poetry/poetry-plugin-export).
 

diff --git a/src/poetry/config/config.py b/src/poetry/config/config.py
@@ -133,9 +133,6 @@ class Config:
             "max-workers": None,
             "no-binary": None,
         },
-        "warnings": {
-            "export": True,
-        },
     }
 
     def __init__(
@@ -298,7 +295,6 @@ def _get_normalizer(name: str) -> Callable[[str], Any]:
             "experimental.system-git-client",
             "installer.modern-installation",
             "installer.parallel",
-            "warnings.export",
         }:
             return boolean_normalizer
 

diff --git a/src/poetry/console/application.py b/src/poetry/console/application.py
@@ -354,12 +354,6 @@ def _load_plugins(self, io: IO | None = None) -> None:
             manager.load_plugins()
             manager.activate(self)
 
-            # We have to override the command from poetry-plugin-export
-            # with the wrapper.
-            if self.command_loader.has("export"):
-                del self.command_loader._factories["export"]
-            self.command_loader._factories["export"] = load_command("export")
-
         self._plugins_loaded = True
 
     @property

diff --git a/src/poetry/console/commands/config.py b/src/poetry/console/commands/config.py
@@ -77,7 +77,6 @@ def unique_config_values(self) -> dict[str, tuple[Any, Any]]:
                 PackageFilterPolicy.validator,
                 PackageFilterPolicy.normalize,
             ),
-            "warnings.export": (boolean_validator, boolean_normalizer),
         }
 
         return unique_config_values

diff --git a/src/poetry/console/commands/export.py b/src/poetry/console/commands/export.py
diff --git a/tests/console/commands/test_config.py b/tests/console/commands/test_config.py
@@ -67,7 +67,6 @@ def test_list_displays_default_value_if_not_set(
 virtualenvs.path = {venv_path}  # {config_cache_dir / 'virtualenvs'}
 virtualenvs.prefer-active-python = false
 virtualenvs.prompt = "{{project_name}}-py{{python_version}}"
-warnings.export = true
 """
 
     assert tester.io.fetch_output() == expected
@@ -97,7 +96,6 @@ def test_list_displays_set_get_setting(
 virtualenvs.path = {venv_path}  # {config_cache_dir / 'virtualenvs'}
 virtualenvs.prefer-active-python = false
 virtualenvs.prompt = "{{project_name}}-py{{python_version}}"
-warnings.export = true
 """
 
     assert config.set_config_source.call_count == 0  # type: ignore[attr-defined]
@@ -148,7 +146,6 @@ def test_unset_setting(
 virtualenvs.path = {venv_path}  # {config_cache_dir / 'virtualenvs'}
 virtualenvs.prefer-active-python = false
 virtualenvs.prompt = "{{project_name}}-py{{python_version}}"
-warnings.export = true
 """
     assert config.set_config_source.call_count == 0  # type: ignore[attr-defined]
     assert tester.io.fetch_output() == expected
@@ -177,7 +174,6 @@ def test_unset_repo_setting(
 virtualenvs.path = {venv_path}  # {config_cache_dir / 'virtualenvs'}
 virtualenvs.prefer-active-python = false
 virtualenvs.prompt = "{{project_name}}-py{{python_version}}"
-warnings.export = true
 """
     assert config.set_config_source.call_count == 0  # type: ignore[attr-defined]
     assert tester.io.fetch_output() == expected
@@ -305,7 +301,6 @@ def test_list_displays_set_get_local_setting(
 virtualenvs.path = {venv_path}  # {config_cache_dir / 'virtualenvs'}
 virtualenvs.prefer-active-python = false
 virtualenvs.prompt = "{{project_name}}-py{{python_version}}"
-warnings.export = true
 """
 
     assert config.set_config_source.call_count == 1  # type: ignore[attr-defined]
@@ -343,7 +338,6 @@ def test_list_must_not_display_sources_from_pyproject_toml(
 virtualenvs.path = {venv_path}  # {config_cache_dir / 'virtualenvs'}
 virtualenvs.prefer-active-python = false
 virtualenvs.prompt = "{{project_name}}-py{{python_version}}"
-warnings.export = true
 """
 
     assert tester.io.fetch_output() == expected

diff --git a/tests/console/commands/test_export.py b/tests/console/commands/test_export.py