mirror of
https://github.com/pre-commit/pre-commit-hooks.git
synced 2026-05-15 05:30:33 +00:00
Fix requirements-txt-fixer ordering for index URLs
This commit is contained in:
parent
f1dff44d3a
commit
b3286e6e19
2 changed files with 20 additions and 1 deletions
|
|
@ -36,6 +36,15 @@ class Requirement:
|
||||||
|
|
||||||
return name[:m.start()]
|
return name[:m.start()]
|
||||||
|
|
||||||
|
@property
|
||||||
|
def sort_key(self) -> tuple[int, bytes]:
|
||||||
|
if self.name == b'--index-url':
|
||||||
|
return (0, self.name)
|
||||||
|
elif self.name == b'--extra-index-url':
|
||||||
|
return (1, self.name)
|
||||||
|
else:
|
||||||
|
return (2, self.name)
|
||||||
|
|
||||||
def __lt__(self, requirement: Requirement) -> bool:
|
def __lt__(self, requirement: Requirement) -> bool:
|
||||||
# \n means top of file comment, so always return True,
|
# \n means top of file comment, so always return True,
|
||||||
# otherwise just do a string comparison with value.
|
# otherwise just do a string comparison with value.
|
||||||
|
|
@ -50,7 +59,7 @@ class Requirement:
|
||||||
# with comments is kept)
|
# with comments is kept)
|
||||||
if self.name == requirement.name:
|
if self.name == requirement.name:
|
||||||
return bool(self.comments) > bool(requirement.comments)
|
return bool(self.comments) > bool(requirement.comments)
|
||||||
return self.name < requirement.name
|
return self.sort_key < requirement.sort_key
|
||||||
|
|
||||||
def is_complete(self) -> bool:
|
def is_complete(self) -> bool:
|
||||||
return (
|
return (
|
||||||
|
|
|
||||||
|
|
@ -107,6 +107,16 @@ from pre_commit_hooks.requirements_txt_fixer import Requirement
|
||||||
PASS,
|
PASS,
|
||||||
b'a=2.0.0 \\\n --hash=sha256:abcd\nb==1.0.0\n',
|
b'a=2.0.0 \\\n --hash=sha256:abcd\nb==1.0.0\n',
|
||||||
),
|
),
|
||||||
|
|
||||||
|
(
|
||||||
|
b'--extra-index-url https://example-extra/simple\n'
|
||||||
|
b'--index-url https://example-main/simple\n'
|
||||||
|
b'requests==2.31.0\n',
|
||||||
|
FAIL,
|
||||||
|
b'--index-url https://example-main/simple\n'
|
||||||
|
b'--extra-index-url https://example-extra/simple\n'
|
||||||
|
b'requests==2.31.0\n',
|
||||||
|
),
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
def test_integration(input_s, expected_retval, output, tmpdir):
|
def test_integration(input_s, expected_retval, output, tmpdir):
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue