rename asyncio > api_hour (#2527)

* rename asyncio > api_hour

* bodge api_hour into passing (hopefully)

.travis.yml

@@ -146,7 +146,7 @@ env:
     - "TESTDIR=PHP/zend"
     - "TESTDIR=PHP/zend1"
     - "TESTDIR=PHP/phreeze"
-    - "TESTDIR=Python/asyncio"
+    - "TESTDIR=Python/api_hour"
     - "TESTDIR=Python/bottle"
     - "TESTDIR=Python/cherrypy"
     - "TESTDIR=Python/django"

frameworks/Python/asyncio/README.md → frameworks/Python/api_hour/README.md

@@ -1,6 +1,6 @@
-# AsyncIO/API-Hour Benchmark Test
+# AsyncIO/aiohttp/API-Hour Benchmark Test
 
-This is the AsyncIO/API-Hour portion of a [benchmarking tests suite](../../) 
+This is the AsyncIO/aiohttp/API-Hour portion of a [benchmarking tests suite](../../) 
 comparing a variety of web development platforms.
 
 The information below is specific to AsyncIO/API-Hour. For further guidance, 

frameworks/Python/asyncio/benchmark_config.json → frameworks/Python/api_hour/benchmark_config.json

@@ -1,5 +1,5 @@
 {
-  "framework": "asyncio",
+  "framework": "api_hour",
   "tests": [{
     "default": {
       "setup_file": "aiohttp.web/setup-postgresql",
@@ -22,8 +22,7 @@
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "Asyncio",
-      "notes": "Python 3 + API-Hour + AsyncIO + aiohttp.web + PostgreSQL",
-      "versus": "asyncio"
+      "notes": "Python 3 + API-Hour + AsyncIO + aiohttp.web + PostgreSQL"
     },
     "mysql": {
       "setup_file": "aiohttp.web/setup-mysql",
@@ -44,8 +43,7 @@
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "Asyncio",
-      "notes": "Python 3 + API-Hour + AsyncIO + aiohttp.web + MySQL",
-      "versus": "asyncio"
+      "notes": "Python 3 + API-Hour + AsyncIO + aiohttp.web + MySQL"
     },
     "json": {
       "setup_file": "yocto_http/setup",
@@ -63,8 +61,7 @@
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "Asyncio",
-      "notes": "Python 3 + API-Hour + AsyncIO",
-      "versus": "asyncio"
+      "notes": "Python 3 + API-Hour + AsyncIO"
     },
     "dbs": {
       "setup_file": "yocto_http/setup",
@@ -84,8 +81,7 @@
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "Asyncio",
-      "notes": "Python 3 + API-Hour + AsyncIO",
-      "versus": "asyncio"
+      "notes": "Python 3 + API-Hour + AsyncIO"
     },
     "plaintext": {
       "setup_file": "yocto_http/setup",
@@ -103,8 +99,7 @@
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "Asyncio",
-      "notes": "Python 3 + API-Hour + AsyncIO",
-      "versus": "asyncio"
+      "notes": "Python 3 + API-Hour + AsyncIO"
     }
   }]
 }

frameworks/Python/asyncio/requirements.txt → frameworks/Python/api_hour/requirements.txt

@@ -14,7 +14,6 @@ PyYAML==3.11
 requests==2.7.0
 requests-futures==0.9.5
 setproctitle==1.1.8
-six==1.9.0
 ujson==1.33
 aiomysql==0.0.7
-PyMySQL==0.6.7
+PyMySQL==0.6.7