Merge remote-tracking branch 'origin/main' into tswast-patch-2

Author: tswast

librarian.yaml

@@ -854,6 +854,7 @@ libraries:
       default_version: v1
   - name: google-cloud-datacatalog-lineage
     version: 0.6.0
+    skip_generate: true
     apis:
       - path: google/cloud/datacatalog/lineage/v1
     python:

packages/bigframes/tests/system/conftest.py

@@ -22,6 +22,8 @@
 from datetime import datetime
 from typing import Dict, Generator, Optional
 
+import fsspec  # type: ignore[import-untyped]
+import gcsfs  # type: ignore[import-untyped]
 import google.api_core.exceptions
 import google.cloud.bigquery as bigquery
 import google.cloud.bigquery_connection_v1 as bigquery_connection_v1
@@ -70,6 +72,15 @@ def _hash_digest_file(hasher, filepath):
             hasher.update(chunk)
 
 
+@pytest.fixture(scope="session", autouse=True)
+def configure_gcsfs():
+    # gcsfs by default uses a cache that can be stale, causing file loads to
+    # fail if the file was uploaded indirectly (eg via bq export job) during the
+    # course of the tests. disable the cache to avoid this.
+    fsspec.config.conf["gcs"] = {"use_listings_cache": False}
+    gcsfs.GCSFileSystem.clear_instance_cache()
+
+
 @pytest.fixture(scope="session")
 def tokyo_location() -> str:
     return TOKYO_LOCATION

packages/bigframes/tests/system/small/ml/test_forecasting.py

@@ -474,7 +474,6 @@ def test_arima_plus_score(
                 "root_mean_squared_error": [120.675442, 120.675442],
                 "mean_absolute_percentage_error": [4.80044, 4.80044],
                 "symmetric_mean_absolute_percentage_error": [4.744332, 4.744332],
-                "mean_absolute_scaled_error": [0.400, 0.400],
             },
             dtype="Float64",
         )
@@ -490,7 +489,6 @@ def test_arima_plus_score(
                 "root_mean_squared_error": [120.675442],
                 "mean_absolute_percentage_error": [4.80044],
                 "symmetric_mean_absolute_percentage_error": [4.744332],
-                "mean_absolute_scaled_error": [0.400],
             },
             dtype="Float64",
         )
@@ -577,7 +575,6 @@ def test_arima_plus_score_series(
                 "root_mean_squared_error": [120.675442, 120.675442],
                 "mean_absolute_percentage_error": [4.80044, 4.80044],
                 "symmetric_mean_absolute_percentage_error": [4.744332, 4.744332],
-                "mean_absolute_scaled_error": [0.400, 0.400],
             },
             dtype="Float64",
         )
@@ -593,7 +590,6 @@ def test_arima_plus_score_series(
                 "root_mean_squared_error": [120.675442],
                 "mean_absolute_percentage_error": [4.80044],
                 "symmetric_mean_absolute_percentage_error": [4.744332],
-                "mean_absolute_scaled_error": [0.400],
             },
             dtype="Float64",
         )