From 249227e3a4c79189c3542c00200c9908b784f2b8 Mon Sep 17 00:00:00 2001 From: Tommy Hughes Date: Mon, 7 Apr 2025 14:06:55 -0500 Subject: [PATCH] move offline source build requirements files Signed-off-by: Tommy Hughes --- Makefile | 3 - infra/scripts/offline-build.sh | 2 +- pyproject.toml | 6 +- .../psycopg3.2.5-wheel-build-requirements.txt | 2 + .../multicloud/requirements.txt | 4 +- .../py3.11-postgres-source-requirements.txt | 178 ------------------ 6 files changed, 5 insertions(+), 190 deletions(-) create mode 100644 sdk/python/feast/infra/feature_servers/multicloud/offline/psycopg3.2.5-wheel-build-requirements.txt delete mode 100644 sdk/python/requirements/py3.11-postgres-source-requirements.txt diff --git a/Makefile b/Makefile index 879c94b78c5..4ba2f80b01a 100644 --- 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 index f0b54f35758..504b1660e96 100755 --- 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 index 107a2a708d4..373ea70f9b2 100644 --- 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 new file mode 100644 index 00000000000..85c4e065d11 --- /dev/null +++ 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 index e8f3c655f19..617636b88a3 100644 --- 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 deleted file mode 100644 index 1fbbf17a85f..00000000000 --- a/sdk/python/requirements/py3.11-postgres-source-requirements.txt +++ /dev/null @@ -1,178 +0,0 @@ -# This file was autogenerated by uv via the following command: -# 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 -annotated-types==0.7.0 - # via pydantic -anyio==4.9.0 - # via - # starlette - # watchfiles -attrs==25.3.0 - # via - # jsonschema - # referencing -bigtree==0.25.3 - # via feast (setup.py) -certifi==2025.1.31 - # via requests -charset-normalizer==3.4.1 - # via requests -click==8.1.8 - # via - # feast (setup.py) - # dask - # uvicorn -cloudpickle==3.1.1 - # via dask -colorama==0.4.6 - # via feast (setup.py) -dask[dataframe]==2025.3.0 - # via feast (setup.py) -dill==0.3.9 - # via feast (setup.py) -fastapi==0.115.12 - # via feast (setup.py) -fsspec==2025.3.2 - # via dask -gunicorn==23.0.0 - # via - # feast (setup.py) - # uvicorn-worker -h11==0.14.0 - # via uvicorn -httptools==0.6.4 - # via uvicorn -idna==3.10 - # via - # anyio - # requests -importlib-metadata==8.6.1 - # via dask -jinja2==3.1.6 - # via feast (setup.py) -jsonschema==4.23.0 - # via feast (setup.py) -jsonschema-specifications==2024.10.1 - # via jsonschema -locket==1.0.0 - # via partd -markupsafe==3.0.2 - # via jinja2 -mmh3==5.1.0 - # via feast (setup.py) -mypy==1.15.0 - # via sqlalchemy -mypy-extensions==1.0.0 - # via mypy -numpy==1.26.4 - # via - # feast (setup.py) - # dask - # pandas - # pyarrow -packaging==24.2 - # via - # dask - # gunicorn -pandas==2.2.3 - # via - # feast (setup.py) - # dask -partd==1.4.2 - # via dask -prometheus-client==0.21.1 - # via feast (setup.py) -protobuf==6.30.2 - # via feast (setup.py) -psutil==7.0.0 - # via feast (setup.py) -psycopg @ git+https://github.com/psycopg/psycopg@664b2a12d68d9f826b58ea004f05460448e78bca#subdirectory=psycopg - # via feast (setup.py) -psycopg-pool @ git+https://github.com/psycopg/psycopg@dfc113613c067600355a14c2e4010d03cbef51bd#subdirectory=psycopg_pool - # via feast (setup.py) -pyarrow==17.0.0 - # via - # feast (setup.py) - # dask -pydantic==2.10.6 - # via - # feast (setup.py) - # fastapi -pydantic-core==2.27.2 - # via pydantic -pygments==2.19.1 - # via feast (setup.py) -pyjwt==2.10.1 - # via feast (setup.py) -python-dateutil==2.9.0.post0 - # via pandas -python-dotenv==1.1.0 - # via uvicorn -pytz==2025.2 - # via pandas -pyyaml==6.0.2 - # via - # feast (setup.py) - # dask - # uvicorn -referencing==0.36.2 - # via - # jsonschema - # jsonschema-specifications -requests==2.32.3 - # via feast (setup.py) -rpds-py==0.24.0 - # via - # jsonschema - # referencing -six==1.17.0 - # via python-dateutil -sniffio==1.3.1 - # via anyio -sqlalchemy[mypy]==2.0.40 - # via feast (setup.py) -starlette==0.46.1 - # via fastapi -tabulate==0.9.0 - # via feast (setup.py) -tenacity==8.5.0 - # via feast (setup.py) -toml==0.10.2 - # via feast (setup.py) -toolz==1.0.0 - # via - # dask - # partd -tqdm==4.67.1 - # via feast (setup.py) -typeguard==4.4.2 - # via feast (setup.py) -typing-extensions==4.13.0 - # via - # anyio - # fastapi - # mypy - # psycopg - # psycopg-pool - # pydantic - # pydantic-core - # referencing - # sqlalchemy - # typeguard -tzdata==2025.2 - # via pandas -urllib3==2.3.0 - # via requests -uvicorn[standard]==0.34.0 - # via - # feast (setup.py) - # uvicorn-worker -uvicorn-worker==0.3.0 - # via feast (setup.py) -uvloop==0.21.0 - # via uvicorn -watchfiles==1.0.4 - # via uvicorn -websockets==15.0.1 - # via uvicorn -zipp==3.21.0 - # via importlib-metadata