From 6742d928cf018ee9843c192a0a3e527ebbe98ae8 Mon Sep 17 00:00:00 2001 From: Stefano Rivera Date: Wed, 14 Dec 2011 00:19:04 +0200 Subject: Move embedded .py files to virtualenv_embedded_support Create new top level directory: virtualenv_embedded_support to hold embedded .py files, so that they can be distributed in the source tarball. Fixes #199 --- bin/refresh-support-files.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'bin/refresh-support-files.py') diff --git a/bin/refresh-support-files.py b/bin/refresh-support-files.py index 866b9d5..5bc8b3e 100755 --- a/bin/refresh-support-files.py +++ b/bin/refresh-support-files.py @@ -12,6 +12,7 @@ import sys here = os.path.dirname(__file__) support_files = os.path.join(here, '..', 'virtualenv_support') +embedded_support_files = os.path.join(here, '..', 'virtualenv_embedded_support') files = [ ('http://peak.telecommunity.com/dist/ez_setup.py', 'ez_setup.py'), @@ -31,7 +32,10 @@ def main(): content = f.read() f.close() print('done.') - filename = os.path.join(support_files, filename) + if filename.endswith('.py'): + filename = os.path.join(embedded_support_files, filename) + else: + filename = os.path.join(support_files, filename) if os.path.exists(filename): f = open(filename, 'rb') cur_content = f.read() -- cgit v1.2.1 From 47ee1ebaf45c23da35676bf2493fad880f7be0da Mon Sep 17 00:00:00 2001 From: Stefano Rivera Date: Wed, 14 Dec 2011 00:42:44 +0200 Subject: Rename virtualenv_embedded_support virtualenv_embedded --- bin/refresh-support-files.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bin/refresh-support-files.py') diff --git a/bin/refresh-support-files.py b/bin/refresh-support-files.py index 5bc8b3e..1838938 100755 --- a/bin/refresh-support-files.py +++ b/bin/refresh-support-files.py @@ -12,7 +12,7 @@ import sys here = os.path.dirname(__file__) support_files = os.path.join(here, '..', 'virtualenv_support') -embedded_support_files = os.path.join(here, '..', 'virtualenv_embedded_support') +embedded_files = os.path.join(here, '..', 'virtualenv_embedded') files = [ ('http://peak.telecommunity.com/dist/ez_setup.py', 'ez_setup.py'), @@ -33,7 +33,7 @@ def main(): f.close() print('done.') if filename.endswith('.py'): - filename = os.path.join(embedded_support_files, filename) + filename = os.path.join(embedded_files, filename) else: filename = os.path.join(support_files, filename) if os.path.exists(filename): -- cgit v1.2.1 From 2e7cb5692d1b721c6be49a36b873fffe88cbd2fc Mon Sep 17 00:00:00 2001 From: Stefano Rivera Date: Wed, 14 Dec 2011 00:49:18 +0200 Subject: Move all embedded files to virtualenv_embedded --- bin/refresh-support-files.py | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) (limited to 'bin/refresh-support-files.py') diff --git a/bin/refresh-support-files.py b/bin/refresh-support-files.py index 1838938..539df7e 100755 --- a/bin/refresh-support-files.py +++ b/bin/refresh-support-files.py @@ -11,20 +11,24 @@ except ImportError: import sys here = os.path.dirname(__file__) -support_files = os.path.join(here, '..', 'virtualenv_support') -embedded_files = os.path.join(here, '..', 'virtualenv_embedded') +support_location = os.path.join(here, '..', 'virtualenv_support') +embedded_location = os.path.join(here, '..', 'virtualenv_embedded') -files = [ +embedded_files = [ ('http://peak.telecommunity.com/dist/ez_setup.py', 'ez_setup.py'), + ('http://python-distribute.org/distribute_setup.py', 'distribute_setup.py'), +] + +support_files = [ ('http://pypi.python.org/packages/2.6/s/setuptools/setuptools-0.6c11-py2.6.egg', 'setuptools-0.6c11-py2.6.egg'), ('http://pypi.python.org/packages/2.5/s/setuptools/setuptools-0.6c11-py2.5.egg', 'setuptools-0.6c11-py2.5.egg'), ('http://pypi.python.org/packages/2.4/s/setuptools/setuptools-0.6c11-py2.4.egg', 'setuptools-0.6c11-py2.4.egg'), - ('http://python-distribute.org/distribute_setup.py', 'distribute_setup.py'), ('http://pypi.python.org/packages/source/d/distribute/distribute-0.6.24.tar.gz', 'distribute-0.6.24.tar.gz'), ('http://pypi.python.org/packages/source/p/pip/pip-1.0.2.tar.gz', 'pip-1.0.2.tar.gz'), ] -def main(): + +def refresh_files(files, location): for url, filename in files: sys.stdout.write('fetching %s ... ' % url) sys.stdout.flush() @@ -32,10 +36,7 @@ def main(): content = f.read() f.close() print('done.') - if filename.endswith('.py'): - filename = os.path.join(embedded_files, filename) - else: - filename = os.path.join(support_files, filename) + filename = os.path.join(location, filename) if os.path.exists(filename): f = open(filename, 'rb') cur_content = f.read() @@ -50,6 +51,11 @@ def main(): f.write(content) f.close() + +def main(): + refresh_files(embedded_files, embedded_location) + refresh_files(support_files, support_location) + if __name__ == '__main__': main() -- cgit v1.2.1 From 564f52cd82d25553e6ffa884720d8921d7cd0e83 Mon Sep 17 00:00:00 2001 From: Carl Meyer Date: Thu, 16 Feb 2012 13:26:11 -0700 Subject: Update embedded pip to version 1.1. --- bin/refresh-support-files.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bin/refresh-support-files.py') diff --git a/bin/refresh-support-files.py b/bin/refresh-support-files.py index 539df7e..66274b4 100755 --- a/bin/refresh-support-files.py +++ b/bin/refresh-support-files.py @@ -24,7 +24,7 @@ support_files = [ ('http://pypi.python.org/packages/2.5/s/setuptools/setuptools-0.6c11-py2.5.egg', 'setuptools-0.6c11-py2.5.egg'), ('http://pypi.python.org/packages/2.4/s/setuptools/setuptools-0.6c11-py2.4.egg', 'setuptools-0.6c11-py2.4.egg'), ('http://pypi.python.org/packages/source/d/distribute/distribute-0.6.24.tar.gz', 'distribute-0.6.24.tar.gz'), - ('http://pypi.python.org/packages/source/p/pip/pip-1.0.2.tar.gz', 'pip-1.0.2.tar.gz'), + ('http://pypi.python.org/packages/source/p/pip/pip-1.1.tar.gz', 'pip-1.1.tar.gz'), ] -- cgit v1.2.1