ci: Remove psycopg direct dependency as extra, move requirements file to offline build dir (#5234)

tchughesiv · web-flow · commit f14ca5fe9d8c · 2025-04-07T15:46:14.000-06:00
diff --git a/Makefile b/Makefile
@@ -91,9 +91,6 @@ 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 \
diff --git a/infra/scripts/offline-build.sh b/infra/scripts/offline-build.sh
@@ -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"
diff --git a/pyproject.toml b/pyproject.toml
@@ -172,7 +172,7 @@ 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",
@@ -191,10 +191,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",
diff --git a/sdk/python/feast/infra/feature_servers/multicloud/offline/psycopg3.2.5-wheel-build-requirements.txt b/sdk/python/feast/infra/feature_servers/multicloud/offline/psycopg3.2.5-wheel-build-requirements.txt
@@ -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
diff --git a/sdk/python/feast/infra/feature_servers/multicloud/requirements.txt b/sdk/python/feast/infra/feature_servers/multicloud/requirements.txt
@@ -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
diff --git a/sdk/python/requirements/py3.11-postgres-source-requirements.txt b/sdk/python/requirements/py3.11-postgres-source-requirements.txt

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+psycopg @ git+https://github.com/psycopg/psycopg@664b2a12d68d9f826b58ea004f05460448e78bca#subdirectory=psycopg`
	`2`	`+psycopg-pool @ git+https://github.com/psycopg/psycopg@dfc113613c067600355a14c2e4010d03cbef51bd#subdirectory=psycopg_pool`