public inbox for [email protected]
help / color / mirror / Atom feedFrom: Brian Cosgrove <[email protected]>
To: Christoph Berg <[email protected]>
To: Bradford Boyle <[email protected]>
To: [email protected]
Subject: Re: PgBouncer 1.24.0 - New upstream version
Date: Wed, 5 Feb 2025 11:01:39 -0600
Message-ID: <CAGKCzND9R131b2MB1tHBqTbgCdV9TkReRYLqE3KLxTt6fbhrXA@mail.gmail.com> (raw)
In-Reply-To: <CAGKCzNCKAEEJmd5Fn5Be4zu1YxS9okBoeqBX15_RijvBgouqzA@mail.gmail.com>
References: <CAGKCzNBZO-AQMfmbfbn20wvE+63j50YuPBKJupYLiDCmc84OeA@mail.gmail.com>
<CAOMoQbROhu7WG9LnyjHb1RXJrax_HKKMBbwaou+jps0uZgqHFw@mail.gmail.com>
<CAOMoQbQzutP0UMU3KUZAE4A9Jf8bS=uSBRdUX7g=9xxoBbosmQ@mail.gmail.com>
<CAGKCzNAQKMKJ_BQcF=uzcfcM=vx8QYnT+jtzuv_yp=76zbhn7g@mail.gmail.com>
<CAGKCzNAW4BFq_cSKpnPvG6hRF65G3HptjUvWVW=DefPaPMF2pg@mail.gmail.com>
<CAGKCzNAJzhzxJ809y9e6ttYbL0k6id5KmkzmBrz5xZROd79etQ@mail.gmail.com>
<CAGKCzNC6RkY54TrkqqQ9K83AF=vrYe+CB14-PUSLTF5YMbzrmA@mail.gmail.com>
<CAOMoQbT3zRuL+YLeiUrOG5-vYsvrZ2MJF_DQoa3E94cBfdv6xw@mail.gmail.com>
<[email protected]>
<CAOMoQbTA2qOo+f_4JE+oYGupZANh-0msn_Pw36qb7v3PfT1e0w@mail.gmail.com>
<[email protected]>
<CAGKCzNCKAEEJmd5Fn5Be4zu1YxS9okBoeqBX15_RijvBgouqzA@mail.gmail.com>
Attached in DEP-3 format, I think, if it helps at all.
On Wed, Feb 5, 2025 at 6:40 AM Brian Cosgrove <[email protected]> wrote:
> Skipping this release for bullseye is not entirely unreasonable with
> Trixie pending.
>
> Skipping the entire suite feels unreasonable if the Postgres Debian team
> releases 1.24.
>
> I am working up a patch that will skip only these tests that will likely
> be accepted upstream as well, should Debian choose to release 1.24 for
> bullseye.
>
> https://github.com/pgbouncer/pgbouncer/pull/1266
>
>
>
> On Wed, Feb 5, 2025 at 3:10 AM Christoph Berg <[email protected]> wrote:
>
>> Re: Bradford Boyle
>> > I think we could go without tests on bullseye since it seems like we are
>> > nearing the trixie release and bullseye will become old old stable.
>> > (Correct me if I am wrong on this point, I'm making this assumption
>> > based on the trixie freeze dates). There's probably little value in
>> > creating extra work here.
>>
>> Or we just don't update the package on bullseye, leaving it at 1.23.1.
>> But there is still the autopkgtest, so we still have test coverage
>> there.
>>
>> > It looks like d/rules for pgbouncer will skip the tests if nocheck is in
>> > DEB_BUILD_OPTIONS -- is this something that can be configured via the
>> Jenkins
>> > YAML? I am not very familiar with the Jenkins job builder YAML and I
>> didn't see
>> > any usages of that in the current set of jobs. Or would I need to update
>> > generate-pgdg-source to include an additional tweak to disable the
>> tests on
>> > older platforms?
>>
>> Any of these would work.
>>
>> DEB_BUILD_OPTIONS=nocheck would have to be set in the sbuild-package
>> script. That's probably the easiest way forward.
>>
>> The extra test dependencies need annotating with <!nocheck> so the
>> build doesn't try to install them.
>>
>> Christoph
>>
>>
>>
>
> --
> Brian Cosgrove
>
--
Brian Cosgrove
Attachments:
[application/octet-stream] fix-bullseye-pgbouncer-1.24.patch (1.9K, 3-fix-bullseye-pgbouncer-1.24.patch)
download | inline diff:
diff --git a/debian/patches/fix-psycopg-close-tests.patch b/debian/patches/fix-psycopg-close-tests.patch
new file mode 100644
index 0000000..9b69d89
--- /dev/null
+++ b/debian/patches/fix-psycopg-close-tests.patch
@@ -0,0 +1,29 @@
+Description: Skip tests for Close messages on psycopg < 3.2
+Origin: upstream, https://github.com/pgbouncer/pgbouncer/pull/1266
+Last-Update: 2025-02-05
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/test/test_prepared.py
++++ b/test/test_prepared.py
+@@ -311,6 +311,10 @@ def test_describe_non_existent_prepared_statement(bouncer):
+
+ # libpq before PG17 does not support sending Close messages
+ @pytest.mark.skipif("psycopg.pq.version() < 170000")
[email protected](
++ "psycopg.__version__ < '3.2.0'",
++ reason="Debian oldstable doesn't support a version of psycopg with 'close_prepared' support",
++)
+ def test_close_prepared_statement(bouncer):
+ with bouncer.conn() as conn:
+ result = conn.pgconn.prepare(b"test", b"SELECT 1")
+@@ -338,8 +342,9 @@ def test_statement_name_longer_than_pkt_buf(bouncer):
+ assert result.status == pq.ExecStatus.TUPLES_OK
+ assert result.get_value(0, 0) == b"abc"
+
+- if psycopg.pq.version() >= 170000:
++ if psycopg.pq.version() >= 170000 and psycopg.__version__ >= "3.2.0":
+ # libpq before PG17 does not support sending Close messages
++ # Debian oldstable does not package psycopg with 'close_prepared'
+ result = conn.pgconn.close_prepared(name)
+ assert result.status == pq.ExecStatus.COMMAND_OK
+ # Ensure that the close was successful
diff --git a/debian/patches/series b/debian/patches/series
index 19f790e..5d78651 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
+fix-psycopg-close-tests.patch
debian-config
update-test-assertions.patch
view thread (15+ messages) latest in thread
reply
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Reply to all the recipients using the --to and --cc options:
reply via email
To: [email protected]
Cc: [email protected], [email protected], [email protected]
Subject: Re: PgBouncer 1.24.0 - New upstream version
In-Reply-To: <CAGKCzND9R131b2MB1tHBqTbgCdV9TkReRYLqE3KLxTt6fbhrXA@mail.gmail.com>
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
This inbox is served by agora; see mirroring instructions
for how to clone and mirror all data and code used for this inbox