Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade poetry core to 1.0.2 (1.1) #3677

Merged
merged 2 commits into from
Feb 12, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .cirrus.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
freebsd_instance:
image_family: freebsd-12-1-snap
image_family: freebsd-12-2

test_task:
name: "Tests / FreeBSD / "
Expand Down
8 changes: 4 additions & 4 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 6 additions & 1 deletion poetry/mixology/incompatibility.py
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,12 @@ def _terse(self, term, allow_every=False):
if allow_every and term.constraint.is_any():
return "every version of {}".format(term.dependency.complete_name)

return str(term.dependency)
if term.dependency.is_root:
return term.dependency.pretty_name

return "{} ({})".format(
term.dependency.pretty_name, term.dependency.pretty_constraint
)

def _single_term_where(self, callable): # type: (callable) -> Term
found = None
Expand Down
6 changes: 5 additions & 1 deletion poetry/mixology/term.py
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,11 @@ def _non_empty_term(self, constraint, is_positive):
return Term(self.dependency.with_constraint(constraint), is_positive)

def __str__(self):
return "{}{}".format("not " if not self.is_positive() else "", self._dependency)
return "{} {} ({})".format(
"not " if not self.is_positive() else "",
self._dependency.pretty_name,
self._dependency.pretty_constraint,
)

def __repr__(self):
return "<Term {}>".format(str(self))
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ classifiers = [
[tool.poetry.dependencies]
python = "~2.7 || ^3.5"

poetry-core = "^1.0.0"
poetry-core = "^1.0.2"
cleo = "^0.8.1"
clikit = "^0.6.2"
crashtest = { version = "^0.3.0", python = "^3.6" }
Expand Down