Skip to content

chore: Merge master into v0.48-branch for 0.48.1 patch release #5244

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
franciscojavierarceo merged 3 commits into from
Apr 8, 2025
Merged

chore: Merge master into v0.48-branch for 0.48.1 patch release #5244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f14ca5f
ci: Remove psycopg direct dependency as `extra`, move requirements fi…
tchughesiv Apr 7, 2025
d5906f1
fix: Resolve `no pq wrapper` import issue (#5240)
tchughesiv Apr 8, 2025
4dd348b
chore: In operator `rhoai` overlay, use digest for cronjob image decl…
tchughesiv Apr 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,12 +91,10 @@ lock-python-dependencies-all:
pixi run --environment $(call get_env_name,3.11) --manifest-path infra/scripts/pixi/pixi.toml \
"uv pip compile -p 3.11 --no-strip-extras setup.py --extra pandas-build \
--generate-hashes --output-file sdk/python/requirements/py3.11-pandas-requirements.txt"
pixi run --environment $(call get_env_name,3.11) --manifest-path infra/scripts/pixi/pixi.toml \
"uv pip compile -p 3.11 --no-strip-extras setup.py --extra postgres-source \
--output-file sdk/python/requirements/py3.11-postgres-source-requirements.txt"
pixi run --environment $(call get_env_name,3.11) --manifest-path infra/scripts/pixi/pixi.toml \
"uv pip compile -p 3.11 --no-strip-extras setup.py --extra minimal-sdist-build \
--no-emit-package milvus-lite \
--no-emit-package psycopg-binary \
--output-file sdk/python/requirements/py3.11-sdist-requirements.txt"
$(foreach ver,$(PYTHON_VERSIONS),\
pixi run --environment $(call get_env_name,$(ver)) --manifest-path infra/scripts/pixi/pixi.toml \
Expand Down
2 changes: 1 addition & 1 deletion infra/feast-operator/config/overlays/rhoai/params.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
RELATED_IMAGE_FEAST_OPERATOR=quay.io/feastdev/feast-operator:0.48.0
RELATED_IMAGE_FEATURE_SERVER=quay.io/feastdev/feature-server:0.48.0
RELATED_IMAGE_CRON_JOB=registry.redhat.io/openshift4/ose-cli:v4.15
RELATED_IMAGE_CRON_JOB=registry.redhat.io/openshift4/ose-cli@sha256:bc35a9fc663baf0d6493cc57e89e77a240a36c43cf38fb78d8e61d3b87cf5cc5
2 changes: 1 addition & 1 deletion infra/scripts/offline-build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ cachi2 fetch-deps \
],
"requirements_build_files": [
"sdk/python/feast/infra/feature_servers/multicloud/offline/pyarrow17-wheel-build-requirements.txt",
"sdk/python/feast/infra/feature_servers/multicloud/offline/psycopg3.2.5-wheel-build-requirements.txt",
"sdk/python/requirements/py3.11-sdist-requirements.txt",
"sdk/python/requirements/py3.11-pandas-requirements.txt",
"sdk/python/requirements/py3.11-postgres-source-requirements.txt",
"sdk/python/requirements/py3.11-addtl-sources-requirements.txt"
],
"allow_binary": "false"
Expand Down
17 changes: 4 additions & 13 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,13 +101,7 @@ mysql = ["pymysql", "types-PyMySQL"]
opentelemetry = ["prometheus_client", "psutil"]
spark = ["pyspark>=3.0.0,<4"]
trino = ["trino>=0.305.0,<0.400.0", "regex"]
postgres = [
"psycopg[pool]==3.2.5",
]
postgres-ci = [
"psycopg[binary]==3.2.5",
"feast[postgres]",
]
postgres = ["psycopg[binary,pool]==3.2.5"]
pytorch = ["torch==2.2.2", "torchvision>=0.17.2"]
qdrant = ["qdrant-client>=1.12.0"]
redis = [
Expand Down Expand Up @@ -164,15 +158,15 @@ ci = [
"types-setuptools",
"types-tabulate",
"virtualenv<20.24.2",
"feast[aws, azure, cassandra, clickhouse, couchbase, delta, docling, duckdb, elasticsearch, faiss, gcp, ge, go, grpcio, hazelcast, hbase, ibis, ikv, k8s, milvus, mssql, mysql, opentelemetry, spark, trino, postgres-ci, pytorch, qdrant, redis, singlestore, snowflake, sqlite_vec]"
"feast[aws, azure, cassandra, clickhouse, couchbase, delta, docling, duckdb, elasticsearch, faiss, gcp, ge, go, grpcio, hazelcast, hbase, ibis, ikv, k8s, milvus, mssql, mysql, opentelemetry, spark, trino, postgres, pytorch, qdrant, redis, singlestore, snowflake, sqlite_vec]"
]
nlp = ["feast[docling, milvus, pytorch]"]
dev = ["feast[ci]"]
docs = ["feast[ci]"]
# used for the 'feature-server' container image build
minimal = ["feast[aws, gcp, snowflake, redis, go, mysql, postgres, opentelemetry, grpcio, k8s, duckdb, milvus]"]

# extras for a disconnected build from source (pandas, postgres-source, sdist)
# extras for a disconnected build from source (pandas, sdist, etc.)
numpy-build = [
"meson-python<0.16.0,>=0.15.0",
"Cython<3.1,>=0.29.34",
Expand All @@ -191,10 +185,6 @@ pandas-build = [
"oldest-supported-numpy>=2022.8.16,<2023.8.3",
"versioneer[toml]==0.29",
]
postgres-source = [
"psycopg @ git+https://github.com/psycopg/psycopg@3.2.5#subdirectory=psycopg",
"psycopg-pool @ git+https://github.com/psycopg/psycopg@3.2.6#subdirectory=psycopg_pool",
]
addtl-sources = [
# python-dateutil build deps
"python-dateutil==2.9.0",
Expand All @@ -219,6 +209,7 @@ minimal-sdist-build = [
"setuptools-rust>=1.4.0",
"rpds-py==0.23.1",
"types_psutil<7.0.0.20250401",
"meson<1.7.2",

# sqlalchemy[mypy] dep
"greenlet!=0.4.17",
Expand Down
2 changes: 2 additions & 0 deletions .../feast/infra/feature_servers/multicloud/offline/psycopg3.2.5-wheel-build-requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
psycopg @ git+https://github.com/psycopg/psycopg@664b2a12d68d9f826b58ea004f05460448e78bca#subdirectory=psycopg
psycopg-pool @ git+https://github.com/psycopg/psycopg@dfc113613c067600355a14c2e4010d03cbef51bd#subdirectory=psycopg_pool
4 changes: 1 addition & 3 deletions sdk/python/feast/infra/feature_servers/multicloud/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
# keep VERSION on line #2, this is critical to release CI
feast[aws,gcp,snowflake,redis,go,mysql,postgres,opentelemetry,grpcio,k8s,duckdb,milvus] == 0.48.0
# the following can be used instead w/ feast 0.48.0+
# feast[minimal] == 0.48.0
feast[minimal] == 0.48.0
Loading
Loading