move always-copy option to virtualenvs.options namespace

fix issue for showing all configs when options has more then two level

Author: finswimmer

Diff for: poetry/config/config.py

@@ -36,7 +36,7 @@ class Config(object):
             "create": True,
             "in-project": None,
             "path": os.path.join("{cache-dir}", "virtualenvs"),
-            "always-copy": False,
+            "options": {"always-copy": False},
         },
         "experimental": {"new-installer": True},
     }
@@ -88,7 +88,11 @@ def _all(config, parent_key=""):
             for key in config:
                 value = self.get(parent_key + key)
                 if isinstance(value, dict):
-                    all_[key] = _all(config[key], parent_key=key + ".")
+                    if parent_key != "":
+                        current_parent = parent_key + key + "."
+                    else:
+                        current_parent = key + "."
+                    all_[key] = _all(config[key], parent_key=current_parent)
                     continue
 
                 all_[key] = value
@@ -132,14 +136,22 @@ def process(self, value):  # type: (Any) -> Any
         return re.sub(r"{(.+?)}", lambda m: self.get(m.group(1)), value)
 
     def _get_validator(self, name):  # type: (str) -> Callable
-        if name in {"virtualenvs.create", "virtualenvs.in-project"}:
+        if name in {
+            "virtualenvs.create",
+            "virtualenvs.in-project",
+            "virtualenvs.options.always-copy",
+        }:
             return boolean_validator
 
         if name == "virtualenvs.path":
             return str
 
     def _get_normalizer(self, name):  # type: (str) -> Callable
-        if name in {"virtualenvs.create", "virtualenvs.in-project"}:
+        if name in {
+            "virtualenvs.create",
+            "virtualenvs.in-project",
+            "virtualenvs.options.always-copy",
+        }:
             return boolean_normalizer
 
         if name == "virtualenvs.path":

Diff for: poetry/console/commands/config.py

@@ -58,12 +58,16 @@ def unique_config_values(self):
                 lambda val: str(Path(val)),
                 str(Path(CACHE_DIR) / "virtualenvs"),
             ),
-            "virtualenvs.always-copy": (boolean_validator, boolean_normalizer, False),
             "experimental.new-installer": (
                 boolean_validator,
                 boolean_normalizer,
                 True,
             ),
+            "virtualenvs.options.always-copy": (
+                boolean_validator,
+                boolean_normalizer,
+                False,
+            ),
         }
 
         return unique_config_values

Diff for: poetry/utils/env.py

