Skip to content

Commit a57ea33

Browse files
fix: Make pytest config compatible with newer pytest (#5779)
Signed-off-by: Francisco Javier Arceo <farceo@redhat.com> Co-authored-by: Francisco Javier Arceo <farceo@redhat.com>
1 parent 1669661 commit a57ea33

13 files changed

Lines changed: 187 additions & 57 deletions

File tree

.secrets.baseline

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -957,7 +957,7 @@
957957
"filename": "infra/feast-operator/api/v1/featurestore_types.go",
958958
"hashed_secret": "44e17306b837162269a410204daaa5ecee4ec22c",
959959
"is_verified": false,
960-
"line_number": 936
960+
"line_number": 937
961961
}
962962
],
963963
"infra/feast-operator/api/v1/zz_generated.deepcopy.go": [
@@ -989,7 +989,7 @@
989989
"filename": "infra/feast-operator/api/v1alpha1/featurestore_types.go",
990990
"hashed_secret": "44e17306b837162269a410204daaa5ecee4ec22c",
991991
"is_verified": false,
992-
"line_number": 650
992+
"line_number": 651
993993
}
994994
],
995995
"infra/feast-operator/api/v1alpha1/zz_generated.deepcopy.go": [
@@ -1555,5 +1555,5 @@
15551555
}
15561556
]
15571557
},
1558-
"generated_at": "2026-06-26T06:19:05Z"
1558+
"generated_at": "2026-07-10T13:52:47Z"
15591559
}

