McSinyx/pip
1
1
Fork 0
mirror of https://github.com/pypa/pip synced 2023-12-13 21:30:23 +01:00
Code Issues Releases Activity

Merge pull request #2710 from rbtcollins/brokenout-5

Browse source 
Replace wheel cache cache_dir with an object.
This commit is contained in:
Donald Stufft 2015-04-22 20:40:54 -04:00
parent 0ed87f61a5 ec46a3bac4
commit bc5bb70e60
12 changed files with 71 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pip/basecommand.py
View file

@ -281,7 +281,7 @@ class RequirementCommand(Command):
@staticmethod
def populate_requirement_set(requirement_set, args, options, finder,
session, name):
session, name, wheel_cache):
"""
Marshal cmd line args into a requirement set.
"""
@ -289,7 +289,7 @@ class RequirementCommand(Command):
requirement_set.add_requirement(
InstallRequirement.from_line(
name, None, isolated=options.isolated_mode,
cache_root=options.cache_dir
wheel_cache=wheel_cache
)
)
@ -299,14 +299,15 @@ class RequirementCommand(Command):
name,
default_vcs=options.default_vcs,
isolated=options.isolated_mode,
cache_root=options.cache_dir
wheel_cache=wheel_cache
)
)
for filename in options.requirements:
for req in parse_requirements(
filename,
finder=finder, options=options, session=session):
finder=finder, options=options, session=session,
wheel_cache=wheel_cache):
requirement_set.add_requirement(req)
if not requirement_set.has_requirements:

4
pip/commands/freeze.py
View file

@ -4,6 +4,7 @@ import sys
from pip.basecommand import Command
from pip.operations.freeze import freeze
from pip.wheel import WheelCache
class FreezeCommand(Command):
@ -54,6 +55,7 @@ class FreezeCommand(Command):
self.parser.insert_option_group(0, self.cmd_opts)
def run(self, options, args):
wheel_cache = WheelCache(options.cache_dir)
freeze_kwargs = dict(
requirement=options.requirement,
find_links=options.find_links,
@ -61,7 +63,7 @@ class FreezeCommand(Command):
user_only=options.user,
skip_regex=options.skip_requirements_regex,
isolated=options.isolated_mode,
cache_root=options.cache_dir)
wheel_cache=wheel_cache)
for line in freeze(**freeze_kwargs):
sys.stdout.write(line + '\n')

6
pip/commands/install.py
View file

@ -22,7 +22,7 @@ from pip import cmdoptions
from pip.utils import ensure_dir
from pip.utils.build import BuildDirectory
from pip.utils.deprecation import RemovedInPip8Warning
from pip.wheel import WheelBuilder
from pip.wheel import WheelCache, WheelBuilder
logger = logging.getLogger(__name__)
@ -239,11 +239,11 @@ class InstallCommand(RequirementCommand):
finder = self._build_package_finder(options, index_urls, session)
build_delete = (not (options.no_clean or options.build_dir))
wheel_cache = WheelCache(options.cache_dir)
with BuildDirectory(options.build_dir,
delete=build_delete) as build_dir:
requirement_set = RequirementSet(
build_dir=build_dir,
cache_root=options.cache_dir,
src_dir=options.src_dir,
download_dir=options.download_dir,
upgrade=options.upgrade,
@ -256,10 +256,12 @@ class InstallCommand(RequirementCommand):
session=session,
pycompile=options.compile,
isolated=options.isolated_mode,
wheel_cache=wheel_cache,
)
self.populate_requirement_set(
requirement_set, args, options, finder, session, self.name,
wheel_cache
)
if not requirement_set.has_requirements:

4
pip/commands/list.py
View file

@ -9,6 +9,7 @@ from pip.exceptions import DistributionNotFound
from pip.index import PackageFinder, Search
from pip.req import InstallRequirement
from pip.utils import get_installed_distributions, dist_is_editable
from pip.wheel import WheelCache
from pip.cmdoptions import make_option_group, index_group
@ -130,10 +131,11 @@ class ListCommand(Command):
user_only=options.user,
include_editables=False,
)
wheel_cache = WheelCache(options.cache_dir)
for dist in installed_packages:
req = InstallRequirement.from_line(
dist.key, None, isolated=options.isolated_mode,
cache_root=options.cache_dir,
wheel_cache=wheel_cache
)
typ = 'unknown'
try:

9
pip/commands/uninstall.py
View file