@@ -645,7 +645,7 @@ def create_venv(
             self.build_venv(
                 venv,
                 executable=executable,
-                always_copy=self._poetry.config.get("virtualenvs.always-copy"),
+                flags=self._poetry.config.get("virtualenvs.options"),
             )
         else:
             if force:
@@ -662,7 +662,7 @@ def create_venv(
                 self.build_venv(
                     venv,
                     executable=executable,
-                    always_copy=self._poetry.config.get("virtualenvs.always-copy"),
+                    flags=self._poetry.config.get("virtualenvs.options"),
                 )
             elif io.is_very_verbose():
                 io.write_line("Virtualenv <c1>{}</> already exists.".format(name))
@@ -687,8 +687,10 @@ def create_venv(
 
     @classmethod
     def build_venv(
-        cls, path, executable=None, always_copy=False
-    ):  # type: (Union[Path,str], Optional[Union[str, Path]], bool) -> virtualenv.run.session.Session
+        cls, path, executable=None, flags=None
+    ):  # type: (Union[Path,str], Optional[Union[str, Path]], Dict[str, bool]) -> virtualenv.run.session.Session
+        flags = flags or {}
+
         if isinstance(executable, Path):
             executable = executable.resolve().as_posix()
 
@@ -700,8 +702,9 @@ def build_venv(
             str(path),
         ]
 
-        if always_copy:
-            args.insert(0, "--always-copy")
+        for flag, value in flags.items():
+            if value is True:
+                args.insert(0, "--{}".format(flag))
 
         return virtualenv.cli_run(args)
 

Diff for: tests/console/commands/env/helpers.py

@@ -6,7 +6,7 @@
 
 
 def build_venv(
-    path, executable=None, always_copy=False
+    path, executable=None, flags=None
 ):  # type: (Union[Path,str], Optional[str], bool) -> ()
     Path(path).mkdir(parents=True, exist_ok=True)
 

Diff for: tests/console/commands/env/test_use.py

@@ -51,7 +51,7 @@ def test_activate_activates_non_existing_virtualenv_no_envs_file(
 
     venv_py37 = venv_cache / "{}-py3.7".format(venv_name)
     mock_build_env.assert_called_with(
-        venv_py37, executable="python3.7", always_copy=False
+        venv_py37, executable="python3.7", flags={"always-copy": False}
     )
 
     envs_file = TOMLFile(venv_cache / "envs.toml")

Diff for: tests/console/commands/test_config.py

@@ -17,9 +17,9 @@ def test_list_displays_default_value_if_not_set(tester, config):
 
     expected = """cache-dir = "/foo"
 experimental.new-installer = true
-virtualenvs.always-copy = false
 virtualenvs.create = true
 virtualenvs.in-project = null
+virtualenvs.options.always-copy = false
 virtualenvs.path = {path}  # /foo{sep}virtualenvs
 """.format(
         path=json.dumps(os.path.join("{cache-dir}", "virtualenvs")), sep=os.path.sep
@@ -35,9 +35,9 @@ def test_list_displays_set_get_setting(tester, config):
 
     expected = """cache-dir = "/foo"
 experimental.new-installer = true
-virtualenvs.always-copy = false
 virtualenvs.create = false
 virtualenvs.in-project = null
+virtualenvs.options.always-copy = false
 virtualenvs.path = {path}  # /foo{sep}virtualenvs
 """.format(
         path=json.dumps(os.path.join("{cache-dir}", "virtualenvs")), sep=os.path.sep
@@ -75,9 +75,9 @@ def test_list_displays_set_get_local_setting(tester, config):
 
     expected = """cache-dir = "/foo"
 experimental.new-installer = true
-virtualenvs.always-copy = false
 virtualenvs.create = false
 virtualenvs.in-project = null
+virtualenvs.options.always-copy = false
 virtualenvs.path = {path}  # /foo{sep}virtualenvs
 """.format(
         path=json.dumps(os.path.join("{cache-dir}", "virtualenvs")), sep=os.path.sep

Diff for: tests/utils/test_env.py

@@ -119,7 +119,7 @@ def test_env_get_venv_with_venv_folder_present(
 
 
 def build_venv(
-    path, executable=None, always_copy=False
+    path, executable=None, flags=None
 ):  # type: (Union[Path,str], Optional[str], bool) -> ()
     os.mkdir(str(path))
 
@@ -160,7 +160,7 @@ def test_activate_activates_non_existing_virtualenv_no_envs_file(
     m.assert_called_with(
         Path(tmp_dir) / "{}-py3.7".format(venv_name),
         executable="python3.7",
-        always_copy=False,
+        flags={"always-copy": False},
     )
 
     envs_file = TOMLFile(Path(tmp_dir) / "envs.toml")
@@ -280,7 +280,7 @@ def test_activate_activates_different_virtualenv_with_envs_file(
     m.assert_called_with(
         Path(tmp_dir) / "{}-py3.6".format(venv_name),
         executable="python3.6",
-        always_copy=False,
+        flags={"always-copy": False},
     )
 
     assert envs_file.exists()
@@ -334,7 +334,7 @@ def test_activate_activates_recreates_for_different_patch(
     build_venv_m.assert_called_with(
         Path(tmp_dir) / "{}-py3.7".format(venv_name),
         executable="python3.7",
-        always_copy=False,
+        flags={"always-copy": False},
     )
     remove_venv_m.assert_called_with(Path(tmp_dir) / "{}-py3.7".format(venv_name))
 
@@ -664,7 +664,7 @@ def test_create_venv_tries_to_find_a_compatible_python_executable_using_generic_
     m.assert_called_with(
         Path("/foo/virtualenvs/{}-py3.7".format(venv_name)),
         executable="python3",
-        always_copy=False,
+        flags={"always-copy": False},
     )
 
 
@@ -690,7 +690,7 @@ def test_create_venv_tries_to_find_a_compatible_python_executable_using_specific
     m.assert_called_with(
         Path("/foo/virtualenvs/{}-py3.9".format(venv_name)),
         executable="python3.9",
-        always_copy=False,
+        flags={"always-copy": False},
     )
 
 
@@ -779,7 +779,7 @@ def test_create_venv_uses_patch_version_to_detect_compatibility(
             )
         ),
         executable=None,
-        always_copy=False,
+        flags={"always-copy": False},
     )
 
 
@@ -817,7 +817,7 @@ def test_create_venv_uses_patch_version_to_detect_compatibility_with_executable(
             )
         ),
         executable="python{}.{}".format(version.major, version.minor - 1),
-        always_copy=False,
+        flags={"always-copy": False},
     )
 
 
@@ -849,7 +849,9 @@ def test_activate_with_in_project_setting_does_not_fail_if_no_venvs_dir(
     manager.activate("python3.7", NullIO())
 
     m.assert_called_with(
-        poetry.file.parent / ".venv", executable="python3.7", always_copy=False
+        poetry.file.parent / ".venv",
+        executable="python3.7",
+        flags={"always-copy": False},
     )
 
     envs_file = TOMLFile(Path(tmp_dir) / "virtualenvs" / "envs.toml")