From cdb92c3e2ae4c3384c8b8cd1dda3735ef9a7b3f4 Mon Sep 17 00:00:00 2001 From: Yuta Date: Tue, 12 Apr 2011 00:44:37 +0900 Subject: [PATCH] pythonbrew-install script accept Python-2.7 --- pythonbrew-install | 8 ++++++-- setup.py | 2 +- tests/test_04_install.py | 1 + 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/pythonbrew-install b/pythonbrew-install index 7f64250..757ac03 100755 --- a/pythonbrew-install +++ b/pythonbrew-install @@ -45,13 +45,13 @@ for PYTHON in $PYTHONS ; do PYTHON_VERSION=${PYTHON_VERSION/"Python "/""} PYTHON_VERSION_S=`echo $PYTHON_VERSION | sed -e "s/\(^[[:digit:]]\{1,\}.[[:digit:]]\{1,\}\).*/\1/"` - if [[ $PYTHON_VERSION_S = "2.4" ]] || [[ $PYTHON_VERSION_S = "2.5" ]] || [[ $PYTHON_VERSION_S = "2.6" ]] ; then + if [[ $PYTHON_VERSION_S = "2.4" ]] || [[ $PYTHON_VERSION_S = "2.5" ]] || [[ $PYTHON_VERSION_S = "2.6" ]] || [[ $PYTHON_VERSION_S = "2.7" ]] ; then PYTHON_FOUND='1' break fi done if [[ $PYTHON_FOUND != '1' ]] ; then - echo "pythonbrew required Python (2.4, 2.5 or 2.6)." + echo "pythonbrew required Python (2.4, 2.5, 2.6 or 2.7)." #TODO Installing python. exit fi @@ -63,6 +63,10 @@ fi PATH_DISTS="$ROOT/dists" STABLE_VERSION=`curl -skL https://github.com/utahta/pythonbrew/raw/master/stable-version.txt` +if [[ $STABLE_VERSION = "" ]] ; then + echo 'Could not get stable-version of pythonbrew.' + exit 1 +fi TEMP_FILE="pythonbrew-$STABLE_VERSION" TEMP_TARBALL="$TEMP_FILE.tar.gz" DOWNLOAD_URL="http://pypi.python.org/packages/source/p/pythonbrew/$TEMP_TARBALL" diff --git a/setup.py b/setup.py index 3080b3f..41b91d3 100755 --- a/setup.py +++ b/setup.py @@ -10,7 +10,7 @@ setup(name='pythonbrew', description="Manage python installations in your $HOME", long_description=long_description, classifiers=[ - 'Development Status :: 4 - Beta', + 'Development Status :: 5 - Production/Stable', 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Topic :: Software Development :: Build Tools', diff --git a/tests/test_04_install.py b/tests/test_04_install.py index b2ec31a..fd65732 100644 --- a/tests/test_04_install.py +++ b/tests/test_04_install.py @@ -5,6 +5,7 @@ class InstallOptions(object): configure = "" no_setuptools = False alias = None + jobs = 2 def test_install(): from pythonbrew.commands.install import InstallCommand