From 4f8138c70a241b820e85968701cdd8bcfc8eb3e4 Mon Sep 17 00:00:00 2001 From: Yamashita Yuu Date: Mon, 10 Jun 2013 12:48:05 +0900 Subject: [PATCH] update setuptools for jython versions (distribute 0.6.45 -> setuptools 0.7.2) https://bitbucket.org/pypa/setuptools/issue/14/installation-failed-on-jython --- plugins/python-build/share/python-build/jython-2.5-dev | 4 +--- plugins/python-build/share/python-build/jython-2.5.2 | 4 +--- plugins/python-build/share/python-build/jython-2.5.3 | 4 +--- plugins/python-build/share/python-build/jython-2.5.4-rc1 | 4 +--- plugins/python-build/share/python-build/jython-2.7-beta1 | 4 +--- plugins/python-build/share/python-build/jython-dev | 4 +--- 6 files changed, 6 insertions(+), 18 deletions(-) diff --git a/plugins/python-build/share/python-build/jython-2.5-dev b/plugins/python-build/share/python-build/jython-2.5-dev index ac91f8c9..bcad73ec 100644 --- a/plugins/python-build/share/python-build/jython-2.5-dev +++ b/plugins/python-build/share/python-build/jython-2.5-dev @@ -1,8 +1,6 @@ require_java install_hg "jython-2.5-dev" "http://hg.python.org/jython" "2.5" jython_builder -# setuptools (>= 0.7) cannot install to Jython -# * https://bitbucket.org/pypa/setuptools/issue/14/installation-failed-on-jython -install_package "distribute-0.6.45" "http://pypi.python.org/packages/source/d/distribute/distribute-0.6.45.tar.gz#8953f2c07e6700dabf2ec150129b8c31" python +install_package "setuptools-0.7.2" "https://bitbucket.org/pypa/setuptools/downloads/setuptools-0.7.2.tar.gz#20003718b266929c4a49e5d7ba3f792c" python # pip (>= 1.3) does not work properly since it uses HTTPS for downloads # * https://github.com/yyuu/pyenv/issues/15 install_package "pip-1.2.1" "http://pypi.python.org/packages/source/p/pip/pip-1.2.1.tar.gz#db8a6d8a4564d3dc7f337ebed67b1a85" python diff --git a/plugins/python-build/share/python-build/jython-2.5.2 b/plugins/python-build/share/python-build/jython-2.5.2 index 6846882e..ee7458c1 100644 --- a/plugins/python-build/share/python-build/jython-2.5.2 +++ b/plugins/python-build/share/python-build/jython-2.5.2 @@ -1,8 +1,6 @@ require_java install_jar "Jython-2.5.2" "https://downloads.sourceforge.net/project/jython/jython/2.5.2/jython_installer-2.5.2.jar#7c7d9abd8985df480edeacd27ed9dcd5" jython -# setuptools (>= 0.7) cannot install to Jython -# * https://bitbucket.org/pypa/setuptools/issue/14/installation-failed-on-jython -install_package "distribute-0.6.45" "http://pypi.python.org/packages/source/d/distribute/distribute-0.6.45.tar.gz#8953f2c07e6700dabf2ec150129b8c31" python +install_package "setuptools-0.7.2" "https://bitbucket.org/pypa/setuptools/downloads/setuptools-0.7.2.tar.gz#20003718b266929c4a49e5d7ba3f792c" python # pip (>= 1.3) does not work properly since it uses HTTPS for downloads # * https://github.com/yyuu/pyenv/issues/15 install_package "pip-1.2.1" "http://pypi.python.org/packages/source/p/pip/pip-1.2.1.tar.gz#db8a6d8a4564d3dc7f337ebed67b1a85" python diff --git a/plugins/python-build/share/python-build/jython-2.5.3 b/plugins/python-build/share/python-build/jython-2.5.3 index c96fe8e2..02ffcecb 100644 --- a/plugins/python-build/share/python-build/jython-2.5.3 +++ b/plugins/python-build/share/python-build/jython-2.5.3 @@ -1,8 +1,6 @@ require_java install_jar "Jython-2.5.3" "http://search.maven.org/remotecontent?filepath=org/python/jython-installer/2.5.3/jython-installer-2.5.3.jar#41633b4557483d6d4237ee79ffcebe7b" jython -# setuptools (>= 0.7) cannot install to Jython -# * https://bitbucket.org/pypa/setuptools/issue/14/installation-failed-on-jython -install_package "distribute-0.6.45" "http://pypi.python.org/packages/source/d/distribute/distribute-0.6.45.tar.gz#8953f2c07e6700dabf2ec150129b8c31" python +install_package "setuptools-0.7.2" "https://bitbucket.org/pypa/setuptools/downloads/setuptools-0.7.2.tar.gz#20003718b266929c4a49e5d7ba3f792c" python # pip (>= 1.3) does not work properly since it uses HTTPS for downloads # * https://github.com/yyuu/pyenv/issues/15 install_package "pip-1.2.1" "http://pypi.python.org/packages/source/p/pip/pip-1.2.1.tar.gz#db8a6d8a4564d3dc7f337ebed67b1a85" python diff --git a/plugins/python-build/share/python-build/jython-2.5.4-rc1 b/plugins/python-build/share/python-build/jython-2.5.4-rc1 index f9d0cf66..23671ba6 100644 --- a/plugins/python-build/share/python-build/jython-2.5.4-rc1 +++ b/plugins/python-build/share/python-build/jython-2.5.4-rc1 @@ -1,8 +1,6 @@ require_java install_jar "Jython-2.5.4-rc1" "http://search.maven.org/remotecontent?filepath=org/python/jython-installer/2.5.4-rc1/jython-installer-2.5.4-rc1.jar#1be8d75d02886ce1a8542bb794a20db2" jython -# setuptools (>= 0.7) cannot install to Jython -# * https://bitbucket.org/pypa/setuptools/issue/14/installation-failed-on-jython -install_package "distribute-0.6.45" "http://pypi.python.org/packages/source/d/distribute/distribute-0.6.45.tar.gz#8953f2c07e6700dabf2ec150129b8c31" python +install_package "setuptools-0.7.2" "https://bitbucket.org/pypa/setuptools/downloads/setuptools-0.7.2.tar.gz#20003718b266929c4a49e5d7ba3f792c" python # pip (>= 1.3) does not work properly since it uses HTTPS for downloads # * https://github.com/yyuu/pyenv/issues/15 install_package "pip-1.2.1" "http://pypi.python.org/packages/source/p/pip/pip-1.2.1.tar.gz#db8a6d8a4564d3dc7f337ebed67b1a85" python diff --git a/plugins/python-build/share/python-build/jython-2.7-beta1 b/plugins/python-build/share/python-build/jython-2.7-beta1 index fe11de0b..142fbada 100644 --- a/plugins/python-build/share/python-build/jython-2.7-beta1 +++ b/plugins/python-build/share/python-build/jython-2.7-beta1 @@ -1,8 +1,6 @@ require_java install_jar "Jython-2.7-beta1" "http://search.maven.org/remotecontent?filepath=org/python/jython-installer/2.7-b1/jython-installer-2.7-b1.jar" jython -# setuptools (>= 0.7) cannot install to Jython -# * https://bitbucket.org/pypa/setuptools/issue/14/installation-failed-on-jython -install_package "distribute-0.6.45" "http://pypi.python.org/packages/source/d/distribute/distribute-0.6.45.tar.gz#8953f2c07e6700dabf2ec150129b8c31" python +install_package "setuptools-0.7.2" "https://bitbucket.org/pypa/setuptools/downloads/setuptools-0.7.2.tar.gz#20003718b266929c4a49e5d7ba3f792c" python # pip (>= 1.3) does not work properly since it uses HTTPS for downloads # * https://github.com/yyuu/pyenv/issues/15 install_package "pip-1.2.1" "http://pypi.python.org/packages/source/p/pip/pip-1.2.1.tar.gz#db8a6d8a4564d3dc7f337ebed67b1a85" python diff --git a/plugins/python-build/share/python-build/jython-dev b/plugins/python-build/share/python-build/jython-dev index c8c47b2e..add93d51 100644 --- a/plugins/python-build/share/python-build/jython-dev +++ b/plugins/python-build/share/python-build/jython-dev @@ -1,8 +1,6 @@ require_java install_hg "jython-dev" "http://hg.python.org/jython" "default" jython_builder -# setuptools (>= 0.7) cannot install to Jython -# * https://bitbucket.org/pypa/setuptools/issue/14/installation-failed-on-jython -install_package "distribute-0.6.45" "http://pypi.python.org/packages/source/d/distribute/distribute-0.6.45.tar.gz#8953f2c07e6700dabf2ec150129b8c31" python +install_package "setuptools-0.7.2" "https://bitbucket.org/pypa/setuptools/downloads/setuptools-0.7.2.tar.gz#20003718b266929c4a49e5d7ba3f792c" python # pip (>= 1.3) does not work properly since it uses HTTPS for downloads # * https://github.com/yyuu/pyenv/issues/15 install_package "pip-1.2.1" "http://pypi.python.org/packages/source/p/pip/pip-1.2.1.tar.gz#db8a6d8a4564d3dc7f337ebed67b1a85" python