update .OwlBot.yaml and regenerate client locally

googleapis · Sep 30, 2023 · 0d0d060 · 0d0d060
1 parent eccab6f
commit 0d0d060
Show file tree

Hide file tree

Showing 12 changed files with 24 additions and 42 deletions.
diff --git a/packages/google-apps-script-type/.OwlBot.yaml b/packages/google-apps-script-type/.OwlBot.yaml
@@ -13,5 +13,17 @@
 # limitations under the License.
 
 deep-copy-regex:
-    - source: /google/apps/script/type/(.*-py)
+    - source: /google/apps/script/type/calendar/(.*-py)
+      dest: /owl-bot-staging/google-apps-script-type/$1
+    - source: /google/apps/script/type/docs/(.*-py)
+      dest: /owl-bot-staging/google-apps-script-type/$1
+    - source: /google/apps/script/type/drive/(.*-py)
+      dest: /owl-bot-staging/google-apps-script-type/$1
+    - source: /google/apps/script/type/gmail(.*-py)
+      dest: /owl-bot-staging/google-apps-script-type/$1
+    - source: /google/apps/script/type/sheets(.*-py)
+      dest: /owl-bot-staging/google-apps-script-type/$1
+    - source: /google/apps/script/type/slides(.*-py)
+      dest: /owl-bot-staging/google-apps-script-type/$1
+    - source: /google/apps/script/type/(type-py)
       dest: /owl-bot-staging/google-apps-script-type/$1
diff --git a/packages/google-apps-script-type/.coveragerc b/packages/google-apps-script-type/.coveragerc
@@ -4,8 +4,8 @@ branch = True
 [report]
 show_missing = True
 omit =
-    google/apps/script/type/slides/__init__.py
-    google/apps/script/type/slides/gapic_version.py
+    google/apps/script/type/__init__.py
+    google/apps/script/type/gapic_version.py
 exclude_lines =
     # Re-enable the standard pragma
     pragma: NO COVER

diff --git a/packages/google-apps-script-type/CONTRIBUTING.rst b/packages/google-apps-script-type/CONTRIBUTING.rst
@@ -143,12 +143,12 @@ Running System Tests
    $ nox -s system
 
    # Run a single system test
-   $ nox -s system- -- -k <name of test>
+   $ nox -s system-3.11 -- -k <name of test>
 
 
   .. note::
 
-      System tests are only configured to run under Python.
+      System tests are only configured to run under Python 3.8, 3.9, 3.10 and 3.11.
       For expediency, we do not run them in older versions of Python 3.
 
   This alone will not run the tests. You'll need to change some local

diff --git a/packages/google-apps-script-type/docs/index.rst b/packages/google-apps-script-type/docs/index.rst
@@ -3,5 +3,5 @@ API Reference
 .. toctree::
     :maxdepth: 2
 
-    slides/services
-    slides/types
+    type/services
+    type/types
diff --git a/packages/google-apps-script-type/noxfile.py b/packages/google-apps-script-type/noxfile.py
@@ -46,7 +46,7 @@
 UNIT_TEST_EXTRAS = []
 UNIT_TEST_EXTRAS_BY_PYTHON = {}
 
-SYSTEM_TEST_PYTHON_VERSIONS = []
+SYSTEM_TEST_PYTHON_VERSIONS = ["3.8", "3.9", "3.10", "3.11"]
 SYSTEM_TEST_STANDARD_DEPENDENCIES = [
     "mock",
     "pytest",
@@ -405,24 +405,3 @@ def prerelease_deps(session):
     session.run("python", "-c", "import google.auth; print(google.auth.__version__)")
 
     session.run("py.test", "tests/unit")
-
-    system_test_path = os.path.join("tests", "system.py")
-    system_test_folder_path = os.path.join("tests", "system")
-
-    # Only run system tests if found.
-    if os.path.exists(system_test_path):
-        session.run(
-            "py.test",
-            "--verbose",
-            f"--junitxml=system_{session.python}_sponge_log.xml",
-            system_test_path,
-            *session.posargs,
-        )
-    if os.path.exists(system_test_folder_path):
-        session.run(
-            "py.test",
-            "--verbose",
-            f"--junitxml=system_{session.python}_sponge_log.xml",
-            system_test_folder_path,
-            *session.posargs,
-        )
diff --git a/packages/google-apps-script-type/setup.py b/packages/google-apps-script-type/setup.py
@@ -20,15 +20,13 @@
 
 package_root = os.path.abspath(os.path.dirname(__file__))
 
-name = "google-apps-script-type-slides"
+name = "google-apps-script-type"
 
 
-description = "Google Apps Script Type Slides API client library"
+description = "Google Apps Script Type API client library"
 
 version = {}
-with open(
-    os.path.join(package_root, "google/apps/script/type/slides/gapic_version.py")
-) as fp:
+with open(os.path.join(package_root, "google/apps/script/type/gapic_version.py")) as fp:
     exec(fp.read(), version)
 version = version["__version__"]
 
@@ -42,7 +40,6 @@
     "proto-plus >= 1.22.0, <2.0.0dev",
     "proto-plus >= 1.22.2, <2.0.0dev; python_version>='3.11'",
     "protobuf>=3.19.5,<5.0.0dev,!=3.20.0,!=3.20.1,!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5",
-    "google-apps-script-type >= 0.2.0, <1.0.0dev",
 ]
 url = "https://github.com/googleapis/google-cloud-python"
 
@@ -58,7 +55,7 @@
     if package.startswith("google")
 ]
 
-namespaces = ["google", "google.apps", "google.apps.script", "google.apps.script.type"]
+namespaces = ["google", "google.apps", "google.apps.script"]
 
 setuptools.setup(
     name=name,

diff --git a/packages/google-apps-script-type/testing/constraints-3.10.txt b/packages/google-apps-script-type/testing/constraints-3.10.txt
@@ -4,4 +4,3 @@
 google-api-core
 proto-plus
 protobuf
-google-apps-script-type
diff --git a/packages/google-apps-script-type/testing/constraints-3.11.txt b/packages/google-apps-script-type/testing/constraints-3.11.txt
@@ -4,4 +4,3 @@
 google-api-core
 proto-plus
 protobuf
-google-apps-script-type
diff --git a/packages/google-apps-script-type/testing/constraints-3.12.txt b/packages/google-apps-script-type/testing/constraints-3.12.txt
@@ -4,4 +4,3 @@
 google-api-core
 proto-plus
 protobuf
-google-apps-script-type
diff --git a/packages/google-apps-script-type/testing/constraints-3.7.txt b/packages/google-apps-script-type/testing/constraints-3.7.txt
@@ -7,4 +7,3 @@
 google-api-core==1.34.0
 proto-plus==1.22.0
 protobuf==3.19.5
-google-apps-script-type==0.2.0
diff --git a/packages/google-apps-script-type/testing/constraints-3.8.txt b/packages/google-apps-script-type/testing/constraints-3.8.txt
@@ -4,4 +4,3 @@
 google-api-core
 proto-plus
 protobuf
-google-apps-script-type
diff --git a/packages/google-apps-script-type/testing/constraints-3.9.txt b/packages/google-apps-script-type/testing/constraints-3.9.txt
@@ -4,4 +4,3 @@
 google-api-core
 proto-plus
 protobuf
-google-apps-script-type