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

Remove specifiers for unsafe requirements #294

Merged
merged 1 commit into from
Jan 15, 2016
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
6 changes: 4 additions & 2 deletions piptools/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,17 @@ def make_install_requirement(name, version, extras):
return InstallRequirement.from_line('{}{}=={}'.format(name, extras_string, str(version)))


def format_requirement(ireq):
def format_requirement(ireq, include_specifier=True):
"""
Generic formatter for pretty printing InstallRequirements to the terminal
in a less verbose way than using its `__str__` method.
"""
if ireq.editable:
line = '-e {}'.format(ireq.link)
else:
elif include_specifier:
line = str(ireq.req)
else:
line = ireq.req.project_name
return line


Expand Down
6 changes: 3 additions & 3 deletions piptools/writer.py
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ def _iter_lines(self, results, reverse_dependencies, primary_packages):
yield comment('# considered to be unsafe in a requirements file:')

for ireq in unsafe_packages:
line = self._format_requirement(ireq, reverse_dependencies, primary_packages)
line = self._format_requirement(ireq, reverse_dependencies, primary_packages, include_specifier=False)
yield comment('# ' + line)

def write(self, results, reverse_dependencies, primary_packages):
Expand All @@ -96,8 +96,8 @@ def write(self, results, reverse_dependencies, primary_packages):
f.write(unstyle(line).encode('utf-8'))
f.write(os.linesep.encode('utf-8'))

def _format_requirement(self, ireq, reverse_dependencies, primary_packages):
line = format_requirement(ireq)
def _format_requirement(self, ireq, reverse_dependencies, primary_packages, include_specifier=True):
line = format_requirement(ireq, include_specifier=include_specifier)
if not self.annotate or ireq.name in primary_packages:
return line

Expand Down
1 change: 1 addition & 0 deletions tests/test_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
def test_format_requirement(from_line):
ireq = from_line('test==1.2')
assert format_requirement(ireq) == 'test==1.2'
assert format_requirement(ireq, include_specifier=False) == 'test'


def test_format_requirement_editable(from_editable):
Expand Down