googleapis · daniel-sanche · Apr 26, 2021 · Apr 26, 2021 · Apr 26, 2021 · Apr 26, 2021
diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
@@ -0,0 +1,4 @@
+docker:
+  digest: sha256:cfc0e802701262c211703c468874d767f65dabe6a1a71d0e07bfc8a3d5175f32
+  image: gcr.io/repo-automation-bots/owlbot-python:latest  
+
diff --git a/.github/.OwlBot.yaml b/.github/.OwlBot.yaml
@@ -0,0 +1,26 @@
+# Copyright 2021 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.
+
+docker:
+  image: gcr.io/repo-automation-bots/owlbot-python:latest
+
+deep-remove-regex:
+  - /owl-bot-staging
+
+deep-copy-regex:
+  - source: /google/logging/(v.*)/.*-py/(.*)
+    dest: /owl-bot-staging/$1/$2
+
+begin-after-commit-hash: 130ce904e5d546c312943d10f48799590f9c0f66
+
diff --git a/.github/header-checker-lint.yml b/.github/header-checker-lint.yml
@@ -1,6 +1,6 @@
 {"allowedCopyrightHolders": ["Google LLC"],
  "allowedLicenses": ["Apache-2.0", "MIT", "BSD-3"],
- "ignoreFiles": ["**/requirements.txt", "**/requirements-test.txt"],
+ "ignoreFiles": ["**/requirements.txt", "**/requirements-test.txt", "**/__init__.py", "samples/**/constraints.txt", "samples/**/constraints-test.txt"],
  "sourceFileExtensions": [
  	"ts", 
  	"js", 

diff --git a/.kokoro/release.sh b/.kokoro/release.sh
@@ -26,7 +26,7 @@ python3 -m pip install --upgrade twine wheel setuptools
 export PYTHONUNBUFFERED=1
 
 # Move into the package, build the distribution and upload.
-TWINE_PASSWORD=$(cat "${KOKORO_KEYSTORE_DIR}/73713_google_cloud_pypi_password")
+TWINE_PASSWORD=$(cat "${KOKORO_GFILE_DIR}/secret_manager/google-cloud-pypi-token")
 cd github/python-logging
 python3 setup.py sdist bdist_wheel
-twine upload --username gcloudpypi --password "${TWINE_PASSWORD}" dist/*
+twine upload --username __token__ --password "${TWINE_PASSWORD}" dist/*
diff --git a/.kokoro/release/common.cfg b/.kokoro/release/common.cfg
@@ -23,18 +23,8 @@ env_vars: {
     value: "github/python-logging/.kokoro/release.sh"
 }
 
-# Fetch PyPI password	
-before_action {	
-  fetch_keystore {	
-    keystore_resource {	
-      keystore_config_id: 73713	
-      keyname: "google_cloud_pypi_password"	
-    }	
-  }	
-}
-
 # Tokens needed to report release status back to GitHub
 env_vars: {
   key: "SECRET_MANAGER_KEYS"
-  value: "releasetool-publish-reporter-app,releasetool-publish-reporter-googleapis-installation,releasetool-publish-reporter-pem"
-}
+  value: "releasetool-publish-reporter-app,releasetool-publish-reporter-googleapis-installation,releasetool-publish-reporter-pem,google-cloud-pypi-token"
+}
diff --git a/docs/_static/custom.css b/docs/_static/custom.css
@@ -1,9 +1,20 @@
 div#python2-eol {
 	border-color: red;
 	border-width: medium;
-} 
+}
 
 /* Ensure minimum width for 'Parameters' / 'Returns' column */
 dl.field-list > dt {
     min-width: 100px
 }
+
+/* Insert space between methods for readability */
+dl.method {
+	padding-top: 10px;
+	padding-bottom: 10px
+}
+
+/* Insert empty space between classes */
+dl.class {
+	padding-bottom: 50px
+}
diff --git a/synth.py → owlbot.py b/synth.py → owlbot.py
@@ -17,38 +17,33 @@
 from synthtool import gcp
 from synthtool.languages import python
 
-gapic = gcp.GAPICBazel()
 common = gcp.CommonTemplates()
 
-# ----------------------------------------------------------------------------
-# Generate logging GAPIC layer
-# ----------------------------------------------------------------------------
-library = gapic.py_library(
-    service="logging",
-    version="v2",
-    bazel_target="//google/logging/v2:logging-v2-py",
-    include_protos=True,
-)
+default_version = "v2"
 
-s.move(
-    library,
-    excludes=[
-        "setup.py",
-        "README.rst",
-        "google/cloud/logging/__init__.py",  # generated types are hidden from users
-        "google/cloud/logging_v2/__init__.py",  
-        "docs/index.rst",
-        "docs/logging_v2",  # Don't include gapic library docs. Users should use the hand-written layer instead
-        "scripts/fixup_logging_v2_keywords.py",  # don't include script since it only works for generated layer
-    ],
-)
+for library in s.get_staging_dirs(default_version):
+    if library.name == "v2":
+        # Fix generated unit tests
+        s.replace(
+            library / "tests/unit/gapic/logging_v2/test_logging_service_v2.py",
+            "MonitoredResource\(\s*type_",
+            "MonitoredResource(type"
+        )
 
-# Fix generated unit tests
-s.replace(
-    "tests/unit/gapic/logging_v2/test_logging_service_v2.py",
-    "MonitoredResource\(\s*type_",
-    "MonitoredResource(type"
-)
+    s.move(
+        library,
+        excludes=[
+            "setup.py",
+            "README.rst",
+            "google/cloud/logging/__init__.py",  # generated types are hidden from users
+            "google/cloud/logging_v2/__init__.py",
+            "docs/index.rst",
+            "docs/logging_v2",  # Don't include gapic library docs. Users should use the hand-written layer instead
+            "scripts/fixup_logging_v2_keywords.py",  # don't include script since it only works for generated layer
+        ],
+    )
+
+s.remove_staging_dirs()
 
 # ----------------------------------------------------------------------------
 # Add templated files

diff --git a/renovate.json b/renovate.json
@@ -2,5 +2,8 @@
   "extends": [
     "config:base",  ":preserveSemverRanges"
   ],
-  "ignorePaths": [".pre-commit-config.yaml"]
+  "ignorePaths": [".pre-commit-config.yaml"],
+  "pip_requirements": {
+    "fileMatch": ["requirements-test.txt", "samples/[\\S/]*constraints.txt", "samples/[\\S/]*constraints-test.txt"]
+  }
 }
diff --git a/samples/snippets/noxfile.py b/samples/snippets/noxfile.py
@@ -172,10 +172,16 @@ def blacken(session: nox.sessions.Session) -> None:
 def _session_tests(session: nox.sessions.Session, post_install: Callable = None) -> None:
     """Runs py.test for a particular project."""
     if os.path.exists("requirements.txt"):
-        session.install("-r", "requirements.txt")
+        if os.path.exists("constraints.txt"):
+            session.install("-r", "requirements.txt", "-c", "constraints.txt")
+        else:
+            session.install("-r", "requirements.txt")
 
     if os.path.exists("requirements-test.txt"):
-        session.install("-r", "requirements-test.txt")
+        if os.path.exists("constraints-test.txt"):
+            session.install("-r", "requirements-test.txt", "-c", "constraints-test.txt")
+        else:
+            session.install("-r", "requirements-test.txt")
 
     if INSTALL_LIBRARY_FROM_SOURCE:
         session.install("-e", _get_repo_root())

diff --git a/synth.metadata b/synth.metadata