Merging in remote master

README.md

@@ -5,6 +5,8 @@ Simple Python client for interacting with Google BigQuery.
 
 This client provides an API for retrieving and inserting BigQuery data by wrapping Google's low-level API client library. It also provides facilities that make it convenient to access data that is tied to an App Engine appspot, such as request logs.
 
+[Documentation](http://tylertreat.github.io/BigQuery-Python/)
+
 # Installation
 
 `pip install bigquery-python`
@@ -29,7 +31,7 @@ client = get_client(project_id, service_account=service_account,
 # JSON key provided by Google
 json_key = 'key.json'
 
-client = get_client(project_id, json_key_file=json_key, readonly=True)
+client = get_client(json_key_file=json_key, readonly=True)
 
 # Submit an async query.
 job_id, _results = client.query('SELECT * FROM dataset.my_table LIMIT 1000')
@@ -99,13 +101,32 @@ conditions = [
     }
 ]
 
+grouping = ['Timestamp']
+
+having = [
+    {
+        'field': 'Timestamp',
+        'type': 'INTEGER',
+        'comparators': [
+            {
+                'condition': '==',
+                'negate': False,
+                'value': 1399478981
+            }
+        ]
+    }
+]
+
+order_by ={'fields': ['Timestamp'], 'direction': 'desc'}
+
 query = render_query(
     'dataset',
     ['table'],
     select=selects,
     conditions=conditions,
-    groupings=['Timestamp'],
-    order_by={'field': 'Timestamp', 'direction': 'desc'}
+    groupings=grouping,
+    having=having,
+    order_by=order_by
 )
 
 job_id, _ = client.query(query)
@@ -168,6 +189,34 @@ try:
 except BigQueryTimeoutException:
     print "Timeout"
 
+# write to permanent table with UDF in query string
+external_udf_uris = ["gs://bigquery-sandbox-udf/url_decode.js"]
+query = """SELECT requests, title
+            FROM
+              urlDecode(
+                SELECT
+                  title, sum(requests) AS num_requests
+                FROM
+                  [fh-bigquery:wikipedia.pagecounts_201504]
+                WHERE language = 'fr'
+                GROUP EACH BY title
+              )
+            WHERE title LIKE '%ç%'
+            ORDER BY requests DESC
+            LIMIT 100
+        """
+job = client.write_to_table(
+  query,
+  'dataset',
+  'table',
+  external_udf_uris=external_udf_uris
+)
+
+try:
+    job_resource = client.wait_for_job(job, timeout=60)
+    print job_resource
+except BigQueryTimeoutException:
+    print "Timeout"
 
 # write to temporary table
 job = client.write_to_table('SELECT * FROM dataset.original_table LIMIT 100')
@@ -176,6 +225,8 @@ try:
     print job_resource
 except BigQueryTimeoutException:
     print "Timeout"
+
+
 ```
 
 # Import data from Google cloud storage

bigquery/__init__.py

@@ -1,4 +1,7 @@
 from __future__ import absolute_import
+
+from .version import __version__
+
 from .client import get_client
 from .client import (
     BIGQUERY_SCOPE,