Merge remote-tracking branch 'upstream/master'

Author: awkoren

.github/CODEOWNERS

@@ -9,3 +9,6 @@ bigquery/transfer/*       @tswast
 
 # Tim Swast is the primary maintainer of the Composer samples.
 composer/*                @tswast
+
+# Alix Hamilton is the primary maintainer of the Jupyter notebook samples
+notebooks/*               @alixhami

.gitignore

@@ -3,6 +3,8 @@
 .coverage
 .tox
 .pytest_cache
+.ipynb_checkpoints
+.executed_notebooks
 coverage.xml
 python-docs-samples.json
 service-account.json

.kokoro/common.cfg

@@ -9,7 +9,7 @@ build_file: "python-docs-samples/.kokoro/trampoline.sh"
 # Use the Python worker docker image.
 env_vars: {
     key: "TRAMPOLINE_IMAGE"
-    value: "gcr.io/cloud-devrel-kokoro-resources/python@sha256:4b6ba8c199e96248980db4538065cddeea594138b9b9fb2d0388603922087747"
+    value: "gcr.io/cloud-devrel-kokoro-resources/python@sha256:e11a459d01e5dcd3613fda35c7c94edfecfe911ed79c078580ff59de300b1938"
 }
 
 # Specify project ID

.kokoro/presubmit_tests_testing.cfg .kokoro/presubmit_tests_trace.cfg.kokoro/presubmit_tests_testing.cfg renamed to .kokoro/presubmit_tests_trace.cfg

@@ -11,5 +11,5 @@ env_vars: {
 
 env_vars: {
     key: "NOX_SESSION"
-    value: "testing and py36 and not appengine"
+    value: "trace and py36 and not appengine"
 }

.kokoro/system_tests_testing.cfg .kokoro/system_tests_trace.cfg.kokoro/system_tests_testing.cfg renamed to .kokoro/system_tests_trace.cfg

@@ -11,5 +11,5 @@ env_vars: {
 
 env_vars: {
     key: "NOX_SESSION"
-    value: "testing and py36 and not appengine"
+    value: "trace and py36 and not appengine"
 }

.travis.yml

@@ -32,4 +32,4 @@ install:
 - pip install --upgrade nox
 - pip install --upgrade git+https://github.com/dhermes/ci-diff-helper.git
 script:
-- "./scripts/travis.sh"
+- "./scripts/travis.sh"

AUTHORING_GUIDE.md

@@ -432,7 +432,7 @@ generation.
 
 To use nox, install it globally with `pip`:
 
-    $ pip install nox-automation
+    $ pip install nox
 
 Nox automatically discovers all samples in the repository and generates three
 types of sessions for *each* sample in this repository:

appengine/flexible/analytics/main.py

@@ -42,7 +42,7 @@ def track_event(category, action, label=None, value=0):
     }
 
     response = requests.post(
-        'http://www.google-analytics.com/collect', data=data)
+        'https://www.google-analytics.com/collect', data=data)
 
     # If the request fails, this will raise a RequestException. Depending
     # on your application's needs, this may be a non-error and can be caught

appengine/flexible/analytics/requirements.txt

@@ -1,3 +1,3 @@
 Flask==1.0.2
 gunicorn==19.9.0
-requests[security]==2.19.1
+requests[security]==2.21.0

appengine/flexible/cloudsql/requirements.txt

@@ -1,4 +1,4 @@
 Flask==1.0.2
 Flask-SQLAlchemy==2.3.2
 gunicorn==19.9.0
-PyMySQL==0.9.2
+PyMySQL==0.9.3