From b56e806ff838ccf6b4b29ccfb1513481606b035a Mon Sep 17 00:00:00 2001 From: Farhan Date: Fri, 30 Oct 2026 17:20:18 +0000 Subject: [PATCH] Restore unconditional psycopg[binary] now that cp315 wheels ship psycopg-binary 3.3.6 publishes cp315 wheels, so the Python 3.15 split added in #6930 (pure-python psycopg on 3.15+) is no longer needed. Collapse both markered pairs back to a single psycopg[binary] in the root dev group and docs/app, and drop the TODO comments. The 3.15 CI legs now install the prebuilt binary instead of needing libpq. Closes ENG-12420 Claude-Session: https://claude.ai/code/session_01LwJUCUfD4BvMvKrZrQK9gA --- docs/app/pyproject.toml | 5 +---- pyproject.toml | 7 +------ uv.lock | 12 ++++-------- 3 files changed, 6 insertions(+), 18 deletions(-) diff --git a/docs/app/pyproject.toml b/docs/app/pyproject.toml index 51be9461fcd..b62715d6ec0 100644 --- a/docs/app/pyproject.toml +++ b/docs/app/pyproject.toml @@ -10,10 +10,7 @@ dependencies = [ "orjson", "pandas", "plotly-express", - # TODO: revert to a single "psycopg[binary]" once a psycopg release - # ships cp315 wheels for psycopg-binary - "psycopg[binary]; python_version < '3.15'", - "psycopg; python_version >= '3.15'", + "psycopg[binary]", "python-frontmatter", "reflex", "reflex-docgen", diff --git a/pyproject.toml b/pyproject.toml index 1eef5b8d253..b1157247373 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -102,12 +102,7 @@ dev = [ "plotly", "pre-commit", "psutil", - # No cp315 psycopg-binary wheels yet; use pure-python psycopg on 3.15+. - # This only affects dev/test environments (3.15 CI), not the published - # package. TODO: revert to a single "psycopg[binary]" once a psycopg - # release ships cp315 wheels for psycopg-binary. - "psycopg[binary]; python_version < '3.15'", - "psycopg; python_version >= '3.15'", + "psycopg[binary]", "pydantic", "pyright", "pytest-asyncio", diff --git a/uv.lock b/uv.lock index eac28cc42d3..f289232cdea 100644 --- a/uv.lock +++ b/uv.lock @@ -4075,8 +4075,7 @@ dev = [ { name = "plotly" }, { name = "pre-commit" }, { name = "psutil" }, - { name = "psycopg" }, - { name = "psycopg", extra = ["binary"], marker = "python_full_version < '3.15'" }, + { name = "psycopg", extra = ["binary"] }, { name = "pydantic" }, { name = "pyright" }, { name = "pytest" }, @@ -4172,8 +4171,7 @@ dev = [ { name = "plotly" }, { name = "pre-commit" }, { name = "psutil" }, - { name = "psycopg", marker = "python_full_version >= '3.15'" }, - { name = "psycopg", extras = ["binary"], marker = "python_full_version < '3.15'" }, + { name = "psycopg", extras = ["binary"] }, { name = "pydantic" }, { name = "pyright" }, { name = "pytest" }, @@ -4494,8 +4492,7 @@ dependencies = [ { name = "orjson" }, { name = "pandas" }, { name = "plotly-express" }, - { name = "psycopg" }, - { name = "psycopg", extra = ["binary"], marker = "python_full_version < '3.15'" }, + { name = "psycopg", extra = ["binary"] }, { name = "python-frontmatter" }, { name = "reflex" }, { name = "reflex-components-internal" }, @@ -4533,8 +4530,7 @@ requires-dist = [ { name = "orjson" }, { name = "pandas" }, { name = "plotly-express" }, - { name = "psycopg", marker = "python_full_version >= '3.15'" }, - { name = "psycopg", extras = ["binary"], marker = "python_full_version < '3.15'" }, + { name = "psycopg", extras = ["binary"] }, { name = "python-frontmatter" }, { name = "reflex", editable = "." }, { name = "reflex-components-internal", editable = "packages/reflex-components-internal" },