Skip to content

Remove unsupported characters in Pypi from_native implementation #57

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
TG1999 merged 2 commits into from
Apr 5, 2022
Merged

Remove unsupported characters in Pypi from_native implementation #57

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a6bc313
Reference: https://github.com/nexB/univers/issues/48
TG1999 Mar 31, 2022
2cf3d48
Add tests
TG1999 Apr 5, 2022
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
4 changes: 3 additions & 1 deletion src/univers/version_range.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -539,7 +539,9 @@ def from_native(cls, string):
if ";" in string:
raise InvalidVersionRange(f"Unsupported PyPI environment marker: {string!r}")

unsupported_chars = ";<>!=\\/|{}()`?'\"\t\n "
unsupported_chars = ";\\/|{}()`?'\"\t\n "
string = string.replace(" ", "")

if any(c in string for c in unsupported_chars):
raise InvalidVersionRange(
f"Unsupported character: {unsupported_chars!r} " f"in PyPI version: {string!r}"
Expand Down
4 changes: 2 additions & 2 deletions tests/test_version_range.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ def test_VersionRange_contains_works_for_star_range(self):
def test_PypiVersionRange_raises_ivr_for_unsupported_ranges(self):
try:
PypiVersionRange.from_native(
"~= 0.9, >= 1.0, != 1.3.4.*, < 2.0, ~= 1.3.4.*, ===1.0, ==1.*"
"~= 0.9, >= 1.0, != 1.3.4.*, < 2.0, ~= 1.3.4.*, ===1.0, ==1.* )"
)
raise Exception("Exception not raised")
except InvalidVersionRange as ivre:
Expand All @@ -211,7 +211,7 @@ def test_PypiVersionRange_raises_ivr_for_invalid_ranges(self):
PypiVersionRange.from_native("~= 1.3, ===1.0, ==1.*")
raise Exception("Exception not raised")
except InvalidVersionRange as ivre:
assert str(ivre).startswith("Unsupported character")
assert "Unsupported PyPI version constraint operator" in str(ivre)

def test_NpmVersionRange_from_native_with_compatible_with_version_operator(self):
npm_range = "^1.2.9"
Expand Down