Procházet zdrojové kódy

flask: Drop CPython 2.7 (#3307)

see also: #3306
INADA Naoki před 7 roky
rodič
revize
c92b0d2838

+ 10 - 34
frameworks/Python/flask/benchmark_config.json

@@ -2,7 +2,7 @@
   "framework": "flask",
   "tests": [{
     "default": {
-      "setup_file": "setup_py2",
+      "setup_file": "setup_py3",
       "json_url": "/json",
       "db_url": "/dbs",
       "query_url": "/db?queries=",
@@ -15,18 +15,18 @@
       "database": "MySQL",
       "framework": "flask",
       "language": "Python",
-      "flavor": "Python2",
+      "flavor": "Python3",
       "orm": "Full",
       "platform": "Meinheld",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "Flask",
-      "notes": "CPython 2.7",
+      "notes": "",
       "versus": "wsgi"
     },
-    "mysql-raw": {
-      "setup_file": "setup_py2",
+    "raw": {
+      "setup_file": "setup_py3",
       "db_url": "/dbsraw",
       "query_url": "/dbraw?queries=",
       "fortune_url": "/fortunesraw",
@@ -37,38 +37,14 @@
       "database": "MySQL",
       "framework": "flask",
       "language": "Python",
-      "flavor": "Python2",
+      "flavor": "CPython",
       "orm": "Raw",
       "platform": "Meinheld",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "Flask-raw",
-      "notes": "CPython 2.7",
-      "versus": "wsgi"
-    },
-    "py3": {
-      "setup_file": "setup_py3",
-      "json_url": "/json",
-      "db_url": "/dbs",
-      "query_url": "/db?queries=",
-      "fortune_url": "/fortunes",
-      "update_url": "/updates?queries=",
-      "plaintext_url": "/plaintext",
-      "port": 8080,
-      "approach": "Realistic",
-      "classification": "Micro",
-      "database": "MySQL",
-      "framework": "flask",
-      "language": "Python",
-      "flavor": "Python3",
-      "orm": "Full",
-      "platform": "Meinheld",
-      "webserver": "None",
-      "os": "Linux",
-      "database_os": "Linux",
-      "display_name": "Flask",
-      "notes": "CPython 3.4",
+      "notes": "",
       "versus": "wsgi"
     },
     "pypy2": {
@@ -95,7 +71,7 @@
       "notes": "PyPy2",
       "versus": "wsgi"
     },
-    "pypy2-mysql-raw": {
+    "pypy2-raw": {
       "setup_file": "setup_pypy2",
       "db_url": "/dbsraw",
       "query_url": "/dbraw?queries=",
@@ -131,14 +107,14 @@
       "database": "MySQL",
       "framework": "flask",
       "language": "Python",
-      "flavor": "Python2",
+      "flavor": "CPython",
       "orm": "Full",
       "platform": "None",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "Flask",
-      "notes": "CPython 2.7",
+      "notes": "",
       "versus": "wsgi"
     }
   }]

+ 3 - 3
frameworks/Python/flask/setup_nginxuwsgi.sh

@@ -1,11 +1,11 @@
 #!/bin/bash
 
-fw_depends mysql python2 nginx
+fw_depends mysql python3 nginx
 
 sed -i 's|include .*/conf/uwsgi_params;|include '"${NGINX_HOME}"'/conf/uwsgi_params;|g' nginx.conf
 
-pip install --install-option="--prefix=${PY2_ROOT}" -r $TROOT/requirements.txt
+pip3 install --install-option="--prefix=${PY3_ROOT}" -r $TROOT/requirements.txt
 
 nginx -c $TROOT/nginx.conf
 
-uwsgi --ini $TROOT/uwsgi.ini --processes $CPU_COUNT --wsgi app:app &
+uwsgi --ini $TROOT/uwsgi.ini --processes $((CPU_COUNT*3)) --wsgi app:app &

+ 0 - 7
frameworks/Python/flask/setup_py2.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-fw_depends mysql python2
-
-pip install --install-option="--prefix=${PY2_ROOT}" -r $TROOT/requirements.txt
-
-gunicorn app:app -c gunicorn_conf.py &