Skip to content

Improve PEP-440 support for versions #140

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.

Sign up for GitHub

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

Merged
abn merged 6 commits into from
Mar 27, 2021
Merged

Improve PEP-440 support for versions #140

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d827952
Improve PEP-440 support for versions
abn Sep 4, 2020
53f484d
tests: add PEP-440 comparison examples
abn Mar 22, 2021
6036d92
pep440: add helper methods and fixes
abn Mar 25, 2021
01094c8
pep440: fix bugs
abn Mar 25, 2021
009752d
Update pyproject to include compat
abn Mar 25, 2021
408cb8d
pep440: ensure epoch is retained on version bumps
abn Mar 27, 2021
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
Prev Previous commit
Next Next commit
pep440: fix bugs
  • Loading branch information
@abn
abn committed Mar 25, 2021
commit 01094c88f87f2aa6a69a5a88208fee4ed135e691
8 changes: 4 additions & 4 deletions poetry/core/packages/dependency.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -551,17 +551,17 @@ def create_from_pep_508(
if parsed_version.precision == 1:
if op == "<=":
op = "<"
version = parsed_version.next_major.text
version = parsed_version.next_major().text
elif op == ">":
op = ">="
version = parsed_version.next_major.text
version = parsed_version.next_major().text
elif parsed_version.precision == 2:
if op == "<=":
op = "<"
version = parsed_version.next_minor.text
version = parsed_version.next_minor().text
elif op == ">":
op = ">="
version = parsed_version.next_minor.text
version = parsed_version.next_minor().text
elif op in ("in", "not in"):
versions = []
for v in re.split("[ ,]+", version):
Expand Down
8 changes: 4 additions & 4 deletions poetry/core/packages/utils/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,17 +313,17 @@ def get_python_constraint_from_marker(
if parsed_version.precision == 1:
if op == "<=":
op = "<"
version = parsed_version.next_major.text
version = parsed_version.next_major().text
elif op == ">":
op = ">="
version = parsed_version.next_major.text
version = parsed_version.next_major().text
elif parsed_version.precision == 2:
if op == "<=":
op = "<"
version = parsed_version.next_minor.text
version = parsed_version.next_minor().text
elif op == ">":
op = ">="
version = parsed_version.next_minor.text
version = parsed_version.next_minor().text
elif op in ("in", "not in"):
versions = []
for v in re.split("[ ,]+", version):
Expand Down