From: Daniele Varrazzo Date: Wed, 26 Mar 2025 14:51:50 +0000 (+0100) Subject: ci(shapely): test shapely with a more current Python version X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F1033%2Fhead;p=thirdparty%2Fpsycopg.git ci(shapely): test shapely with a more current Python version --- diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index feece0570..d7224b7d7 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -40,7 +40,7 @@ jobs: - {impl: python, python: "3.9", ext: gevent, postgres: "postgres:17"} - {impl: python, python: "3.9", ext: dns, postgres: "postgres:14"} - - {impl: python, python: "3.9", ext: postgis, postgres: "postgis/postgis"} + - {impl: python, python: "3.12", ext: postgis, postgres: "postgis/postgis"} - {impl: python, python: "3.10", ext: numpy, postgres: "postgres:14"} - {impl: c, python: "3.11", ext: numpy, postgres: "postgres:15"} - {impl: c, python: "3.12", ext: gevent, postgres: "postgres:14"} diff --git a/tests/types/test_shapely.py b/tests/types/test_shapely.py index a681ffeda..39a41ef63 100644 --- a/tests/types/test_shapely.py +++ b/tests/types/test_shapely.py @@ -106,7 +106,7 @@ def test_no_info_error(conn): def test_with_adapter(shapely_conn, obj, fmt_in): obj = globals()[obj] with shapely_conn.cursor() as cur: - cur.execute(f"SELECT pg_typeof(%{fmt_in})", [obj]) + cur.execute(f"SELECT pg_typeof(%{fmt_in.value})", [obj]) assert cur.fetchone()[0] == "geometry" @@ -121,7 +121,7 @@ def test_write_read_shape(shapely_conn, fmt_in, fmt_out, obj, srid): with shapely_conn.cursor(binary=fmt_out) as cur: cur.execute("drop table if exists sample_geoms") cur.execute("create table sample_geoms(id SERIAL PRIMARY KEY, geom geometry)") - cur.execute(f"insert into sample_geoms(geom) VALUES(%{fmt_in})", (obj,)) + cur.execute(f"insert into sample_geoms(geom) VALUES(%{fmt_in.value})", (obj,)) cur.execute("select geom from sample_geoms") result = cur.fetchone()[0] assert result == obj