Commit 9e0efd8b authored by Alex Clark ☺'s avatar Alex Clark ☺

Merge pull request #194 from puittenbroek/193-performance

193 performance
parents b208fe6f cb0c8b49
...@@ -13,6 +13,9 @@ Unreleased ...@@ -13,6 +13,9 @@ Unreleased
- Close various files when finished writing to them. This avoids - Close various files when finished writing to them. This avoids
ResourceWarnings on Python 3, and better supports doctests under PyPy. ResourceWarnings on Python 3, and better supports doctests under PyPy.
- Introduce improved easy_install Install.install function. This is present
in 1.5.X and 1.7X but was never merged into 2.X somehow.
2.2.1 (2013-09-05) 2.2.1 (2013-09-05)
================== ==================
......
...@@ -616,8 +616,6 @@ class Installer: ...@@ -616,8 +616,6 @@ class Installer:
requirements = [self._constrain(pkg_resources.Requirement.parse(spec)) requirements = [self._constrain(pkg_resources.Requirement.parse(spec))
for spec in specs] for spec in specs]
if working_set is None: if working_set is None:
ws = pkg_resources.WorkingSet([]) ws = pkg_resources.WorkingSet([])
else: else:
...@@ -629,35 +627,49 @@ class Installer: ...@@ -629,35 +627,49 @@ class Installer:
self._maybe_add_setuptools(ws, dist) self._maybe_add_setuptools(ws, dist)
# OK, we have the requested distributions and they're in the working # OK, we have the requested distributions and they're in the working
# set, but they may have unmet requirements. We'll simply keep # set, but they may have unmet requirements. We'll resolve these
# trying to resolve requirements, adding missing requirements as they # requirements. This is code modified from
# are reported. # pkg_resources.WorkingSet.resolve. We can't reuse that code directly
# # because we have to constrain our requirements (see
# Note that we don't pass in the environment, because we want # versions_section_ignored_for_dependency_in_favor_of_site_packages in
# zc.buildout.tests).
requirements.reverse() # Set up the stack.
processed = {} # This is a set of processed requirements.
best = {} # This is a mapping of key -> dist.
# Note that we don't use the existing environment, because we want
# to look for new eggs unless what we have is the best that # to look for new eggs unless what we have is the best that
# matches the requirement. # matches the requirement.
while 1: env = pkg_resources.Environment(ws.entries)
try: while requirements:
ws.resolve(requirements) # Process dependencies breadth-first.
except pkg_resources.DistributionNotFound: req = self._constrain(requirements.pop(0))
err = sys.exc_info()[1] if req in processed:
[requirement] = err.args # Ignore cyclic or redundant dependencies.
requirement = self._constrain(requirement) continue
if dest: dist = best.get(req.key)
logger.debug('Getting required %r', str(requirement)) if dist is None:
else: # Find the best distribution and add it to the map.
logger.debug('Adding required %r', str(requirement)) dist = ws.by_key.get(req.key)
_log_requirement(ws, requirement) if dist is None:
try:
for dist in self._get_dist(requirement, ws): dist = best[req.key] = env.best_match(req, ws)
ws.add(dist) except pkg_resources.VersionConflict, err:
self._maybe_add_setuptools(ws, dist) raise VersionConflict(err, ws)
except pkg_resources.VersionConflict: if dist is None:
err = sys.exc_info()[1] if dest:
raise VersionConflict(err, ws) logger.debug('Getting required %r', str(req))
else: else:
break logger.debug('Adding required %r', str(req))
_log_requirement(ws, req)
for dist in self._get_dist(req, ws,):
ws.add(dist)
self._maybe_add_setuptools(ws, dist)
if dist not in req:
# Oops, the "best" so far conflicts with a dependency.
raise VersionConflict(
pkg_resources.VersionConflict(dist, req), ws)
requirements.extend(dist.requires(req.extras)[::-1])
processed[req] = True
return ws return ws
def build(self, spec, build_ext): def build(self, spec, build_ext):
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment