diff --git a/.travis.yml b/.travis.yml index 91fb3920e..5571f6e78 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,6 +16,7 @@ env: - PIP=9.0.3 - PIP=10.0.1 - PIP=18.0 + - PIP=19.0 - PIP=latest - PIP=master diff --git a/piptools/repositories/pypi.py b/piptools/repositories/pypi.py index bf698039c..7ceaca09c 100644 --- a/piptools/repositories/pypi.py +++ b/piptools/repositories/pypi.py @@ -59,7 +59,6 @@ def __init__(self, pip_options, session): index_urls=index_urls, trusted_hosts=pip_options.trusted_hosts, allow_all_prereleases=pip_options.pre, - process_dependency_links=pip_options.process_dependency_links, session=self.session, ) diff --git a/tests/test_cli.py b/tests/test_cli.py index ca8c18f52..75f42d672 100644 --- a/tests/test_cli.py +++ b/tests/test_cli.py @@ -1,6 +1,5 @@ import os from textwrap import dedent -from six.moves.urllib.request import pathname2url import subprocess import sys import mock @@ -12,6 +11,7 @@ from piptools.repositories import PyPIRepository from piptools.scripts.compile import cli from piptools.scripts.sync import cli as sync_cli +from .utils import pathname_to_url from pip._vendor.packaging.version import parse as parse_version from pip import __version__ as pip_version @@ -242,7 +242,7 @@ def test_sync_quiet(tmpdir): def test_editable_package(tmpdir): """ piptools can compile an editable """ fake_package_dir = os.path.join(os.path.split(__file__)[0], 'test_data', 'small_fake_package') - fake_package_dir = 'file:' + pathname2url(fake_package_dir) + fake_package_dir = pathname_to_url(fake_package_dir) runner = CliRunner() with runner.isolated_filesystem(): with open('requirements.in', 'w') as req_in: @@ -278,7 +278,7 @@ def test_locally_available_editable_package_is_not_archived_in_cache_dir(tmpdir) cache_dir = tmpdir.mkdir('cache_dir') fake_package_dir = os.path.join(os.path.split(__file__)[0], 'test_data', 'small_fake_package') - fake_package_dir = 'file:' + pathname2url(fake_package_dir) + fake_package_dir = pathname_to_url(fake_package_dir) with mock.patch('piptools.repositories.pypi.CACHE_DIR', new=str(cache_dir)): runner = CliRunner() @@ -360,7 +360,7 @@ def test_upgrade_packages_version_option(tmpdir): def test_generate_hashes_with_editable(): small_fake_package_dir = os.path.join( os.path.split(__file__)[0], 'test_data', 'small_fake_package') - small_fake_package_url = 'file:' + pathname2url(small_fake_package_dir) + small_fake_package_url = pathname_to_url(small_fake_package_dir) runner = CliRunner() with runner.isolated_filesystem(): with open('requirements.in', 'w') as fp: diff --git a/tests/utils.py b/tests/utils.py new file mode 100644 index 000000000..0c81d40cd --- /dev/null +++ b/tests/utils.py @@ -0,0 +1,8 @@ +from six.moves.urllib.request import pathname2url + + +def pathname_to_url(path): + """ + Given a path to a file, returns an URL with 'file://' scheme + """ + return 'file://' + pathname2url(path) diff --git a/tox.ini b/tox.ini index c41a2bc5b..8138d21de 100644 --- a/tox.ini +++ b/tox.ini @@ -14,6 +14,7 @@ deps = pip9.0.3: pip==9.0.3 pip10.0.1: pip==10.0.1 pip18.0: pip==18.0 + pip19.0: pip==19.0 coverage mock pytest @@ -25,6 +26,7 @@ setenv = pip9.0.3: PIP=9.0.3 pip10.0.1: PIP=10.0.1 pip18.0: PIP=18.0 + pip19.0: PIP==19.0 install_command= python -m pip install {opts} {packages} commands = pip --version @@ -48,5 +50,6 @@ PIP = 9.0.3: pip9.0.3 10.0.1: pip10.0.1 18.0: pip18.0 + 19.0: pip19.0 latest: piplatest master: pipmaster