Commit f1c18f8a authored by Gary Poster's avatar Gary Poster

merge from gary-5

parents 6f4b5b2e 183a2966
...@@ -294,9 +294,9 @@ class Installer: ...@@ -294,9 +294,9 @@ class Installer:
newest=True, newest=True,
versions=None, versions=None,
use_dependency_links=None, use_dependency_links=None,
allow_hosts=('*',),
include_site_packages=None, include_site_packages=None,
allowed_eggs_from_site_packages=None, allowed_eggs_from_site_packages=None
allow_hosts=('*',)
): ):
self._dest = dest self._dest = dest
self._allow_hosts = allow_hosts self._allow_hosts = allow_hosts
...@@ -1014,28 +1014,27 @@ def install(specs, dest, ...@@ -1014,28 +1014,27 @@ def install(specs, dest,
links=(), index=None, links=(), index=None,
executable=sys.executable, always_unzip=None, executable=sys.executable, always_unzip=None,
path=None, working_set=None, newest=True, versions=None, path=None, working_set=None, newest=True, versions=None,
use_dependency_links=None, include_site_packages=None, use_dependency_links=None, allow_hosts=('*',),
allowed_eggs_from_site_packages=None, allow_hosts=('*',)): include_site_packages=None, allowed_eggs_from_site_packages=None):
installer = Installer(dest, links, index, executable, always_unzip, path, installer = Installer(dest, links, index, executable, always_unzip, path,
newest, versions, use_dependency_links, newest, versions, use_dependency_links,
allow_hosts=allow_hosts,
include_site_packages=include_site_packages, include_site_packages=include_site_packages,
allowed_eggs_from_site_packages= allowed_eggs_from_site_packages=
allowed_eggs_from_site_packages, allowed_eggs_from_site_packages)
allow_hosts=allow_hosts)
return installer.install(specs, working_set) return installer.install(specs, working_set)
def build(spec, dest, build_ext, def build(spec, dest, build_ext,
links=(), index=None, links=(), index=None,
executable=sys.executable, executable=sys.executable,
path=None, newest=True, versions=None, include_site_packages=None, path=None, newest=True, versions=None, allow_hosts=('*',),
allowed_eggs_from_site_packages=None, allow_hosts=('*',)): include_site_packages=None, allowed_eggs_from_site_packages=None):
installer = Installer(dest, links, index, executable, True, path, newest, installer = Installer(dest, links, index, executable, True, path, newest,
versions, versions, allow_hosts=allow_hosts,
include_site_packages=include_site_packages, include_site_packages=include_site_packages,
allowed_eggs_from_site_packages= allowed_eggs_from_site_packages=
allowed_eggs_from_site_packages, allowed_eggs_from_site_packages)
allow_hosts=allow_hosts)
return installer.build(spec, build_ext) return installer.build(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