sync: Use options from the txt file

piptools/scripts/_repo.py

@@ -0,0 +1,59 @@
+import optparse
+
+import pip
+
+from ..repositories import PyPIRepository
+
+
+class PipCommand(pip.basecommand.Command):
+ name = 'PipCommand'
+
+
+def get_pip_options_and_pypi_repository(
+ index_url=None, extra_index_url=None, no_index=None,
+ find_links=None, cert=None, client_cert=None, pre=None,
+ trusted_host=None):
+ pip_command = get_pip_command()
+
+ pip_args = []
+ if find_links:
+ for link in find_links:
+ pip_args.extend(['-f', link])
+ if index_url:
+ pip_args.extend(['-i', index_url])
+ if no_index:
+ pip_args.extend(['--no-index'])
+ if extra_index_url:
+ for extra_index in extra_index_url:
+ pip_args.extend(['--extra-index-url', extra_index])
+ if cert:
+ pip_args.extend(['--cert', cert])
+ if client_cert:
+ pip_args.extend(['--client-cert', client_cert])
+ if pre:
+ pip_args.extend(['--pre'])
+ if trusted_host:
+ for host in trusted_host:
+ pip_args.extend(['--trusted-host', host])
+
+ pip_options, _ = pip_command.parse_args(pip_args)
+
+ session = pip_command._build_session(pip_options)
+ repository = PyPIRepository(pip_options, session)
+ return (pip_options, repository)
+
+
+def get_pip_command():
+ # Use pip's parser for pip.conf management and defaults.
+ # General options (find_links, index_url, extra_index_url, trusted_host,
+ # and pre) are defered to pip.
+ pip_command = PipCommand()
+ index_opts = pip.cmdoptions.make_option_group(
+ pip.cmdoptions.index_group,
+ pip_command.parser,
+ )
+ pip_command.parser.insert_option_group(0, index_opts)
+ pip_command.parser.add_option(
+ optparse.Option('--pre', action='store_true', default=False))
+
+ return pip_command

piptools/scripts/compile.py

@@ -2,7 +2,6 @@
 from __future__ import (absolute_import, division, print_function,
  unicode_literals)
 
-import optparse
 import os
 import sys
 import tempfile
@@ -13,11 +12,12 @@
 from .. import click
 from ..exceptions import PipToolsError
 from ..logging import log
-from ..repositories import LocalRequirementsRepository, PyPIRepository
+from ..repositories import LocalRequirementsRepository
 from ..resolver import Resolver
 from ..utils import (assert_compatible_pip_version, dedup, is_pinned_requirement,
  key_from_req, UNSAFE_PACKAGES)
 from ..writer import OutputWriter
+from ._repo import get_pip_options_and_pypi_repository
 
 # Make sure we're using a compatible version of pip
 assert_compatible_pip_version()
