From 448008080df8ec53dd23babacc16c4267d124b95 Mon Sep 17 00:00:00 2001 From: user <70670632+stuxf@users.noreply.github.com> Date: Fri, 3 Apr 2026 07:10:24 +0000 Subject: [PATCH] fix: keep psycopg binary in default test env --- pyproject.toml | 14 +++++++------- uv.lock | 18 +++++++++--------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 6062ba3a9a5..a06512a856c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -125,6 +125,13 @@ dev = [ "pytest-mock==3.15.1", "pytest-asyncio==1.2.0", "pytest-postgresql==7.0.2", + # pytest-postgresql imports psycopg v3 during pytest startup. Keep the base + # package and the binary wheel in the default dev environment so local + # pytest works without requiring a system libpq install. + "psycopg==3.2.13; python_version < '3.10'", + "psycopg==3.3.3; python_version >= '3.10'", + "psycopg-binary==3.2.13; python_version < '3.10'", + "psycopg-binary==3.3.3; python_version >= '3.10'", "pytest-xdist==3.8.0", "requests-mock==1.12.1", "responses==0.26.0", @@ -158,13 +165,6 @@ proxy-dev = [ "nodejs-wheel-binaries==24.13.1", ] ci = [ - # pytest-postgresql imports psycopg v3 during pytest startup. Keep the base - # package and the binary wheel explicit so uv sync yields a usable driver - # without requiring contributors to install libpq separately. - "psycopg==3.2.13; python_version < '3.10'", - "psycopg==3.3.3; python_version >= '3.10'", - "psycopg-binary==3.2.13; python_version < '3.10'", - "psycopg-binary==3.3.3; python_version >= '3.10'", # Azure batch E2E tests still import psycopg2 directly. "psycopg2-binary==2.9.11", "pytest-codspeed==4.3.0", diff --git a/uv.lock b/uv.lock index 1261f4d10ef..b483c1417ae 100644 --- a/uv.lock +++ b/uv.lock @@ -11,7 +11,7 @@ resolution-markers = [ ] [options] -exclude-newer = "2026-03-04T03:59:14.361787697Z" +exclude-newer = "2026-03-04T07:07:11.92737292Z" exclude-newer-span = "P30D" [manifest] @@ -4119,10 +4119,6 @@ ci = [ { name = "lunary", version = "1.4.37", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version >= '3.11'" }, { name = "pillow", version = "11.3.0", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version < '3.10'" }, { name = "pillow", version = "12.1.1", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version >= '3.10'" }, - { name = "psycopg", version = "3.2.13", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version < '3.10'" }, - { name = "psycopg", version = "3.3.3", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version >= '3.10'" }, - { name = "psycopg-binary", version = "3.2.13", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version < '3.10'" }, - { name = "psycopg-binary", version = "3.3.3", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version >= '3.10'" }, { name = "psycopg2-binary" }, { name = "pyarrow", version = "21.0.0", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version < '3.10'" }, { name = "pyarrow", version = "22.0.0", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version >= '3.10'" }, @@ -4148,6 +4144,10 @@ dev = [ { name = "opentelemetry-exporter-otlp" }, { name = "opentelemetry-sdk" }, { name = "parameterized" }, + { name = "psycopg", version = "3.2.13", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version < '3.10'" }, + { name = "psycopg", version = "3.3.3", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version >= '3.10'" }, + { name = "psycopg-binary", version = "3.2.13", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version < '3.10'" }, + { name = "psycopg-binary", version = "3.3.3", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version >= '3.10'" }, { name = "pytest" }, { name = "pytest-asyncio" }, { name = "pytest-cov" }, @@ -4279,10 +4279,6 @@ ci = [ { name = "lunary", marker = "python_full_version >= '3.11'", specifier = "==1.4.37" }, { name = "pillow", marker = "python_full_version < '3.10'", specifier = "==11.3.0" }, { name = "pillow", marker = "python_full_version >= '3.10'", specifier = "==12.1.1" }, - { name = "psycopg", marker = "python_full_version < '3.10'", specifier = "==3.2.13" }, - { name = "psycopg", marker = "python_full_version >= '3.10'", specifier = "==3.3.3" }, - { name = "psycopg-binary", marker = "python_full_version < '3.10'", specifier = "==3.2.13" }, - { name = "psycopg-binary", marker = "python_full_version >= '3.10'", specifier = "==3.3.3" }, { name = "psycopg2-binary", specifier = "==2.9.11" }, { name = "pyarrow", marker = "python_full_version < '3.10'", specifier = "==21.0.0" }, { name = "pyarrow", marker = "python_full_version >= '3.10'", specifier = "==22.0.0" }, @@ -4308,6 +4304,10 @@ dev = [ { name = "opentelemetry-exporter-otlp", specifier = "==1.28.0" }, { name = "opentelemetry-sdk", specifier = "==1.28.0" }, { name = "parameterized", specifier = "==0.9.0" }, + { name = "psycopg", marker = "python_full_version < '3.10'", specifier = "==3.2.13" }, + { name = "psycopg", marker = "python_full_version >= '3.10'", specifier = "==3.3.3" }, + { name = "psycopg-binary", marker = "python_full_version < '3.10'", specifier = "==3.2.13" }, + { name = "psycopg-binary", marker = "python_full_version >= '3.10'", specifier = "==3.3.3" }, { name = "pytest", specifier = "==8.3.5" }, { name = "pytest-asyncio", specifier = "==1.2.0" }, { name = "pytest-cov", specifier = "==5.0.0" },