infra/feast-operator/api/v1/featurestore_types.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -626,7 +626,7 @@ type OnlineStoreFilePersistence struct {
626626
// OnlineStoreDBStorePersistence configures the DB store persistence for the online store service
627627
type OnlineStoreDBStorePersistence struct {
628628
// Type of the persistence type you want to use.
629-
// +kubebuilder:validation:Enum=snowflake.online;redis;datastore;dynamodb;bigtable;postgres;cassandra;mysql;hazelcast;singlestore;hbase;elasticsearch;qdrant;couchbase.online;milvus;hybrid;mongodb;aerospike
629+
// +kubebuilder:validation:Enum=snowflake.online;redis;datastore;dynamodb;bigtable;postgres;cassandra;mysql;hazelcast;singlestore;hbase;elasticsearch;qdrant;couchbase.online;milvus;hybrid;mongodb;aerospike;scylladb
630630
Type string `json:"type"`
631631
// Data store parameters should be placed as-is from the "feature_store.yaml" under the secret key. "registry_type" & "type" fields should be removed.
632632
SecretRef corev1.LocalObjectReference `json:"secretRef"`
@@ -653,6 +653,7 @@ var ValidOnlineStoreDBStorePersistenceTypes = []string{
653653
"hybrid",
654654
"mongodb",
655655
"aerospike",
656+
"scylladb",
656657
}
657658

658659
// LocalRegistryConfig configures the registry service

infra/feast-operator/api/v1alpha1/featurestore_types.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,7 @@ type OnlineStoreFilePersistence struct {
373373
// OnlineStoreDBStorePersistence configures the DB store persistence for the online store service
374374
type OnlineStoreDBStorePersistence struct {
375375
// Type of the persistence type you want to use.
376-
// +kubebuilder:validation:Enum=snowflake.online;redis;datastore;dynamodb;bigtable;postgres;cassandra;mysql;hazelcast;singlestore;hbase;elasticsearch;qdrant;couchbase.online;milvus;hybrid;mongodb;aerospike
376+
// +kubebuilder:validation:Enum=snowflake.online;redis;datastore;dynamodb;bigtable;postgres;cassandra;mysql;hazelcast;singlestore;hbase;elasticsearch;qdrant;couchbase.online;milvus;hybrid;mongodb;aerospike;scylladb
377377
Type string `json:"type"`
378378
// Data store parameters should be placed as-is from the "feature_store.yaml" under the secret key. "registry_type" & "type" fields should be removed.
379379
SecretRef corev1.LocalObjectReference `json:"secretRef"`
@@ -400,6 +400,7 @@ var ValidOnlineStoreDBStorePersistenceTypes = []string{
400400
"hybrid",
401401
"mongodb",
402402
"aerospike",
403+
"scylladb",
403404
}
404405

405406
// LocalRegistryConfig configures the registry service

infra/feast-operator/config/crd/bases/feast.dev_featurestores.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2400,6 +2400,7 @@ spec:
24002400
- hybrid
24012401
- mongodb
24022402
- aerospike
2403+
- scylladb
24032404
type: string
24042405
required:
24052406
- secretRef
@@ -8706,6 +8707,7 @@ spec:
87068707
- hybrid
87078708
- mongodb
87088709
- aerospike
8710+
- scylladb
87098711
type: string
87108712
required:
87118713
- secretRef
@@ -14230,6 +14232,7 @@ spec:
1423014232
- hybrid
1423114233
- mongodb
1423214234
- aerospike
14235+
- scylladb
1423314236
type: string
1423414237
required:
1423514238
- secretRef
@@ -18736,6 +18739,7 @@ spec:
1873618739
- hybrid
1873718740
- mongodb
1873818741
- aerospike
18742+
- scylladb
1873918743
type: string
1874018744
required:
1874118745
- secretRef

infra/feast-operator/dist/install.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2408,6 +2408,7 @@ spec:
24082408
- hybrid
24092409
- mongodb
24102410
- aerospike
2411+
- scylladb
24112412
type: string
24122413
required:
24132414
- secretRef
@@ -8714,6 +8715,7 @@ spec:
87148715
- hybrid
87158716
- mongodb
87168717
- aerospike
8718+
- scylladb
87178719
type: string
87188720
required:
87198721
- secretRef
@@ -14238,6 +14240,7 @@ spec:
1423814240
- hybrid
1423914241
- mongodb
1424014242
- aerospike
14243+
- scylladb
1424114244
type: string
1424214245
required:
1424314246
- secretRef
@@ -18744,6 +18747,7 @@ spec:
1874418747
- hybrid
1874518748
- mongodb
1874618749
- aerospike
18750+
- scylladb
1874718751
type: string
1874818752
required:
1874918753
- secretRef

pixi.lock

Lines changed: 4 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

sdk/python/feast/infra/online_stores/sqlite.py

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import os
1717
import sqlite3
1818
import sys
19+
import time
1920
from datetime import date, datetime, timezone
2021
from pathlib import Path
2122
from typing import (
@@ -353,10 +354,23 @@ def teardown(
353354
tables: Sequence[FeatureView],
354355
entities: Sequence[Entity],
355356
):
356-
try:
357-
os.unlink(self._get_db_path(config))
358-
except FileNotFoundError:
359-
pass
357+
if self._conn is not None:
358+
try:
359+
self._conn.close()
360+
finally:
361+
self._conn = None
362+
363+
db_path = self._get_db_path(config)
364+
for attempt in range(10):
365+
try:
366+
os.unlink(db_path)
367+
return
368+
except FileNotFoundError:
369+
return
370+
except PermissionError:
371+
if attempt == 9:
372+
raise
373+
time.sleep(0.25)
360374

361375
def retrieve_online_documents(
362376
self,

sdk/python/feast/infra/registry/registry.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,12 @@ def get_registry_store_class_from_type(registry_store_type: str):
155155

156156
def get_registry_store_class_from_scheme(registry_path: str):
157157
uri = urlparse(registry_path)
158+
if uri.scheme == "" or (
159+
len(uri.scheme) == 1 and registry_path[1:3] in (":\\", ":/")
160+
):
161+
registry_store_type = REGISTRY_STORE_CLASS_FOR_SCHEME["file"]
162+
return get_registry_store_class_from_type(registry_store_type)
163+
158164
if uri.scheme not in REGISTRY_STORE_CLASS_FOR_SCHEME:
159165
raise Exception(
160166
f"Registry path {registry_path} has unsupported scheme {uri.scheme}. "

sdk/python/pytest.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ asyncio_mode = auto
33
env =
44
IS_TEST=True
55
filterwarnings =
6-
error::_pytest.warning_types.PytestConfigWarning
7-
error::_pytest.warning_types.PytestUnhandledCoroutineWarning
6+
error::pytest.PytestConfigWarning
7+
error:.*was never awaited.*:RuntimeWarning
88
ignore::DeprecationWarning:pyspark.sql.pandas.*:
99
ignore::DeprecationWarning:pyspark.sql.connect.*:
1010
ignore::DeprecationWarning:httpx.*:

0 commit comments

Comments
 (0)