@@ -103,31 +103,10 @@ def cli(verbose, dry_run, pre, rebuild, find_links, index_url, extra_index_url,
  # Setup
  ###
 
- pip_command = get_pip_command()
-
- pip_args = []
- if find_links:
- for link in find_links:
- pip_args.extend(['-f', link])
- if index_url:
- pip_args.extend(['-i', index_url])
- if extra_index_url:
- for extra_index in extra_index_url:
- pip_args.extend(['--extra-index-url', extra_index])
- if cert:
- pip_args.extend(['--cert', cert])
- if client_cert:
- pip_args.extend(['--client-cert', client_cert])
- if pre:
- pip_args.extend(['--pre'])
- if trusted_host:
- for host in trusted_host:
- pip_args.extend(['--trusted-host', host])
-
- pip_options, _ = pip_command.parse_args(pip_args)
-
- session = pip_command._build_session(pip_options)
- repository = PyPIRepository(pip_options, session)
+ (pip_options, repository) = get_pip_options_and_pypi_repository(
+ index_url=index_url, extra_index_url=extra_index_url,
+ find_links=find_links, cert=cert, client_cert=client_cert,
+ pre=pre, trusted_host=trusted_host)
 
  # Proxy with a LocalRequirementsRepository if --upgrade is not specified
  # (= default invocation)
@@ -244,18 +223,3 @@ def cli(verbose, dry_run, pre, rebuild, find_links, index_url, extra_index_url,
 
  if dry_run:
  log.warning('Dry-run, so nothing updated.')
-
-
-def get_pip_command():
- # Use pip's parser for pip.conf management and defaults.
- # General options (find_links, index_url, extra_index_url, trusted_host,
- # and pre) are defered to pip.
- pip_command = PipCommand()
- index_opts = pip.cmdoptions.make_option_group(
- pip.cmdoptions.index_group,
- pip_command.parser,
- )
- pip_command.parser.insert_option_group(0, index_opts)
- pip_command.parser.add_option(optparse.Option('--pre', action='store_true', default=False))
-
- return pip_command

piptools/scripts/sync.py

@@ -11,6 +11,7 @@
 from ..exceptions import PipToolsError
 from ..logging import log
 from ..utils import assert_compatible_pip_version, flat_map
+from ._repo import get_pip_options_and_pypi_repository
 
 # Make sure we're using a compatible version of pip
 assert_compatible_pip_version()
@@ -47,8 +48,15 @@ def cli(dry_run, force, find_links, index_url, extra_index_url, no_index, quiet,
  log.error('ERROR: ' + msg)
  sys.exit(2)
 
- requirements = flat_map(lambda src: pip.req.parse_requirements(src, session=True),
- src_files)
+ (pip_options, repository) = get_pip_options_and_pypi_repository(
+ index_url=index_url, extra_index_url=extra_index_url,
+ no_index=no_index, find_links=find_links)
+
+ def parse_req_file(filename):
+ return pip.req.parse_requirements(
+ filename, session=True, finder=repository.finder)
+
+ requirements = flat_map(parse_req_file, src_files)
 
  try:
  requirements = sync.merge(requirements, ignore_conflicts=force)
@@ -60,15 +68,15 @@ def cli(dry_run, force, find_links, index_url, extra_index_url, no_index, quiet,
  to_install, to_uninstall = sync.diff(requirements, installed_dists)
 
  install_flags = []
- for link in find_links or []:
+ for link in repository.finder.find_links or []:
  install_flags.extend(['-f', link])
- if no_index:
+ if not repository.finder.index_urls:
  install_flags.append('--no-index')
- if index_url:
- install_flags.extend(['-i', index_url])
- if extra_index_url:
- for extra_index in extra_index_url:
- install_flags.extend(['--extra-index-url', extra_index])
+ for (i, index_url) in enumerate(repository.finder.index_urls):
+ if i == 0:
+  install_flags.extend(['-i', index_url])
+ else:
+ install_flags.extend(['--extra-index-url', index_url])
 
  sys.exit(sync.sync(to_install, to_uninstall, verbose=(not quiet), dry_run=dry_run,
  install_flags=install_flags))

tests/test_cli.py

@@ -227,6 +227,39 @@ def test_sync_quiet(tmpdir):
  assert '-q' in call[0][0]
 
 
+@pytest.mark.parametrize('option_name', [
+ 'find-links', 'f', 'no-index', 'index-url', 'i', 'extra-index-url'])
+def test_sync_uses_opts_from_txt_file(option_name):
+ """sync command uses pip options from the txt file."""
+ (opt_in_txt_file, pip_opt) = {
+ 'find-links': ('--find-links ./pkg-dir', '-f ./pkg-dir'),
+ 'f': ('-f ./pkg-dir', '-f ./pkg-dir'),
+ 'no-index': ('--no-index', '--no-index'),
+ 'index-url': ('--index-url http://index-url', '-i http://index-url'),
+ 'i': ('-i http://index.localhost', '-i http://index.localhost'),
+ 'extra-index-url': (
+ '--extra-index-url http://extra-index.localhost',
+ '--extra-index-url http://extra-index.localhost'),
+ }[option_name]
+ runner = CliRunner()
+ with runner.isolated_filesystem():
+ with open('requirements.txt', 'w') as req_txt:
+ req_txt.write('{}\n'.format(opt_in_txt_file))
+ req_txt.write('foobar==0.42\n')
+
+ with mock.patch('piptools.sync.check_call') as check_call:
+ run_result = runner.invoke(sync_cli, ['-q'])
+ assert run_result.output == ''
+ assert run_result.exit_code == 0
+ number_of_install_calls = 0
+ for (call_args, _call_kwargs) in check_call.call_args_list:
+ cmd = ' '.join(call_args[0])
+ if cmd.startswith('pip install'):
+ assert pip_opt in cmd
+ number_of_install_calls += 1
+ assert number_of_install_calls == 1
+
+
 def test_editable_package(tmpdir):
  """ piptools can compile an editable """
  fake_package_dir = os.path.join(os.path.split(__file__)[0], 'fixtures', 'small_fake_package')

tests/test_repositories.py

@@ -3,7 +3,7 @@
 from pip.req import InstallRequirement
 
 from piptools.repositories.pypi import PyPIRepository
-from piptools.scripts.compile import get_pip_command
+from piptools.scripts._repo import get_pip_command
 
 
 def test_pypirepo_build_dir_is_str():

tests/test_repository_pypi.py

@@ -1,4 +1,4 @@
-from piptools.scripts.compile import get_pip_command
+from piptools.scripts._repo import get_pip_command
 from piptools.repositories.pypi import PyPIRepository
 
 

tests/test_top_level_editable.py

@@ -2,7 +2,7 @@
 import pytest
 
 from piptools.repositories import PyPIRepository
-from piptools.scripts.compile import get_pip_command
+from piptools.scripts._repo import get_pip_command
 
 
 class MockedPyPIRepository(PyPIRepository):