Modify display names for Python tests

frameworks/Python/README.md

@@ -104,6 +104,6 @@ for Python 3.
 `bechmark_config` is json file to define test.
 See [here](https://github.com/TechEmpower/FrameworkBenchmarks#the-benchmark_config-file)
 
-`setup_py2.py` is used to run test on Python 2.  `gunicorn_conf.py` is configuration for gunicorn.
-`setup_py2.py` and `gunicorn_conf.py` are written as generic as possible.
+`setup_py2.sh` is used to run test on Python 2.  `gunicorn_conf.py` is configuration for gunicorn.
+`setup_py2.sh` and `gunicorn_conf.py` are written as generic as possible.
 You may be able to use it with changing wsgi callable.  (`$PY2_GUNICORN wsgimodule:callable -c gunicorn_conf.py`)

frameworks/Python/bottle/benchmark_config

@@ -20,7 +20,7 @@
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "bottle",
+      "display_name": "Bottle-Py2",
       "notes": "CPython 2",
       "versus": "wsgi"
     },
@@ -43,7 +43,7 @@
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "bottle-py3",
+      "display_name": "Bottle-Py3",
       "notes": "CPython 3",
       "versus": "wsgi"
     },
@@ -66,7 +66,7 @@
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "bottle-pypy",
+      "display_name": "Bottle-PyPy",
       "notes": "PyPy",
       "versus": "wsgi"
     },
@@ -87,7 +87,7 @@
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "bottle-raw",
+      "display_name": "Bottle-raw-Py2",
       "notes": "CPython 2",
       "versus": "wsgi"
     },
@@ -110,7 +110,7 @@
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "bottle-uWSGI",
+      "display_name": "Bottle-uWSGI",
       "notes": "CPython 2",
       "versus": "wsgi"
     }

frameworks/Python/django/benchmark_config

@@ -19,7 +19,7 @@
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "django",
+      "display_name": "Django-Py2",
       "notes": "CPython 2.7",
       "versus": "wsgi"
     },
@@ -41,7 +41,7 @@
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "django-py3",
+      "display_name": "Django-Py3",
       "notes": "CPython 3.4",
       "versus": "wsgi"
     },
@@ -63,7 +63,7 @@
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "django",
+      "display_name": "Django-Postgres-Py2",
       "notes": "CPython 2.7",
       "versus": "wsgi"
     }

frameworks/Python/falcon/benchmark_config

@@ -9,14 +9,14 @@
       "approach": "Realistic",
       "classification": "Micro",
       "database": "None",
-      "framework": "falcon",
+      "framework": "Falcon",
       "language": "Python",
       "orm": "Raw",
       "platform": "Gunicorn/Meinheld",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "falcon",
+      "display_name": "Falcon-Py2",
       "notes": "CPython 2",
       "versus": "wsgi"
     },
@@ -28,14 +28,14 @@
       "approach": "Realistic",
       "classification": "Micro",
       "database": "None",
-      "framework": "falcon",
+      "framework": "Falcon",
       "language": "Python",
       "orm": "Raw",
       "platform": "Gunicorn/Meinheld",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "falcon-py3",
+      "display_name": "Falcon-Py3",
       "notes": "CPython 3",
       "versus": "wsgi"
     },
@@ -47,14 +47,14 @@
       "approach": "Realistic",
       "classification": "Micro",
       "database": "None",
-      "framework": "falcon",
+      "framework": "Falcon",
       "language": "Python",
       "orm": "Raw",
       "platform": "Gunicorn/Tornado",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "falcon-pypy",
+      "display_name": "Falcon-PyPy",
       "notes": "PyPy",
       "versus": "wsgi"
     }

frameworks/Python/flask/benchmark_config

@@ -20,7 +20,7 @@
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "flask",
+      "display_name": "Flask-Py2",
       "notes": "CPython 2.7",
       "versus": "wsgi"
     },
