Simplify noxfile setup. (GoogleCloudPlatform#2806)

* chore(deps): update dependency requests to v2.23.0 * Simplify noxfile and add version control. * Configure appengine/standard to only test Python 2.7. * Update Kokokro configs to match noxfile. * Add requirements-test to each folder. * Remove Py2 versions from everything execept appengine/standard. * Remove conftest.py. * Remove appengine/standard/conftest.py * Remove 'no-sucess-flaky-report' from pytest.ini. * Add GAE SDK back to appengine/standard tests. * Fix typo. * Roll pytest to python 2 version. * Add a bunch of testing requirements. * Remove typo. * Add appengine lib directory back in. * Add some additional requirements. * Fix issue with flake8 args. * Even more requirements. * Readd appengine conftest.py. * Add a few more requirements. * Even more Appengine requirements. * Add webtest for appengine/standard/mailgun. * Add some additional requirements. * Add workaround for issue with mailjet-rest. * Add responses for appengine/standard/mailjet. Co-authored-by: Renovate Bot <[email protected]>
bpeters · Apr 2, 2020 · 3397e6b · 3397e6b
1 parent 675b9ba
commit 3397e6b
Show file tree

Hide file tree

Showing 245 changed files with 680 additions and 517 deletions.
diff --git a/.kokoro/python2.7/common.cfg b/.kokoro/python2.7/common.cfg
@@ -41,5 +41,5 @@ action {
 # Specify which tests to run
 env_vars: {
     key: "RUN_TESTS_SESSION"
-    value: "gae"
+    value: "py-2.7"
 }
diff --git a/.kokoro/python3.6/common.cfg b/.kokoro/python3.6/common.cfg
@@ -41,5 +41,5 @@ action {
 # Specify which tests to run
 env_vars: {
     key: "RUN_TESTS_SESSION"
-    value: "py3-3.6"
+    value: "py-3.6"
 }
diff --git a/.kokoro/python3.7/common.cfg b/.kokoro/python3.7/common.cfg
@@ -41,5 +41,5 @@ action {
 # Specify which tests to run
 env_vars: {
     key: "RUN_TESTS_SESSION"
-    value: "py3-3.7"
+    value: "py-3.7"
 }
diff --git a/.kokoro/python3.8/common.cfg b/.kokoro/python3.8/common.cfg
@@ -0,0 +1,45 @@
+# Copyright 2019 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Format: //devtools/kokoro/config/proto/build.proto
+
+timeout_mins: 300
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+    key: "TRAMPOLINE_IMAGE"
+    value: "gcr.io/cloud-devrel-kokoro-resources/python-multi"
+}
+
+# Download trampoline resources.
+gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
+
+# Use the trampoline script to run in docker.
+build_file: "python-docs-samples/.kokoro/trampoline.sh"
+
+# Download secrets from Cloud Storage.
+gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/python-docs-samples"
+
+# Copy results for Resultstore
+action {
+  define_artifacts {
+    regex: "**/*sponge_log.xml"
+  }
+}
+
+# Specify which tests to run
+env_vars: {
+    key: "RUN_TESTS_SESSION"
+    value: "py-3.8"
+}
diff --git a/.kokoro/python3.8/continuous.cfg b/.kokoro/python3.8/continuous.cfg
@@ -0,0 +1,21 @@
+# Copyright 2020 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Tell the trampoline which build file to use.
+env_vars: {
+    key: "TRAMPOLINE_BUILD_FILE"
+    value: "github/python-docs-samples/.kokoro/tests/run_tests.sh"
+}
diff --git a/.kokoro/python3.8/periodic.cfg b/.kokoro/python3.8/periodic.cfg
@@ -0,0 +1,21 @@
+# Copyright 2020 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Tell the trampoline which build file to use.
+env_vars: {
+    key: "TRAMPOLINE_BUILD_FILE"
+    value: "github/python-docs-samples/.kokoro/tests/run_tests.sh"
+}
diff --git a/.kokoro/python3.8/presubmit.cfg b/.kokoro/python3.8/presubmit.cfg
@@ -0,0 +1,21 @@
+# Copyright 2019 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Tell the trampoline which build file to use.
+env_vars: {
+    key: "TRAMPOLINE_BUILD_FILE"
+    value: "github/python-docs-samples/.kokoro/tests/run_tests_only_diff.sh"
+}
diff --git a/.kokoro/tests/run_tests.sh b/.kokoro/tests/run_tests.sh
@@ -92,8 +92,13 @@ for file in **/requirements.txt; do
 
     # If no local noxfile exists, copy the one from root
     if [[ ! -f "noxfile.py" ]]; then
-      cp "$ROOT/noxfile-template.py" "./noxfile.py"
-      echo -e "\n Using noxfile from project root. \n"
+      PARENT_DIR=$(cd ../ && pwd)
+      while [[ "$PARENT_DIR" != "$ROOT" && ! -f "$PARENT_DIR/noxfile-template.py" ]];
+      do
+        PARENT_DIR=$(dirname "$PARENT_DIR")
+      done
+      cp "$PARENT_DIR/noxfile-template.py" "./noxfile.py"
+      echo -e "\n Using noxfile-template from parent folder ($PARENT_DIR). \n"
     fi
 
     # Use nox to execute the tests for the project.

diff --git a/appengine/flexible/analytics/requirements-test.txt b/appengine/flexible/analytics/requirements-test.txt
@@ -0,0 +1,2 @@
+pytest==5.3.2
+responses==0.10.12
diff --git a/appengine/flexible/analytics/requirements.txt b/appengine/flexible/analytics/requirements.txt
@@ -1,3 +1,3 @@
 Flask==1.1.1
 gunicorn==20.0.4
-requests[security]==2.22.0
+requests[security]==2.23.0
diff --git a/appengine/flexible/cloudsql/requirements-test.txt b/appengine/flexible/cloudsql/requirements-test.txt
@@ -0,0 +1 @@
+pytest==5.3.2
diff --git a/appengine/flexible/cloudsql_postgresql/requirements-test.txt b/appengine/flexible/cloudsql_postgresql/requirements-test.txt
@@ -0,0 +1 @@
+pytest==5.3.2
diff --git a/appengine/flexible/datastore/requirements-test.txt b/appengine/flexible/datastore/requirements-test.txt
@@ -0,0 +1 @@
+pytest==5.3.2
diff --git a/appengine/flexible/disk/requirements-test.txt b/appengine/flexible/disk/requirements-test.txt
@@ -0,0 +1 @@
+pytest==5.3.2
diff --git a/appengine/flexible/django_cloudsql/requirements-test.txt b/appengine/flexible/django_cloudsql/requirements-test.txt
@@ -0,0 +1 @@
+pytest==5.3.2
diff --git a/appengine/flexible/extending_runtime/requirements-test.txt b/appengine/flexible/extending_runtime/requirements-test.txt
@@ -0,0 +1 @@
+pytest==5.3.2
diff --git a/appengine/flexible/hello_world/requirements-test.txt b/appengine/flexible/hello_world/requirements-test.txt
@@ -0,0 +1 @@
+pytest==5.3.2
diff --git a/appengine/flexible/hello_world_django/requirements-test.txt b/appengine/flexible/hello_world_django/requirements-test.txt
@@ -0,0 +1 @@
+pytest==5.3.2
diff --git a/appengine/flexible/mailgun/requirements-test.txt b/appengine/flexible/mailgun/requirements-test.txt
@@ -0,0 +1,2 @@
+pytest==5.3.2
+responses==0.10.12
diff --git a/appengine/flexible/mailgun/requirements.txt b/appengine/flexible/mailgun/requirements.txt
@@ -1,3 +1,3 @@
 Flask==1.1.1
 gunicorn==20.0.4
-requests[security]==2.22.0
+requests[security]==2.23.0
diff --git a/appengine/flexible/mailjet/requirements-test.txt b/appengine/flexible/mailjet/requirements-test.txt
@@ -0,0 +1,2 @@
+pytest==5.3.2
+responses==0.10.12
diff --git a/appengine/flexible/mailjet/requirements.txt b/appengine/flexible/mailjet/requirements.txt
@@ -1,4 +1,4 @@
 Flask==1.1.1
 gunicorn==20.0.4
-requests[security]==2.22.0
+requests[security]==2.23.0
 mailjet-rest==1.3.3
diff --git a/appengine/flexible/memcache/requirements-test.txt b/appengine/flexible/memcache/requirements-test.txt
@@ -0,0 +1 @@
+pytest==5.3.2
diff --git a/appengine/flexible/metadata/requirements-test.txt b/appengine/flexible/metadata/requirements-test.txt
@@ -0,0 +1 @@
+pytest==5.3.2
diff --git a/appengine/flexible/metadata/requirements.txt b/appengine/flexible/metadata/requirements.txt
@@ -1,3 +1,3 @@
 Flask==1.1.1
 gunicorn==20.0.4
-requests[security]==2.22.0
+requests[security]==2.23.0
diff --git a/appengine/flexible/multiple_services/gateway-service/requirements-test.txt b/appengine/flexible/multiple_services/gateway-service/requirements-test.txt
@@ -0,0 +1 @@
+pytest==5.3.2
diff --git a/appengine/flexible/multiple_services/gateway-service/requirements.txt b/appengine/flexible/multiple_services/gateway-service/requirements.txt
@@ -1,3 +1,3 @@
 Flask==1.1.1
 gunicorn==20.0.4
-requests==2.22.0
+requests==2.23.0
diff --git a/appengine/flexible/multiple_services/static-service/requirements-test.txt b/appengine/flexible/multiple_services/static-service/requirements-test.txt
@@ -0,0 +1 @@
+pytest==5.3.2
diff --git a/appengine/flexible/multiple_services/static-service/requirements.txt b/appengine/flexible/multiple_services/static-service/requirements.txt
@@ -1,3 +1,3 @@
 Flask==1.1.1
 gunicorn==20.0.4
-requests==2.22.0
+requests==2.23.0
diff --git a/appengine/flexible/numpy/requirements-test.txt b/appengine/flexible/numpy/requirements-test.txt
@@ -0,0 +1 @@
+pytest==5.3.2
diff --git a/appengine/flexible/pubsub/requirements-test.txt b/appengine/flexible/pubsub/requirements-test.txt
@@ -0,0 +1 @@
+pytest==5.3.2
diff --git a/appengine/flexible/redis/requirements-test.txt b/appengine/flexible/redis/requirements-test.txt
@@ -0,0 +1 @@
+pytest==5.3.2
diff --git a/appengine/flexible/scipy/requirements-test.txt b/appengine/flexible/scipy/requirements-test.txt
@@ -0,0 +1 @@
+pytest==5.3.2
diff --git a/appengine/flexible/sendgrid/requirements-test.txt b/appengine/flexible/sendgrid/requirements-test.txt
@@ -0,0 +1,2 @@
+pytest==5.3.2
+mock==3.0.5
diff --git a/appengine/flexible/static_files/requirements-test.txt b/appengine/flexible/static_files/requirements-test.txt
@@ -0,0 +1 @@
+pytest==5.3.2
diff --git a/appengine/flexible/storage/requirements-test.txt b/appengine/flexible/storage/requirements-test.txt
@@ -0,0 +1 @@
+pytest==5.3.2
diff --git a/appengine/flexible/tasks/requirements-test.txt b/appengine/flexible/tasks/requirements-test.txt
@@ -0,0 +1 @@
+pytest==5.3.2
diff --git a/appengine/flexible/twilio/requirements-test.txt b/appengine/flexible/twilio/requirements-test.txt
@@ -0,0 +1,2 @@
+pytest==5.3.2
+responses==0.10.12
diff --git a/appengine/flexible/websockets/requirements-test.txt b/appengine/flexible/websockets/requirements-test.txt
@@ -0,0 +1,3 @@
+pytest==5.3.2
+retrying==1.3.3
+websocket-client==0.56.0
diff --git a/appengine/flexible/websockets/requirements.txt b/appengine/flexible/websockets/requirements.txt
@@ -1,4 +1,4 @@
 Flask==1.1.1
 Flask-Sockets==0.2.1
 gunicorn==20.0.4
-requests==2.22.0
+requests==2.23.0
diff --git a/appengine/standard/analytics/requirements-test.txt b/appengine/standard/analytics/requirements-test.txt
@@ -0,0 +1,3 @@
+pytest==4.6.9
+gcp-devrel-py-tools==0.0.15
+responses==0.10.12
diff --git a/appengine/standard/analytics/requirements.txt b/appengine/standard/analytics/requirements.txt
@@ -1,3 +1,3 @@
 Flask==1.1.1
-requests==2.22.0
+requests==2.23.0
 requests-toolbelt==0.9.1
diff --git a/appengine/standard/blobstore/blobreader/requirements-test.txt b/appengine/standard/blobstore/blobreader/requirements-test.txt
@@ -0,0 +1,3 @@
+pytest==4.6.9
+gcp-devrel-py-tools==0.0.15
+WebTest==2.0.34
diff --git a/appengine/standard/blobstore/gcs/requirements-test.txt b/appengine/standard/blobstore/gcs/requirements-test.txt
@@ -0,0 +1,3 @@
+pytest==4.6.9
+gcp-devrel-py-tools==0.0.15
+WebTest==2.0.34
diff --git a/appengine/standard/django/requirements-test.txt b/appengine/standard/django/requirements-test.txt
@@ -0,0 +1,2 @@
+pytest==4.6.9
+gcp-devrel-py-tools==0.0.15
diff --git a/appengine/standard/endpoints-frameworks-v2/echo/requirements-test.txt b/appengine/standard/endpoints-frameworks-v2/echo/requirements-test.txt
@@ -0,0 +1,3 @@
+pytest==4.6.9
+gcp-devrel-py-tools==0.0.15
+mock==3.0.5
diff --git a/appengine/standard/endpoints-frameworks-v2/iata/requirements-test.txt b/appengine/standard/endpoints-frameworks-v2/iata/requirements-test.txt
@@ -0,0 +1,2 @@
+pytest==4.6.9
+gcp-devrel-py-tools==0.0.15
diff --git a/appengine/standard/endpoints-frameworks-v2/quickstart/requirements-test.txt b/appengine/standard/endpoints-frameworks-v2/quickstart/requirements-test.txt
@@ -0,0 +1,3 @@
+pytest==4.6.9
+gcp-devrel-py-tools==0.0.15
+mock==3.0.5
diff --git a/appengine/standard/firebase/firenotes/backend/requirements-test.txt b/appengine/standard/firebase/firenotes/backend/requirements-test.txt
@@ -0,0 +1,3 @@
+pytest==4.6.9
+gcp-devrel-py-tools==0.0.15
+mock==3.0.5
diff --git a/appengine/standard/firebase/firenotes/backend/requirements.txt b/appengine/standard/firebase/firenotes/backend/requirements.txt
@@ -2,5 +2,5 @@ Flask==1.1.1
 pyjwt==1.7.1
 flask-cors==3.0.8
 google-auth==1.11.2
-requests==2.22.0
+requests==2.23.0
 requests-toolbelt==0.9.1
diff --git a/appengine/standard/firebase/firetactoe/requirements-test.txt b/appengine/standard/firebase/firetactoe/requirements-test.txt
@@ -0,0 +1,3 @@
+pytest==4.6.9
+gcp-devrel-py-tools==0.0.15
+WebTest==2.0.34
diff --git a/appengine/standard/firebase/firetactoe/requirements.txt b/appengine/standard/firebase/firetactoe/requirements.txt
@@ -1,5 +1,5 @@
 flask==1.1.1
-requests==2.22.0
+requests==2.23.0
 requests_toolbelt==0.9.1
 oauth2client==4.1.3
 functools32==3.2.3.post2; python_version < "3"
diff --git a/appengine/standard/flask/tutorial/requirements-test.txt b/appengine/standard/flask/tutorial/requirements-test.txt
@@ -0,0 +1,2 @@
+pytest==4.6.9
+gcp-devrel-py-tools==0.0.15
diff --git a/appengine/standard/iap/requirements-test.txt b/appengine/standard/iap/requirements-test.txt
@@ -0,0 +1,3 @@
+pytest==4.6.9
+gcp-devrel-py-tools==0.0.15
+WebTest==2.0.34
diff --git a/appengine/standard/mailgun/requirements-test.txt b/appengine/standard/mailgun/requirements-test.txt
@@ -0,0 +1,5 @@
+pytest==4.6.9
+gcp-devrel-py-tools==0.0.15
+google-api-python-client==1.7.11
+mock==3.0.5
+WebTest==2.0.34
diff --git a/appengine/standard/mailjet/requirements-test.txt b/appengine/standard/mailjet/requirements-test.txt
@@ -0,0 +1,3 @@
+pytest==4.6.9
+gcp-devrel-py-tools==0.0.15
+responses==0.10.12
diff --git a/appengine/standard/mailjet/requirements.txt b/appengine/standard/mailjet/requirements.txt
@@ -1,4 +1,4 @@
 Flask==1.1.1
-requests==2.22.0
+requests==2.23.0
 requests-toolbelt==0.9.1
 mailjet-rest==1.3.3
diff --git a/appengine/standard/ndb/transactions/requirements-test.txt b/appengine/standard/ndb/transactions/requirements-test.txt
@@ -0,0 +1,2 @@
+pytest==4.6.9
+gcp-devrel-py-tools==0.0.15