Merge branch 'feature/enhance-option-lines' of github.com:tonyseek/pi…

…p-tools

Merge latest changes from jazzband#448 PR.

Also updated the Change Log entry.

* 'feature/enhance-option-lines' of github.com:tonyseek/pip-tools:
  Rename "no-trusted-host" to "no-emit-trusted-host"

CHANGELOG.md

@@ -1,7 +1,7 @@
 # 1.8.1 (unreleased)
 
 - Recalculate secondary dependencies between rounds (#378)
-- Add "--emit-trusted-host/--no-trusted-host" option
+- Add "--emit-trusted-host/--no-emit-trusted-host" option
 - Deduplicate the option lines of output
 - Ignore pkg-resources
 - Support pinned VCS dependencies

piptools/scripts/compile.py

@@ -46,8 +46,8 @@ class PipCommand(pip.basecommand.Command):
               help="Add header to generated file")
 @click.option('--index/--no-index', is_flag=True, default=True,
               help="Add index URL to generated file")
-@click.option('--emit-trusted-host/--no-trusted-host', is_flag=True, default=True,
-              help="Add trusted host option to generated file")
+@click.option('--emit-trusted-host/--no-emit-trusted-host', is_flag=True,
+              default=True, help="Add trusted host option to generated file")
 @click.option('--annotate/--no-annotate', is_flag=True, default=True,
               help="Annotate results, indicating where dependencies come from")
 @click.option('-U', '--upgrade', is_flag=True, default=False,

piptools/writer.py

@@ -40,7 +40,7 @@ def write_header(self):
             if not self.emit_index:
                 params += ['--no-index']
             if not self.emit_trusted_host:
-                params += ['--no-trusted-host']
+                params += ['--no-emit-trusted-host']
             if not self.annotate:
                 params += ['--no-annotate']
             if self.generate_hashes:

tests/test_cli.py

@@ -128,10 +128,10 @@ def test_trusted_host_no_emit(pip_conf):
         open('requirements.in', 'w').close()
         out = runner.invoke(cli, ['-v',
                                   '--trusted-host', 'example.com',
-                                  '--no-trusted-host'])
+                                  '--no-emit-trusted-host'])
         print(out.output)
         assert '--trusted-host example.com' not in out.output
-        assert '--no-trusted-host' in out.output
+        assert '--no-emit-trusted-host' in out.output
 
 
 def test_realistic_complex_sub_dependencies(tmpdir):