@@ -41,7 +41,7 @@
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "flask-raw",
+      "display_name": "Flask-raw",
       "notes": "CPython 2.7",
       "versus": "wsgi"
     },
@@ -64,8 +64,8 @@
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "flask-py3",
-      "notes": "CPython 3.3",
+      "display_name": "Flask-Py3",
+      "notes": "CPython 3.4",
       "versus": "wsgi"
     },
     "pypy": {
@@ -87,8 +87,8 @@
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "flask-pypy",
-      "notes": "PyPy 2.3",
+      "display_name": "Flask-PyPy",
+      "notes": "PyPy 2.5",
       "versus": "wsgi"
     },
     "pypy-mysql-raw": {
@@ -108,8 +108,8 @@
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "flask-pypy-raw",
-      "notes": "PyPy 2.3",
+      "display_name": "Flask-PyPy-raw",
+      "notes": "PyPy 2.5",
       "versus": "wsgi"
     },
     "nginx-uwsgi": {
@@ -131,7 +131,7 @@
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "flask-nginx-uWSGI",
+      "display_name": "Flask-nginx-uWSGI",
       "notes": "CPython 2.7",
       "versus": "wsgi"
     }

frameworks/Python/pyramid/benchmark_config

@@ -20,7 +20,7 @@
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "pyramid-py2",
+      "display_name": "Pyramid-Py2",
       "notes": "",
       "versus": "wsgi"
     },
@@ -43,7 +43,7 @@
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "pyramid-py3",
+      "display_name": "Pyramid-Py3",
       "notes": "",
       "versus": "wsgi"
     }

frameworks/Python/tornado/benchmark_config

@@ -18,16 +18,14 @@
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "tornado",
+      "display_name": "Tornado-MongoDB-Py2",
       "notes": "CPython 2.7",
       "versus": ""
     },
     "postgresql-raw": {
       "setup_file": "setup_pg",
-      "json_url": "/json",
       "db_url": "/dbraw",
       "query_url": "/queriesraw?queries=",
-      "plaintext_url": "/plaintext",
       "port": 8080,
       "approach": "Realistic",
       "classification": "Platform",
@@ -39,7 +37,7 @@
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "tornado",
+      "display_name": "Tornado-Postgres-Py2",
       "notes": "CPython 2.7",
       "versus": ""
     },
@@ -60,7 +58,7 @@
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "tornado-py3",
+      "display_name": "Tornado-MongoDB-Py3",
       "notes": "CPython 3.4",
       "versus": ""
     }

frameworks/Python/uwsgi/benchmark_config

@@ -5,7 +5,7 @@
       "setup_file": "setup",
       "json_url": "/json",
       "port": 8080,
-      "approach": "Realistic",
+      "approach": "Stripped",
       "classification": "Platform",
       "database": "None",
       "framework": "wsgi",
@@ -23,7 +23,7 @@
       "setup_file": "setup_nginx",
       "json_url": "/json",
       "port": 8080,
-      "approach": "Realistic",
+      "approach": "Stripped",
       "classification": "Platform",
       "database": "None",
       "framework": "wsgi",

frameworks/Python/wsgi/benchmark_config

@@ -6,7 +6,7 @@
       "json_url": "/json",
       "plaintext_url": "/plaintext",
       "port": 8080,
-      "approach": "Realistic",
+      "approach": "Stripped",
       "classification": "Platform",
       "database": "None",
       "framework": "wsgi",
@@ -16,7 +16,7 @@
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "wsgi",
+      "display_name": "wsgi-meinheld",
       "notes": "",
       "versus": "wsgi"
     },
@@ -25,7 +25,7 @@
       "json_url": "/json",
       "plaintext_url": "/plaintext",
       "port": 8080,
-      "approach": "Realistic",
+      "approach": "Stripped",
       "classification": "Platform",
       "database": "None",
       "framework": "wsgi",