Merge branch 'master' into patch-1

googleapis · Apr 29, 2020 · fd9e346 · fd9e346
2 parents 1511688 + ab6829a
commit fd9e346
Show file tree

Hide file tree

Showing 15 changed files with 9 additions and 1,327 deletions.
diff --git a/noxfile.py b/noxfile.py
@@ -110,8 +110,7 @@ def system(session):
 
     # Install all test dependencies, then install this package into the
     # virtualenv's dist-packages.
-    session.install("mock", "pytest")
-    session.install("git+https://github.com/googleapis/python-test-utils")
+    session.install("mock", "pytest", "google-cloud-testutils")
     session.install("-e", ".")
 
     # Run py.test against the system tests.

diff --git a/synth.metadata b/synth.metadata
@@ -1,26 +1,25 @@
 {
-  "updateTime": "2020-04-21T20:52:59.570188Z",
   "sources": [
     {
-      "generator": {
-        "name": "artman",
-        "version": "2.0.0",
-        "dockerImage": "googleapis/artman@sha256:b3b47805231a305d0f40c4bf069df20f6a2635574e6d4259fac651d3f9f6e098"
+      "git": {
+        "name": ".",
+        "remote": "git@github.com:googleapis/python-monitoring",
+        "sha": "843fa976bd58079917d6278d85785bb5b2ad1352"
       }
     },
     {
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "2bf9f22da3f101aeb536e1e88fe036323b8e9188",
-        "internalRef": "307654927"
+        "sha": "3f5f8a2258c6a41f9fbf7b80acbca631dda0a952",
+        "internalRef": "308922843"
       }
     },
     {
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "21ce80f9d4785dc75aa36d26944bddd5a1b7e25b"
+        "sha": "01b6f23d24b27878b48667ce597876d66b59780e"
       }
     }
   ],
@@ -31,8 +30,7 @@
         "apiName": "monitoring",
         "apiVersion": "v3",
         "language": "python",
-        "generator": "gapic",
-        "config": "google/monitoring/artman_monitoring.yaml"
+        "generator": "bazel"
       }
     }
   ]

diff --git a/test_utils/credentials.json.enc b/test_utils/credentials.json.enc
diff --git a/test_utils/scripts/circleci/get_tagged_package.py b/test_utils/scripts/circleci/get_tagged_package.py
diff --git a/test_utils/scripts/circleci/twine_upload.sh b/test_utils/scripts/circleci/twine_upload.sh