Skip to content

Commit 08295bf

Browse files
committed
Merge branch 'master' into spark-compute-patch
2 parents 0b89d50 + 6c94dbf commit 08295bf

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+2754
-3301
lines changed

.github/workflows/build_wheels.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ jobs:
112112
needs: [ build-python-wheel ]
113113
strategy:
114114
matrix:
115-
os: [ ubuntu-latest, macos-13 ]
115+
os: [ ubuntu-latest, macos-14 ]
116116
python-version: [ "3.9", "3.10", "3.11" ]
117117
from-source: [ True, False ]
118118
env:
@@ -141,7 +141,7 @@ jobs:
141141
name: python-wheels
142142
path: dist
143143
- name: Install OS X dependencies
144-
if: matrix.os == 'macos-13'
144+
if: matrix.os == 'macos-14'
145145
run: brew install coreutils
146146
- name: Install wheel
147147
if: ${{ !matrix.from-source }}

.github/workflows/nightly-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ jobs:
131131
sudo apt update
132132
sudo apt install -y -V libarrow-dev
133133
- name: Install apache-arrow on macos
134-
if: matrix.os == 'macos-13'
134+
if: matrix.os == 'macos-14'
135135
run: brew install apache-arrow
136136
- name: Install dependencies
137137
run: make install-python-dependencies-ci

.github/workflows/unit_tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
fail-fast: false
1111
matrix:
1212
python-version: ["3.10", "3.11", "3.12"]
13-
os: [ ubuntu-latest, macos-13, macos-14 ]
13+
os: [ ubuntu-latest, macos-14 ]
1414
exclude:
1515
- os: macos-14
1616
python-version: "3.10"
@@ -33,8 +33,8 @@ jobs:
3333
- name: Install torch (platform-specific)
3434
run: |
3535
if [[ "$RUNNER_OS" == "Linux" ]]; then
36-
pip install torch==2.2.2+cpu torchvision==0.17.2+cpu \
37-
-f https://download.pytorch.org/whl/torch_stable.html
36+
pip install torch torchvision \
37+
--index-url https://download.pytorch.org/whl/cpu
3838
fi
3939
- name: Install dependencies
4040
run: make install-python-dependencies-ci

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ test-python-integration-local: ## Run Python integration tests (local dev mode)
152152
test-python-integration-rbac-remote: ## Run Python remote RBAC integration tests
153153
FEAST_IS_LOCAL_TEST=True \
154154
FEAST_LOCAL_ONLINE_CONTAINER=True \
155-
python -m pytest --tb=short -v -n 8 --color=yes --integration --durations=10 --timeout=1200 --timeout_method=thread --dist loadgroup \
155+
python -m pytest --tb=short -v -n 4 --color=yes --integration --durations=10 --timeout=1200 --timeout_method=thread --dist loadgroup \
156156
-k "not test_lambda_materialization and not test_snowflake_materialization" \
157157
-m "rbac_remote_integration_test" \
158158
--log-cli-level=INFO -s \

infra/feast-operator/bundle/manifests/feast-operator.clusterserviceversion.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -233,11 +233,11 @@ spec:
233233
periodSeconds: 10
234234
resources:
235235
limits:
236-
cpu: 500m
237-
memory: 128Mi
236+
cpu: 1000m
237+
memory: 256Mi
238238
requests:
239-
cpu: 10m
240-
memory: 64Mi
239+
cpu: 50m
240+
memory: 128Mi
241241
securityContext:
242242
allowPrivilegeEscalation: false
243243
capabilities:

infra/feast-operator/config/manager/manager.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@ spec:
9191
# More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
9292
resources:
9393
limits:
94-
cpu: 500m
95-
memory: 128Mi
94+
cpu: 1000m
95+
memory: 256Mi
9696
requests:
9797
cpu: 10m
9898
memory: 64Mi

infra/feast-operator/dist/install.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8425,8 +8425,8 @@ spec:
84258425
periodSeconds: 10
84268426
resources:
84278427
limits:
8428-
cpu: 500m
8429-
memory: 128Mi
8428+
cpu: 1000m
8429+
memory: 256Mi
84308430
requests:
84318431
cpu: 10m
84328432
memory: 64Mi

protos/feast/core/DynamoDBTable.proto

Lines changed: 0 additions & 31 deletions
This file was deleted.

protos/feast/core/InfraObject.proto

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ option java_outer_classname = "InfraObjectProto";
2222
option go_package = "github.com/feast-dev/feast/go/protos/feast/core";
2323

2424
import "feast/core/DatastoreTable.proto";
25-
import "feast/core/DynamoDBTable.proto";
2625
import "feast/core/SqliteTable.proto";
2726

2827
// Represents a set of infrastructure objects managed by Feast
@@ -38,7 +37,6 @@ message InfraObject {
3837

3938
// The infrastructure object
4039
oneof infra_object {
41-
DynamoDBTable dynamodb_table = 2;
4240
DatastoreTable datastore_table = 3;
4341
SqliteTable sqlite_table = 4;
4442
CustomInfra custom_infra = 100;

pyproject.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ dependencies = [
2121
"Jinja2>=2,<4",
2222
"jsonschema",
2323
"mmh3",
24-
"numpy>=1.22,<2",
24+
"numpy>=2.0.0,<3",
2525
"pandas>=1.4.3,<3",
2626
"pyarrow<=17.0.0",
2727
"pydantic==2.10.6",
@@ -57,7 +57,7 @@ azure = [
5757
cassandra = ["cassandra-driver>=3.24.0,<4"]
5858
clickhouse = ["clickhouse-connect>=0.7.19"]
5959
couchbase = ["couchbase==4.3.2", "couchbase-columnar==1.0.0"]
60-
delta = ["deltalake"]
60+
delta = ["deltalake<1.0.0"]
6161
docling = ["docling==2.27.0"]
6262
duckdb = ["ibis-framework[duckdb]>=9.0.0,<=9.5.0"]
6363
elasticsearch = ["elasticsearch>=8.13.0"]
@@ -99,13 +99,13 @@ milvus = [
9999
mssql = ["ibis-framework[mssql]>=9.0.0,<=9.5.0"]
100100
mysql = ["pymysql", "types-PyMySQL"]
101101
opentelemetry = ["prometheus_client", "psutil"]
102-
spark = ["pyspark>=3.0.0,<4"]
102+
spark = ["pyspark>=4.0.0"]
103103
trino = ["trino>=0.305.0,<0.400.0", "regex"]
104104
postgres = ["psycopg[binary,pool]==3.2.5"]
105105
# psycopg[c] install requires a system with a C compiler, python dev headers, & postgresql client dev headers
106106
# https://www.psycopg.org/psycopg3/docs/basic/install.html#local-installation
107107
postgres-c = ["psycopg[c,pool]==3.2.5"]
108-
pytorch = ["torch==2.2.2", "torchvision>=0.17.2"]
108+
pytorch = ["torch>=2.7.0", "torchvision>=0.22.1"]
109109
qdrant = ["qdrant-client>=1.12.0"]
110110
redis = [
111111
"redis>=4.2.2,<5",

0 commit comments

Comments
 (0)