Browse Source

Update CPython 2.7.5 and PyPy 2.0.2.

* Install CPython to ~/FrameworkBenchmarks/installs
* Remove eventlet and gevent
* Update Django to 1.5.1
* Update some libraries.
INADA Naoki 12 years ago
parent
commit
30a44d1aa1
2 changed files with 26 additions and 26 deletions
  1. 2 0
      config/benchmark_profile
  2. 24 26
      installer.py

+ 2 - 0
config/benchmark_profile

@@ -11,6 +11,8 @@ export PLAY1_HOME=~/FrameworkBenchmarks/installs/play-1.2.5
 export MAVEN_HOME=~/FrameworkBenchmarks/installs/apache-maven-3.0.5
 export PERL_HOME=/opt/ActivePerl-5.16
 export DART_HOME=~/FrameworkBenchmarks/installs/dart-sdk
+export PYTHON_HOME=~/FrameworkBenchmarks/installs/python-2.7.5
+export PATH="$PYTHON_HOME/bin:$PATH"
 export PATH="$JAVA_HOME/bin:$GRAILS_HOME/bin:$PLAY_HOME:$PLAY1_HOME:$VERTX_HOME/bin:$GOROOT/bin:$NODE_HOME/bin:$HOME/FrameworkBenchmarks/installs/bin:$MAVEN_HOME/bin:$PERL_HOME/bin:$PERL_HOME/site/bin:$DART_HOME/bin:$PATH"
 
 export LD_LIBRARY_PATH='$LD_LIBRARY_PATH:/usr/local/apr/lib'

+ 24 - 26
installer.py

@@ -53,27 +53,29 @@ class Installer:
     #
     # Python
     #
+    self.__run_command("curl -L http://bitbucket.org/pypy/pypy/downloads/pypy-2.0.2-linux64.tar.bz2 | tar xj")
+    self.__run_command("curl http://www.python.org/ftp/python/2.7.5/Python-2.7.5.tgz | tar xvz")
+    self.__run_command("./configure --prefix=$HOME/FrameworkBenchmarks/installs/python-2.7.5", cwd="Python-2.7.5")
+    self.__run_command("make -j", cwd="Python-2.7.5")
+    self.__run_command("make install", cwd="Python-2.7.5")
+
+    self.__run_command("curl https://pypi.python.org/packages/source/d/distribute/distribute-0.6.45.tar.gz | tar xvz")
+    self.__run_command("../pypy-2.0/bin/pypy setup.py install", cwd="distribute-0.6.45")
+    self.__run_command("python setup.py install", cwd="distribute-0.6.45")
 
-    self.__run_command("curl -L http://bitbucket.org/pypy/pypy/downloads/pypy-2.0-linux64.tar.bz2 | tar xvj")
-    self.__run_command("curl http://www.python.org/ftp/python/2.7.4/Python-2.7.4.tgz | tar xvz")
-    self.__run_command("./configure", cwd="Python-2.7.4")
-    self.__run_command("make -j", cwd="Python-2.7.4")
-    self.__run_command("sudo make install", cwd="Python-2.7.4")
-    self.__run_command("curl https://pypi.python.org/packages/source/d/distribute/distribute-0.6.38.tar.gz | tar xvz")
-    # run pypy before python. (`setup.py install` fails after `sudo setup.py install`)
-    self.__run_command("../pypy-2.0/bin/pypy setup.py install", cwd="distribute-0.6.38")
-    self.__run_command("sudo python setup.py install", cwd="distribute-0.6.38")
     self.__run_command("curl https://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz | tar xvz")
     self.__run_command("../pypy-2.0/bin/pypy setup.py install", cwd="pip-1.3.1")
-    self.__run_command("sudo python setup.py install", cwd="pip-1.3.1")
-    self.__run_command("sudo pip install MySQL-python==1.2.4")
-    self.__run_command("sudo pip install simplejson==3.0.7")
+    self.__run_command("python setup.py install", cwd="pip-1.3.1")
+
+    self.__run_command("pip install MySQL-python==1.2.4")
+    self.__run_command("pip install simplejson==3.3.0")
     self.__run_command("curl http://initd.org/psycopg/tarballs/PSYCOPG-2-5/psycopg2-2.5.tar.gz | tar xvz")
-    self.__run_command("sudo python setup.py install", cwd="psycopg2-2.5")
+    self.__run_command("python setup.py install", cwd="psycopg2-2.5")
     self.__run_command("git clone https://github.com/iiilx/django-psycopg2-pool.git")
-    self.__run_command("sudo python setup.py install", cwd="django-psycopg2-pool")
-    self.__run_command("sudo pip install --upgrade numpy==1.7.1")
+    self.__run_command("python setup.py install", cwd="django-psycopg2-pool")
+    self.__run_command("pip install --upgrade numpy==1.7.1")
     self.__run_command("pypy-2.0/bin/pip install PyMySQL==0.5")
+    self.__run_command("easy_install -U 'ujson==1.30'")
 
     #
     # nodejs
@@ -215,10 +217,8 @@ class Installer:
     # Gunicorn
     #
 
-    self.__run_command("sudo easy_install -U 'gunicorn==0.17.4'")
-    self.__run_command("sudo pip install --upgrade meinheld")
-    self.__run_command("sudo easy_install -U 'eventlet==0.12.1'")
-    self.__run_command("sudo pip install --upgrade 'gevent==0.13.8'")
+    self.__run_command("easy_install -U 'gunicorn==0.17.4'")
+    self.__run_command("pip install --upgrade meinheld")
 
     #
     # Resin
@@ -242,16 +242,14 @@ class Installer:
     # Tornado
     ##############################
     packages = "tornado==3.0.1 motor==0.1 pymongo==2.5"
-    self.__run_command("sudo pip install " + packages)
+    self.__run_command("pip install " + packages)
     self.__run_command("pypy-2.0/bin/pip install " + packages)
 
     ##############################
     # Django
     ##############################
-    self.__run_command("curl http://www.djangoproject.com/m/releases/1.4/Django-1.4.tar.gz | tar xvz")
-    self.__run_command("sudo rm -rf /usr/local/lib/python2.7/site-packages/django")
-    self.__run_command("sudo python setup.py install", cwd="Django-1.4")
-    self.__run_command("sudo easy_install -U 'ujson==1.30'")
+    self.__run_command("rm -rf python-2.7.5/lib/python2.7/site-packages/django")
+    self.__run_command("pip install -U Django==1.5.1")
 
     ##############################
     # Grails
@@ -265,13 +263,13 @@ class Installer:
     # Flask
     ##############################
     packages = "flask==0.9 flask-sqlalchemy==0.16 sqlalchemy==0.8.1 jinja2==2.6 werkzeug==0.8.3"
-    self.__run_command("sudo pip install " + packages)
+    self.__run_command("pip install " + packages)
     self.__run_command("pypy-2.0/bin/pip install " + packages)
 
     ##############################
     # Bottle
     ##############################
-    self.__run_command("sudo pip install bottle bottle-sqlalchemy")
+    self.__run_command("pip install bottle bottle-sqlalchemy")
 
     ##############################
     # Play 2