Fixed merge conflicts.

Author: kdeus

.coveragerc

@@ -1,22 +1,11 @@
 [run]
-include =
-    appengine/*
-    bigquery/*
-    bigtable/*
-    blog/*
-    compute/*
-    datastore/*
-    dataproc/*
-    dns/*
-    error_reporting/*
-    language/*
-    logging/*
-    monitoring/*
-    pubsub/*
-    speech/*
-    storage/*
-    translate/*
-    vision/*
+omit =
+    lib/*
+    env/*
+    */.nox/*
+    */conftest.py
+    */google_appengine/*
+
 [report]
 exclude_lines =
     pragma: NO COVER

.travis.yml

@@ -23,8 +23,8 @@ addons:
     - python3.5-dev
 install:
 - pip install --upgrade pip wheel virtualenv
-- pip install nox-automation coverage
+- pip install --upgrade nox-automation coverage
+# Temporarily install this from source.
+- pip install --upgrade git+https://github.com/dhermes/ci-diff-helper.git
 script:
 - ./scripts/travis.sh
-after_script:
-- coverage report

ISSUE_TEMPLATE.md

@@ -0,0 +1,12 @@
+## In which file did you encounter the issue?
+
+<!-- Please provide the full path to the file, to avoid ambiguity -->
+
+### Did you change the file? If so, how?
+
+<!-- A diff would be helpful; otherwise, a description -->
+
+## Describe the issue
+
+<!-- Please be specific. Copying and pasting your invocation and the entire
+output is often helpful. -->

appengine/flexible/analytics/app.yaml

@@ -1,5 +1,5 @@
 runtime: python
-vm: true
+env: flex
 entrypoint: gunicorn -b :$PORT main:app
 
 runtime_config:

appengine/flexible/analytics/requirements.txt

@@ -1,3 +1,3 @@
-Flask==0.11.1
+Flask==0.12
 gunicorn==19.6.0
-requests[security]==2.11.1
+requests[security]==2.12.4

appengine/flexible/cloudsql/app.yaml

@@ -1,21 +1,21 @@
 runtime: python
-vm: true
+env: flex
 entrypoint: gunicorn -b :$PORT main:app
 
 runtime_config:
   python_version: 3
 
 #[START env]
 env_variables:
-    # Replace user, password, database, project, and instance with the values obtained
+    # Replace user, password, database, and instance connection name with the values obtained
     # when configuring your Cloud SQL instance.
     SQLALCHEMY_DATABASE_URI: >-
-      mysql+pymysql://USER:PASSWORD@/DATABASE?unix_socket=/cloudsql/PROJECT:REGION:INSTANCE
+      mysql+pymysql://USER:PASSWORD@/DATABASE?unix_socket=/cloudsql/INSTANCE_CONNECTION_NAME
 #[END env]
 
 #[START cloudsql_settings]
 # Replace project and instance with the values obtained  when configuring your
 # Cloud SQL instance.
 beta_settings:
-    cloud_sql_instances: PROJECT:REGION:INSTANCE
+    cloud_sql_instances: INSTANCE_CONNECTION_NAME
 #[END cloudsql_settings]

appengine/flexible/cloudsql/main.py

@@ -18,7 +18,7 @@
 import socket
 
 from flask import Flask, request
-from flask.ext.sqlalchemy import SQLAlchemy
+from flask_sqlalchemy import SQLAlchemy
 
 
 app = Flask(__name__)

appengine/flexible/cloudsql/requirements.txt

@@ -1,4 +1,4 @@
-Flask==0.11.1
+Flask==0.12
 Flask-SQLAlchemy==2.1
 gunicorn==19.6.0
 PyMySQL==0.7.9

appengine/flexible/datastore/README.md

@@ -14,7 +14,6 @@ When running locally, you can use the [Google Cloud SDK](https://cloud.google.co
 
     $ gcloud init
 
-Set the ``GCLOUD_PROJECT`` environment variable to your Project ID before starting your application:
+Starting your application:
 
-    $ export GCLOUD_PROJECT=[your-project-id]
     $ python main.py

appengine/flexible/datastore/app.yaml

@@ -1,11 +1,6 @@
 runtime: python
-vm: true
+env: flex
 entrypoint: gunicorn -b :$PORT main:app
 
 runtime_config:
   python_version: 3
-
-# [START env_variables]
-env_variables:
-    GCLOUD_PROJECT: your-project-id
-# [END env_variables]