@ -1,5 +1,6 @@
from __future__ import absolute_import
from pip.wheel import WheelCache
from pip.req import InstallRequirement, RequirementSet, parse_requirements
from pip.basecommand import Command
from pip.exceptions import InstallationError
@ -42,20 +43,20 @@ class UninstallCommand(Command):
def run(self, options, args):
with self._build_session(options) as session:
wheel_cache = WheelCache(options.cache_dir)
requirement_set = RequirementSet(
build_dir=None,
cache_root=options.cache_dir,
src_dir=None,
download_dir=None,
isolated=options.isolated_mode,
session=session,
wheel_cache=wheel_cache,
)
for name in args:
requirement_set.add_requirement(
InstallRequirement.from_line(
name, isolated=options.isolated_mode,
cache_root=options.cache_dir,
wheel_cache=wheel_cache
)
)
for filename in options.requirements:
@ -63,7 +64,7 @@ class UninstallCommand(Command):
filename,
options=options,
session=session,
cache_root=options.cache_dir):
wheel_cache=wheel_cache):
requirement_set.add_requirement(req)
if not requirement_set.has_requirements:
raise InstallationError(

6
pip/commands/wheel.py
View file

@ -12,7 +12,7 @@ from pip.req import RequirementSet
from pip.utils import import_or_raise, normalize_path
from pip.utils.build import BuildDirectory
from pip.utils.deprecation import RemovedInPip8Warning
from pip.wheel import WheelBuilder
from pip.wheel import WheelCache, WheelBuilder
from pip import cmdoptions
DEFAULT_WHEEL_DIR = os.path.join(normalize_path(os.curdir), 'wheelhouse')
@ -155,22 +155,24 @@ class WheelCommand(RequirementCommand):
)
build_delete = (not (options.no_clean or options.build_dir))
wheel_cache = WheelCache(options.cache_dir)
with BuildDirectory(options.build_dir,
delete=build_delete) as build_dir:
requirement_set = RequirementSet(
build_dir=build_dir,
cache_root=options.cache_dir,
src_dir=options.src_dir,
download_dir=None,
ignore_dependencies=options.ignore_dependencies,
ignore_installed=True,
isolated=options.isolated_mode,
session=session,
wheel_cache=wheel_cache,
wheel_download_dir=options.wheel_dir
)
self.populate_requirement_set(
requirement_set, args, options, finder, session, self.name,
wheel_cache
)
if not requirement_set.has_requirements:

6
pip/operations/freeze.py
View file

@ -22,7 +22,7 @@ def freeze(
find_tags=False,
default_vcs=None,
isolated=False,
cache_root=None):
wheel_cache=None):
find_links = find_links or []
skip_match = None
@ -76,13 +76,13 @@ def freeze(
line,
default_vcs=default_vcs,
isolated=isolated,
cache_root=cache_root,
wheel_cache=wheel_cache,
)
else:
line_req = InstallRequirement.from_line(
line,
isolated=isolated,
cache_root=cache_root,
wheel_cache=wheel_cache,
)
if not line_req.name:

23
pip/req/req_file.py
View file

@ -77,15 +77,16 @@ IGNORE = 5
def parse_requirements(filename, finder=None, comes_from=None, options=None,
session=None, cache_root=None):
session=None, wheel_cache=None):
"""
Parse a requirements file and yield InstallRequirement instances.
:param filename: Path or url of requirements file.
:param finder: Instance of pip.index.PackageFinder.
:param comes_from: Origin description of requirements.
:param options: Global options.
:param session: Instance of pip.download.PipSession.
:param filename: Path or url of requirements file.
:param finder: Instance of pip.index.PackageFinder.
:param comes_from: Origin description of requirements.
:param options: Global options.
:param session: Instance of pip.download.PipSession.
:param wheel_cache: Instance of pip.wheel.WheelCache
"""
if session is None:
raise TypeError(
@ -98,7 +99,7 @@ def parse_requirements(filename, finder=None, comes_from=None, options=None,
)
parser = parse_content(
filename, content, finder, comes_from, options, session, cache_root
filename, content, finder, comes_from, options, session, wheel_cache
)
for item in parser:
@ -106,7 +107,7 @@ def parse_requirements(filename, finder=None, comes_from=None, options=None,
def parse_content(filename, content, finder=None, comes_from=None,
options=None, session=None, cache_root=None):
options=None, session=None, wheel_cache=None):
# Split, sanitize and join lines with continuations.
content = content.splitlines()
@ -129,7 +130,7 @@ def parse_content(filename, content, finder=None, comes_from=None,
isolated = options.isolated_mode if options else False
yield InstallRequirement.from_line(
req, comes_from, isolated=isolated, options=opts,
cache_root=cache_root)
wheel_cache=wheel_cache)
# ---------------------------------------------------------------------
elif linetype == REQUIREMENT_EDITABLE:
@ -139,7 +140,7 @@ def parse_content(filename, content, finder=None, comes_from=None,
yield InstallRequirement.from_editable(
value, comes_from=comes_from,
default_vcs=default_vcs, isolated=isolated,
cache_root=cache_root)
wheel_cache=wheel_cache)
# ---------------------------------------------------------------------
elif linetype == REQUIREMENT_FILE:
@ -152,7 +153,7 @@ def parse_content(filename, content, finder=None, comes_from=None,
# TODO: Why not use `comes_from='-r {} (line {})'` here as well?
parser = parse_requirements(
req_url, finder, comes_from, options, session,
cache_root=cache_root)
wheel_cache=wheel_cache)
for req in parser:
yield req

19
pip/req/req_install.py
View file

@ -74,7 +74,7 @@ class InstallRequirement(object):
def __init__(self, req, comes_from, source_dir=None, editable=False,
link=None, as_egg=False, update=True, editable_options=None,
pycompile=True, markers=None, isolated=False, options=None,
cache_root=None):
wheel_cache=None):
self.extras = ()
if isinstance(req, six.string_types):
req = pkg_resources.Requirement.parse(req)
@ -89,7 +89,7 @@ class InstallRequirement(object):
editable_options = {}
self.editable_options = editable_options
self._cache_root = cache_root
self._wheel_cache = wheel_cache
self.link = link
self.as_egg = as_egg
self.markers = markers
@ -120,7 +120,7 @@ class InstallRequirement(object):
@classmethod
def from_editable(cls, editable_req, comes_from=None, default_vcs=None,
isolated=False, options=None, cache_root=None):
isolated=False, options=None, wheel_cache=None):
from pip.index import Link
name, url, extras_override, editable_options = parse_editable(
@ -136,7 +136,7 @@ class InstallRequirement(object):
editable_options=editable_options,
isolated=isolated,
options=options if options else {},
cache_root=cache_root)
wheel_cache=wheel_cache)
if extras_override is not None:
res.extras = extras_override
@ -146,7 +146,7 @@ class InstallRequirement(object):
@classmethod
def from_line(
cls, name, comes_from=None, isolated=False, options=None,
cache_root=None):
wheel_cache=None):
"""Creates an InstallRequirement from a name, which might be a
requirement, directory containing 'setup.py', filename, or URL.
"""
@ -213,7 +213,8 @@ class InstallRequirement(object):
options = options if options else {}
return cls(req, comes_from, link=link, markers=markers,
isolated=isolated, options=options, cache_root=cache_root)
isolated=isolated, options=options,
wheel_cache=wheel_cache)
def __str__(self):
if self.req:
@ -253,8 +254,10 @@ class InstallRequirement(object):
@link.setter
def link(self, link):
# Lookup a cached wheel, if possible.
link = pip.wheel.cached_wheel(self._cache_root, link)
self._link = link
if self._wheel_cache is None:
self._link = link
else:
self._link = self._wheel_cache.cached_wheel(link)
@property
def specifier(self):

