mirror of https://github.com/pypa/pip
Update references to collector.py
This commit is contained in:
parent
2db6f428bf
commit
611fc6069b
|
@ -38,7 +38,7 @@ if MYPY_CHECK_RUNNING:
|
||||||
FrozenSet, Iterable, List, Optional, Set, Text, Tuple, Union,
|
FrozenSet, Iterable, List, Optional, Set, Text, Tuple, Union,
|
||||||
)
|
)
|
||||||
from pip._vendor.packaging.version import _BaseVersion
|
from pip._vendor.packaging.version import _BaseVersion
|
||||||
from pip._internal.collector import LinkCollector
|
from pip._internal.index.collector import LinkCollector
|
||||||
from pip._internal.models.search_scope import SearchScope
|
from pip._internal.models.search_scope import SearchScope
|
||||||
from pip._internal.req import InstallRequirement
|
from pip._internal.req import InstallRequirement
|
||||||
from pip._internal.pep425tags import Pep425Tag
|
from pip._internal.pep425tags import Pep425Tag
|
||||||
|
|
|
@ -19,7 +19,7 @@ from pip._internal.utils.urls import path_to_url, url_to_path
|
||||||
|
|
||||||
if MYPY_CHECK_RUNNING:
|
if MYPY_CHECK_RUNNING:
|
||||||
from typing import Optional, Text, Tuple, Union
|
from typing import Optional, Text, Tuple, Union
|
||||||
from pip._internal.collector import HTMLPage
|
from pip._internal.index.collector import HTMLPage
|
||||||
from pip._internal.utils.hashes import Hashes
|
from pip._internal.utils.hashes import Hashes
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -14,7 +14,7 @@ from pip._vendor import pkg_resources
|
||||||
from pip._vendor.packaging import version as packaging_version
|
from pip._vendor.packaging import version as packaging_version
|
||||||
from pip._vendor.six import ensure_binary
|
from pip._vendor.six import ensure_binary
|
||||||
|
|
||||||
from pip._internal.collector import LinkCollector
|
from pip._internal.index.collector import LinkCollector
|
||||||
from pip._internal.index.package_finder import PackageFinder
|
from pip._internal.index.package_finder import PackageFinder
|
||||||
from pip._internal.models.search_scope import SearchScope
|
from pip._internal.models.search_scope import SearchScope
|
||||||
from pip._internal.models.selection_prefs import SelectionPreferences
|
from pip._internal.models.selection_prefs import SelectionPreferences
|
||||||
|
|
|
@ -22,7 +22,7 @@ def run_with_build_env(script, setup_script_contents,
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
from pip._internal.build_env import BuildEnvironment
|
from pip._internal.build_env import BuildEnvironment
|
||||||
from pip._internal.collector import LinkCollector
|
from pip._internal.index.collector import LinkCollector
|
||||||
from pip._internal.index.package_finder import PackageFinder
|
from pip._internal.index.package_finder import PackageFinder
|
||||||
from pip._internal.models.search_scope import SearchScope
|
from pip._internal.models.search_scope import SearchScope
|
||||||
from pip._internal.models.selection_prefs import (
|
from pip._internal.models.selection_prefs import (
|
||||||
|
|
|
@ -9,7 +9,7 @@ from mock import Mock, patch
|
||||||
from pip._vendor import html5lib, requests
|
from pip._vendor import html5lib, requests
|
||||||
from pip._vendor.six.moves.urllib import request as urllib_request
|
from pip._vendor.six.moves.urllib import request as urllib_request
|
||||||
|
|
||||||
from pip._internal.collector import (
|
from pip._internal.index.collector import (
|
||||||
HTMLPage,
|
HTMLPage,
|
||||||
_clean_link,
|
_clean_link,
|
||||||
_determine_base_url,
|
_determine_base_url,
|
||||||
|
@ -334,7 +334,7 @@ def test_get_html_page_invalid_scheme(caplog, url, vcs_scheme):
|
||||||
assert page is None
|
assert page is None
|
||||||
assert caplog.record_tuples == [
|
assert caplog.record_tuples == [
|
||||||
(
|
(
|
||||||
"pip._internal.collector",
|
"pip._internal.index.collector",
|
||||||
logging.DEBUG,
|
logging.DEBUG,
|
||||||
"Cannot look at {} URL {}".format(vcs_scheme, url),
|
"Cannot look at {} URL {}".format(vcs_scheme, url),
|
||||||
),
|
),
|
||||||
|
@ -367,7 +367,8 @@ def test_get_html_page_directory_append_index(tmpdir):
|
||||||
|
|
||||||
session = mock.Mock(PipSession)
|
session = mock.Mock(PipSession)
|
||||||
fake_response = make_fake_html_response(expected_url)
|
fake_response = make_fake_html_response(expected_url)
|
||||||
with mock.patch("pip._internal.collector._get_html_response") as mock_func:
|
mock_func = mock.patch("pip._internal.index.collector._get_html_response")
|
||||||
|
with mock_func as mock_func:
|
||||||
mock_func.return_value = fake_response
|
mock_func.return_value = fake_response
|
||||||
actual = _get_html_page(Link(dir_url), session=session)
|
actual = _get_html_page(Link(dir_url), session=session)
|
||||||
assert mock_func.mock_calls == [
|
assert mock_func.mock_calls == [
|
||||||
|
@ -434,7 +435,7 @@ def check_links_include(links, names):
|
||||||
|
|
||||||
class TestLinkCollector(object):
|
class TestLinkCollector(object):
|
||||||
|
|
||||||
@patch('pip._internal.collector._get_html_response')
|
@patch('pip._internal.index.collector._get_html_response')
|
||||||
def test_collect_links(self, mock_get_html_response, caplog, data):
|
def test_collect_links(self, mock_get_html_response, caplog, data):
|
||||||
caplog.set_level(logging.DEBUG)
|
caplog.set_level(logging.DEBUG)
|
||||||
|
|
||||||
|
@ -474,5 +475,5 @@ class TestLinkCollector(object):
|
||||||
1 location(s) to search for versions of twine:
|
1 location(s) to search for versions of twine:
|
||||||
* https://pypi.org/simple/twine/""")
|
* https://pypi.org/simple/twine/""")
|
||||||
assert caplog.record_tuples == [
|
assert caplog.record_tuples == [
|
||||||
('pip._internal.collector', logging.DEBUG, expected_message),
|
('pip._internal.index.collector', logging.DEBUG, expected_message),
|
||||||
]
|
]
|
||||||
|
|
|
@ -62,7 +62,10 @@ def test_no_partial_name_match(data):
|
||||||
|
|
||||||
def test_tilde():
|
def test_tilde():
|
||||||
"""Finder can accept a path with ~ in it and will normalize it."""
|
"""Finder can accept a path with ~ in it and will normalize it."""
|
||||||
with patch('pip._internal.collector.os.path.exists', return_value=True):
|
patched_exists = patch(
|
||||||
|
'pip._internal.index.collector.os.path.exists', return_value=True
|
||||||
|
)
|
||||||
|
with patched_exists:
|
||||||
finder = make_test_finder(find_links=['~/python-pkgs'])
|
finder = make_test_finder(find_links=['~/python-pkgs'])
|
||||||
req = install_req_from_line("gmpy")
|
req = install_req_from_line("gmpy")
|
||||||
with pytest.raises(DistributionNotFound):
|
with pytest.raises(DistributionNotFound):
|
||||||
|
|
|
@ -3,7 +3,7 @@ import logging
|
||||||
import pytest
|
import pytest
|
||||||
from pip._vendor.packaging.specifiers import SpecifierSet
|
from pip._vendor.packaging.specifiers import SpecifierSet
|
||||||
|
|
||||||
from pip._internal.collector import LinkCollector
|
from pip._internal.index.collector import LinkCollector
|
||||||
from pip._internal.index.package_finder import (
|
from pip._internal.index.package_finder import (
|
||||||
CandidateEvaluator,
|
CandidateEvaluator,
|
||||||
CandidatePreferences,
|
CandidatePreferences,
|
||||||
|
|
Loading…
Reference in New Issue