From 879498bf51888f8adc6b03f10e2649abdc3ac672 Mon Sep 17 00:00:00 2001 From: Edward Easton Date: Fri, 18 Apr 2014 12:21:54 +0100 Subject: [PATCH 1/3] Fixes the fetcher for test dependencies and other post-setup actions from missing our configured PyPI --- pkglib/pkglib/setuptools/command/easy_install.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkglib/pkglib/setuptools/command/easy_install.py b/pkglib/pkglib/setuptools/command/easy_install.py index ced8ec6..8330c9d 100644 --- a/pkglib/pkglib/setuptools/command/easy_install.py +++ b/pkglib/pkglib/setuptools/command/easy_install.py @@ -45,15 +45,15 @@ def get_script_args(dist, executable=sys_executable, wininst=False): hdr = new_header else: hdr = header - yield (name+ext, hdr+script_text, 't', [name+x for x in old]) + yield (name + ext, hdr + script_text, 't', [name + x for x in old]) yield ( - name+'.exe', resource_string('setuptools', launcher), + name + '.exe', resource_string('setuptools', launcher), 'b' # write in binary mode ) else: # On other platforms, we assume the right thing to do is to # just write the stub with no extension. - yield (name, header+script_text) + yield (name, header + script_text) def monkeypatch(module, attr): @@ -84,6 +84,7 @@ def initialize_options(self): def finalize_options(self): _easy_install.finalize_options(self) + self.index_url = self.maybe_add_simple_index(CONFIG.pypi_url) self.set_undefined_options('install', ('install_data', 'install_data'), ) From cec5bbdc6d21634605d3e496bfbee5961a29ccc6 Mon Sep 17 00:00:00 2001 From: Edward Easton Date: Fri, 18 Apr 2014 12:27:26 +0100 Subject: [PATCH 2/3] Fixes the fetcher for test dependencies and other post-setup actions from missing our configured PyPI --- pkglib/pkglib/setuptools/command/easy_install.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkglib/pkglib/setuptools/command/easy_install.py b/pkglib/pkglib/setuptools/command/easy_install.py index 8330c9d..fbbc9d8 100644 --- a/pkglib/pkglib/setuptools/command/easy_install.py +++ b/pkglib/pkglib/setuptools/command/easy_install.py @@ -10,7 +10,7 @@ get_script_header, sys_executable, is_64bit, resource_string) -from pkglib import egg_cache +from pkglib import egg_cache, CONFIG from .base import CommandMixin From f0663b81e03567d5b88da12b1f4a045992d42ff6 Mon Sep 17 00:00:00 2001 From: Edward Easton Date: Fri, 18 Apr 2014 12:34:26 +0100 Subject: [PATCH 3/3] Fixes the fetcher for test dependencies and other post-setup actions from missing our configured PyPI --- pkglib/pkglib/setuptools/command/easy_install.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkglib/pkglib/setuptools/command/easy_install.py b/pkglib/pkglib/setuptools/command/easy_install.py index fbbc9d8..37593c4 100644 --- a/pkglib/pkglib/setuptools/command/easy_install.py +++ b/pkglib/pkglib/setuptools/command/easy_install.py @@ -81,10 +81,10 @@ def __init__(self, dist, **kw): def initialize_options(self): _easy_install.initialize_options(self) + self.index_url = self.maybe_add_simple_index(CONFIG.pypi_url) def finalize_options(self): _easy_install.finalize_options(self) - self.index_url = self.maybe_add_simple_index(CONFIG.pypi_url) self.set_undefined_options('install', ('install_data', 'install_data'), )