Merge pull request jazzband#413 from pjenvey/generate-hashes-readability

improve --generate-hashes readability
truthiswill · Nov 24, 2016 · f69eb10 · f69eb10
2 parents c08c0f4 + 939eb45
commit f69eb10
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/piptools/writer.py b/piptools/writer.py
@@ -131,7 +131,9 @@ def _format_requirement(self, ireq, reverse_dependencies, primary_packages, incl
         # Annotate what packages this package is required by
         required_by = reverse_dependencies.get(ireq.name.lower(), [])
         if required_by:
-            line = line.ljust(24)
-            annotation = ', '.join(sorted(required_by))
-            line += comment('  # via ' + annotation)
+            annotation = ", ".join(sorted(required_by))
+            line = "{:24}{}{}".format(
+                line,
+                " \\\n    " if ireq_hashes else "  ",
+                comment("# via " + annotation))
         return line
diff --git a/tests/test_writer.py b/tests/test_writer.py
@@ -23,7 +23,7 @@ def test_format_requirement_annotation_editable(from_editable, writer):
     assert (writer._format_requirement(ireq,
                                        reverse_dependencies,
                                        primary_packages=[]) ==
-            '-e git+git://fake.org/x/y.git#egg=y' + comment('  # via xyz'))
+            '-e git+git://fake.org/x/y.git#egg=y  ' + comment('# via xyz'))
 
 
 def test_format_requirement_annotation(from_line, writer):
@@ -33,7 +33,7 @@ def test_format_requirement_annotation(from_line, writer):
     assert (writer._format_requirement(ireq,
                                        reverse_dependencies,
                                        primary_packages=[]) ==
-            'test==1.2               ' + comment('  # via xyz'))
+            'test==1.2                 ' + comment('# via xyz'))
 
 
 def test_format_requirement_annotation_case_sensitive(from_line, writer):
@@ -43,7 +43,7 @@ def test_format_requirement_annotation_case_sensitive(from_line, writer):
     assert (writer._format_requirement(ireq,
                                        reverse_dependencies,
                                        primary_packages=[]) ==
-            'Test==1.2               ' + comment('  # via xyz'))
+            'Test==1.2                 ' + comment('# via xyz'))
 
 
 def test_format_requirement_not_for_primary(from_line, writer):