فهرست منبع

added python3 test

Keith Newman 10 سال پیش
والد
کامیت
ff4619c851

+ 5 - 0
frameworks/Python/cherrypy/bash_profile.sh

@@ -1,3 +1,8 @@
 export PY2_ROOT=$IROOT/py2
 export PY2=$PY2_ROOT/bin/python
 export PY2_PIP=$PY2_ROOT/bin/pip
+
+
+export PY3_ROOT=$IROOT/py3
+export PY3=$PY3_ROOT/bin/python3
+export PY3_PIP=$PY3_ROOT/bin/pip3

+ 20 - 1
frameworks/Python/cherrypy/benchmark_config

@@ -16,7 +16,26 @@
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "cherrypy"
+      "display_name": "cherrypy",
+      "notes": "CPython 2.7"
+    },
+     "py3": {
+      "setup_file": "setup_py3",
+      "json_url": "/json",
+      "plaintext_url": "/plaintext",
+      "port": 8080,
+      "approach": "Realistic",
+      "classification": "Micro",
+      "database": "None",
+      "framework": "cherrypy",
+      "language": "Python",
+      "orm": "Raw",
+      "platform": "CherryPy",
+      "webserver": "None",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "cherrypy-py3",
+      "notes": "CPython 3.4"
     }
   }]
 }

+ 2 - 4
frameworks/Python/cherrypy/install.sh

@@ -3,11 +3,9 @@
 mkdir -p $IROOT/.pip_cache
 export PIP_DOWNLOAD_CACHE=$IROOT/.pip_cache
 
-fw_depends python2 
-#python3 pypy
+fw_depends python2 python3
 
 $PY2_PIP install --install-option="--prefix=${PY2_ROOT}" -r $TROOT/requirements.txt
 
-#$PY3_PIP install --install-option="--prefix=${PY3_ROOT}" -r $TROOT/requirements.txt
+$PY3_PIP install --install-option="--prefix=${PY3_ROOT}" -r $TROOT/requirements.txt
 
-#$PYPY_PIP install --install-option="--prefix=${PYPY_ROOT}" -r $TROOT/requirements-pypy.txt

+ 1 - 1
frameworks/Python/cherrypy/setup.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-python app.py &
+$PY2 app.py &

+ 3 - 0
frameworks/Python/cherrypy/setup_py3.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+$PY3 app.py &