github/pyenv
1
0
Fork 0
mirror of https://github.com/pyenv/pyenv.git synced 2024-11-07 20:31:01 -05:00
Code Issues Projects Releases Packages Wiki Activity

Rename functions

Browse source 
* `build_package_setuptools` -> `build_package_ez_setup`
  * `build_package_pip` -> `build_package_getpip`
This commit is contained in:
Yamashita Yuu 2014-06-15 12:30:15 +09:00
parent 887f2263f0
commit 3ba7702602
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
plugins/python-build/bin/python-build
View file

@ -1363,7 +1363,7 @@ build_package_verify_py34() {
build_package_verify_py33 "$1" "${2:-3.4}"
}
build_package_setuptools() {
build_package_ez_setup() {
{ if [ "${EZ_SETUP+defined}" ] && [ -f "${EZ_SETUP}" ]; then
echo "Installing setuptools from ${EZ_SETUP}..." 1>&2
cat "${EZ_SETUP}"
@ -1375,7 +1375,7 @@ build_package_setuptools() {
} | "${PYTHON_BIN}" 1>&4 2>&1
}
build_package_pip() {
build_package_getpip() {
{ if [ "${GET_PIP+defined}" ] && [ -f "${GET_PIP}" ]; then
echo "Installing pip from ${GET_PIP}..." 1>&2
cat "${GET_PIP}"
@ -1389,8 +1389,8 @@ build_package_pip() {
build_package_ensurepip() {
"$PYTHON_BIN" -m ensurepip 1>/dev/null 2>&1 || {
build_package_setuptools "$@"
build_package_pip "$@"
build_package_ez_setup "$@"
build_package_getpip "$@"
}
create_symlinks "$("$PYTHON_BIN" -c 'import sys;v=sys.version_info;sys.stdout.write("python%d.%d"%(v[0],v[1]))')"

2
plugins/python-build/share/python-build/jython-2.7-beta1
View file

@ -1,5 +1,5 @@
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
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 ez_setup
# 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" "https://pypi.python.org/packages/source/p/pip/pip-1.2.1.tar.gz#12a9302acfca62cdc7bc5d83386cac3e0581db61ac39acdb3a4e766a16b88eb1" python

2
plugins/python-build/share/python-build/jython-2.7-beta2
View file

@ -1,5 +1,5 @@
require_java
install_jar "jython-2.7-beta2" "http://search.maven.org/remotecontent?filepath=org/python/jython-installer/2.7-b2/jython-installer-2.7-b2.jar" jython setuptools
install_jar "jython-2.7-beta2" "http://search.maven.org/remotecontent?filepath=org/python/jython-installer/2.7-b2/jython-installer-2.7-b2.jar" jython ez_setup
# 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" "https://pypi.python.org/packages/source/p/pip/pip-1.2.1.tar.gz#12a9302acfca62cdc7bc5d83386cac3e0581db61ac39acdb3a4e766a16b88eb1" python

2
plugins/python-build/share/python-build/jython-dev
View file

@ -1,5 +1,5 @@
require_java
install_hg "jython-dev" "http://hg.python.org/jython" "default" jython_builder setuptools
install_hg "jython-dev" "http://hg.python.org/jython" "default" jython_builder ez_setup
# 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" "https://pypi.python.org/packages/source/p/pip/pip-1.2.1.tar.gz#12a9302acfca62cdc7bc5d83386cac3e0581db61ac39acdb3a4e766a16b88eb1" python