8
pip/req/req_set.py
View file

@ -140,7 +140,7 @@ class RequirementSet(object):
ignore_dependencies=False, force_reinstall=False,
use_user_site=False, session=None, pycompile=True,
isolated=False, wheel_download_dir=None,
cache_root=None):
wheel_cache=None):
"""Create a RequirementSet.
:param wheel_download_dir: Where still-packed .whl files should be
@ -150,7 +150,7 @@ class RequirementSet(object):
:param download_dir: Where still packed archives should be written to.
If None they are not saved, and are deleted immediately after
unpacking.
:param cache_root: The root of the pip cache, for passing to
:param wheel_cache: The pip wheel cache, for passing to
InstallRequirement.
"""
if session is None:
@ -185,7 +185,7 @@ class RequirementSet(object):
if wheel_download_dir:
wheel_download_dir = normalize_path(wheel_download_dir)
self.wheel_download_dir = wheel_download_dir
self._cache_root = cache_root
self._wheel_cache = wheel_cache
# Maps from install_req -> dependencies_of_install_req
self._dependencies = defaultdict(list)
@ -517,7 +517,7 @@ class RequirementSet(object):
str(subreq),
req_to_install,
isolated=self.isolated,
cache_root=self._cache_root,
wheel_cache=self._wheel_cache,
)
more_reqs.extend(self.add_requirement(
sub_install_req, req_to_install.name))

18
pip/wheel.py
View file

@ -44,6 +44,20 @@ VERSION_COMPATIBLE = (1, 0)
logger = logging.getLogger(__name__)
class WheelCache(object):
"""A cache of wheels for future installs."""
def __init__(self, cache_dir):
"""Create a wheel cache.
:param cache_dir: The root of the cache.
"""
self._cache_dir = cache_dir
def cached_wheel(self, link):
return cached_wheel(self._cache_dir, link)
def _cache_for_filename(cache_dir, sdistfilename):
"""Return a directory to store cached wheels in for sdistfilename.
@ -598,10 +612,10 @@ class WheelBuilder(object):
"""Build wheels from a RequirementSet."""
def __init__(self, requirement_set, finder, build_options=None,
global_options=None, cache_root=None):
global_options=None):
self.requirement_set = requirement_set
self.finder = finder
self._cache_root = requirement_set._cache_root
self._cache_root = requirement_set._wheel_cache._cache_dir
self._wheel_dir = requirement_set.wheel_download_dir
self.build_options = build_options or []
self.global_options = global_options or []

2
tests/unit/test_req_file.py
View file

@ -182,7 +182,7 @@ class TestParseContent(object):
import pip.req.req_file
def stub_parse_requirements(req_url, finder, comes_from, options,
session, cache_root):
session, wheel_cache):
return [req]
parse_requirements_stub = stub(call=stub_parse_requirements)
monkeypatch.setattr(pip.req.req_file, 'parse_requirements',