MagicStack
diff --git a/‎_nodejs/package.json‎
Lines changed: 1 addition & 1 deletion b/‎_nodejs/package.json‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎_python/mkvirtualenv‎
Lines changed: 4 additions & 2 deletions b/‎_python/mkvirtualenv‎
Lines changed: 4 additions & 2 deletions
diff --git a/‎_python/requirements.txt‎
Lines changed: 3 additions & 3 deletions b/‎_python/requirements.txt‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎pgbench‎
Lines changed: 11 additions & 10 deletions b/‎pgbench‎
Lines changed: 11 additions & 10 deletions
diff --git a/‎report/report.html‎
Lines changed: 1 addition & 1 deletion b/‎report/report.html‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎requirements.txt‎
Lines changed: 1 addition & 1 deletion b/‎requirements.txt‎
Lines changed: 1 addition & 1 deletion
@@ -6,7 +6,7 @@
     "bugs" : "http://github.com/cdata/somename/issues",
     "dependencies" : {
         "argparse": "~1.0.7",
-        "pg" : "~6.0.0",
+        "pg" : "~6.1.0",
         "pg-native": "~1.10.0"
     }
 }
@@ -19,7 +19,9 @@ if [ -n "${VIRTUAL_ENV}" ]; then
     unset VIRTUAL_ENV
 fi
 
-python3 -m venv "${1}"
+PYTHON="${PYTHON:-python3}"
+
+"${PYTHON}" -m venv "${1}"
 source "${1}/bin/activate"
-pip install -U pip wheel
+pip install -U pip wheel setuptools
 pip install -U -r "${2}"
@@ -1,6 +1,6 @@
-aiopg==0.10.0
-asyncpg==0.5.2
+aiopg==0.13.0
+asyncpg==0.8.2
 py-postgresql==1.1.0
 psycopg2==2.6.2
 numpy~=1.11.0
-uvloop~=0.5.0
+uvloop~=0.7.1
@@ -354,12 +354,9 @@ def format_report(data, target_file):
 
 BENCHMARKS = [
     'golang-libpq',
-    'golang-pgx',
     'python-aiopg',
     'python-aiopg-tuples',
     'python-asyncpg',
-    'python-psycopg',
-    'python-postgresql',
     'nodejs-pg',
     'nodejs-pg-native',
 ]
@@ -523,17 +520,21 @@ def main():
         pg_cluster.trust_local_connections()
         pg_cluster.start(port='dynamic')
 
-        pghost, pgport = pg_cluster.get_connection_addr()
-        pguser = 'postgres'
+        conn_spec = pg_cluster.get_connection_spec()
+        if not conn_spec.get('user'):
+            conn_spec['user'] = 'postgres'
     else:
         pg_cluster = None
-        pghost = args.pghost
-        pgport = args.pgport
-        pguser = args.pguser
+        conn_spec = {
+            'host': args.pghost,
+            'port': args.pgport,
+            'user': args.pguser
+        }
 
     try:
-        benchmarks_data = \
-            run_benchmarks(args, variations, pghost, pgport, pguser)
+        benchmarks_data = run_benchmarks(
+            args, variations, conn_spec['host'],
+            conn_spec['port'], conn_spec['user'])
     finally:
         if pg_cluster is not None:
             pg_cluster.stop()
 
@@ -140,7 +140,7 @@ <h2>Detailed Benchmark Data</h2>
 
 var fullWidth = (options.width || 1000),
     fullHeight = (options.height || 370),
-    margin = {top: 10, right: 65, bottom: 55, left: 65},
+    margin = {top: 10, right: 100, bottom: 55, left: 100},
     width = fullWidth - margin.left - margin.right,
     height = fullHeight - margin.top - margin.bottom,
     benchmarks = data;
 
@@ -1,2 +1,2 @@
-asyncpg~=0.5.0
+asyncpg~=0.8.0
 numpy~=1.10.4
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`"bugs" : "http://github.com/cdata/somename/issues",`
`7`	`7`	`"dependencies" : {`
`8`	`8`	`"argparse": "~1.0.7",`
`9`		`- "pg" : "~6.0.0",`
	`9`	`+ "pg" : "~6.1.0",`
`10`	`10`	`"pg-native": "~1.10.0"`
`11`	`11`	`}`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-asyncpg~=0.5.0`
	`1`	`+asyncpg~=0.8.0`
`2`	`2`	`numpy~=1.10.4`