Commit a58a0e8f by Pablo Emídio S.S Committed by GitHub

Fix: Misconfiguration in ask dependency interactive (#7569)

parent 3e32a4f8
......@@ -292,6 +292,11 @@ You can specify a package in the following forms:
)
question.set_validator(self._validate_package)
follow_up_question = self.create_question(
"\nAdd a package (leave blank to skip):"
)
follow_up_question.set_validator(self._validate_package)
package = self.ask(question)
while package:
constraint = self._parse_requirements([package])[0]
......@@ -303,7 +308,7 @@ You can specify a package in the following forms:
):
self.line(f"Adding <info>{package}</info>")
result.append(constraint)
package = self.ask("\nAdd a package (leave blank to skip):")
package = self.ask(follow_up_question)
continue
canonicalized_name = canonicalize_name(constraint["name"])
......@@ -371,7 +376,7 @@ You can specify a package in the following forms:
result.append(constraint)
if self.io.is_interactive():
package = self.ask("\nAdd a package (leave blank to skip):")
package = self.ask(follow_up_question)
return result
......
......@@ -114,7 +114,7 @@ def _parse_dependency_specification_simple(
require: DependencySpec = {}
if " " in pair:
name, version = pair.split(" ", 2)
name, version = pair.split(" ", 1)
extras_m = re.search(r"\[([\w\d,-_]+)\]$", name)
if extras_m:
extras = [e.strip() for e in extras_m.group(1).split(",")]
......
......@@ -595,9 +595,6 @@ pytest = "^3.6.0"
def test_interactive_with_wrong_dependency_inputs(
tester: CommandTester, repo: TestRepository
):
repo.add_package(get_package("pendulum", "2.0.0"))
repo.add_package(get_package("pytest", "3.6.0"))
inputs = [
"my-package", # Package name
"1.2.3", # Version
......@@ -606,10 +603,8 @@ def test_interactive_with_wrong_dependency_inputs(
"MIT", # License
"^3.8", # Python
"", # Interactive packages
"foo 1.19.2",
"pendulum 2.0.0 foo", # Package name and constraint (invalid)
"pendulum 2.0.0", # Package name and constraint (invalid)
"pendulum 2.0.0", # Package name and constraint (invalid)
"pendulum 2.0.0", # Package name and constraint (invalid)
"pendulum@^2.0.0", # Package name and constraint (valid)
"", # End package selection
"", # Interactive dev packages
......@@ -633,6 +628,7 @@ packages = [{include = "my_package"}]
[tool.poetry.dependencies]
python = "^3.8"
foo = "1.19.2"
pendulum = "^2.0.0"
[tool.poetry.group.dev.dependencies]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment