Merge ~pushkarnk/ubuntu/+source/python-trio:fix-2054772 into ubuntu/+source/python-trio:ubuntu/devel

[Pushkar Kulkarni]

[Pushkar Kulkarni (pushkarnk)]

autopkgtests for python-trio pass

----
$ autopkgtest \
 --apt-upgrade \
 --shell-fail \
 --output-dir output2 \
 --setup-commands="sudo add-apt-repository -y -u -s \
 ppa:pushkarnk/test-builds" \
 --no-built-binaries \
 python-trio \
 -- lxd autopkgtest/ubuntu/noble/amd64

...
...
...
================ 680 passed, 34 skipped, 42 deselected in 5.98s ================
autopkgtest [16:16:15]: test upstream: -----------------------]
upstream PASS
autopkgtest [16:16:15]: test upstream: - - - - - - - - - - results - - - - - - - - - -
autopkgtest [16:16:16]: @@@@@@@@@@@@@@@@@@@@ summary
upstream PASS

----

[Pushkar Kulkarni (pushkarnk)]

autokgtests for dnspython - a reverse dependency - also pass:

----

$ autopkgtest \
 --apt-upgrade \
 --shell-fail \
 --output-dir output1 \
 --setup-commands="sudo add-apt-repository -y -u -s \
 ppa:pushkarnk/test-builds" \
 --no-built-binaries \
 dnspython \
 -- lxd autopkgtest/ubuntu/noble/amd64

...
...
...

================ 1359 passed, 19 skipped, 9 warnings in 57.45s =================
autopkgtest [15:44:35]: test py3: -----------------------]
py3 PASS
autopkgtest [15:44:36]: test py3: - - - - - - - - - - results - - - - - - - - - -
autopkgtest [15:44:36]: @@@@@@@@@@@@@@@@@@@@ summary
py3 PASS

-----

[Pushkar Kulkarni (pushkarnk)]

test build:

https://launchpad.net/~pushkarnk/+archive/ubuntu/test-builds/+build/27824957

[Chris Peterson (cpete)]

This seems reasonable to me. If we later find out a way to change permissions on the builder to avoid this issue then we can just request a sync. Only thing to fix is patch headers.

review: Needs Fixing

[Pushkar Kulkarni (pushkarnk)]

> This seems reasonable to me. If we later find out a way to change permissions
> on the builder to avoid this issue then we can just request a sync. Only thing
> to fix is patch headers.

Thanks, Chris! I've added the DEP3 header.

[Chris Peterson (cpete)]

Thanks! Looks good to me now.

review: Approve

[Pushkar Kulkarni (pushkarnk)]

Thanks to the suggestion from Vladimir. I have updated the patch to handle(ignore) the PermissionError instead of commenting out the relevant code.

[Nick Rosbrook (enr0n)]

This looks good code-wise. Just a few organizational comments:

1. Can you please squash your fixup commits into "Add patch to avoid PermissioErrors on LP"? This keeps the history cleaner.
2. Please update both the patch Description: field, and the changelog entry to reflect that you are catching and ignoring the exception. The current language used suggests the code is still commented out, which is not true.

After that is fixed I will upload this. Thanks!

review: Needs Fixing

[Pushkar Kulkarni (pushkarnk)]

> This looks good code-wise. Just a few organizational comments:
>
> 1. Can you please squash your fixup commits into "Add patch to avoid
> PermissioErrors on LP"? This keeps the history cleaner.
> 2. Please update both the patch Description: field, and the changelog entry to
> reflect that you are catching and ignoring the exception. The current language
> used suggests the code is still commented out, which is not true.
>
> After that is fixed I will upload this. Thanks!

Thanks, the commit history was looking very bad indeed. Fixed now.

[Nick Rosbrook (enr0n)]

Thanks! Uploaded now.

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 375142e..ae20231 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+python-trio (0.24.0-1ubuntu1) noble; urgency=medium
+
+  * d/patches: In test_socket.py, handle PermissionError
+    which may be thrown if setsockopt() is invoked
+    with SO_BINDTODEVICE (LP: #2054772)
+
+ -- Pushkar Kulkarni <[e-mail]>  Tue, 27 Feb 2024 13:40:53 +0530
+
 python-trio (0.24.0-1) unstable; urgency=low
 
   * New upstream version 0.24.0
diff --git a/debian/control b/debian/control
index 9353e42..f07b02a 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,8 @@ Source: python-trio
 Section: python
 Priority: optional
 Standards-Version: 4.6.2
-Maintainer: Debian Python Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Python Team <[e-mail]>
 Uploaders:
  Robie Basak <[e-mail]>,
  Michael Fladischer <[e-mail]>,
diff --git a/debian/patches/0002-workaround-LP-test-failure.patch b/debian/patches/0002-workaround-LP-test-failure.patch
new file mode 100644
index 0000000..d426a37
--- /dev/null
+++ b/debian/patches/0002-workaround-LP-test-failure.patch
@@ -0,0 +1,32 @@
+Description: Temporary patch to resolve FTBFS on Launchpad
+ Build-time tests that call setsocketopt(...) with
+ SO_BINDTODEVICE fail with PermissionError only on
+ Launchpad's builder VMs. This patch, which is meant
+ to be temporary, catches the PermissionError, effectively
+ ignoring it.
+Author: Pushkar Kulkarni <[e-mail]>
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/python-trio/+bug/2054772 
+Forwarded: not-needed
+---
+--- a/src/trio/_tests/test_socket.py
++++ b/src/trio/_tests/test_socket.py
+@@ -1,5 +1,6 @@
+ from __future__ import annotations
+ 
++import builtins
+ import errno
+ import inspect
+ import os
+@@ -410,7 +411,11 @@
+     # specifying optlen. Not supported on pypy, and I couldn't find
+     # valid calls on darwin or win32.
+     if hasattr(tsocket, "SO_BINDTODEVICE"):
+-        sock.setsockopt(tsocket.SOL_SOCKET, tsocket.SO_BINDTODEVICE, None, 0)
++        # SO_BINDTODEVICE causes a PermissionError on Launchpad's builders (TODO: why?)
++        try:
++            sock.setsockopt(tsocket.SOL_SOCKET, tsocket.SO_BINDTODEVICE, None, 0)
++        except builtins.PermissionError:
++            print("Warning: PermissionError thrown by setsockopt() with SO_BINDTODEVICE. Ignoring.")
+ 
+     # specifying value
+     sock.setsockopt(tsocket.IPPROTO_TCP, tsocket.TCP_NODELAY, False)
diff --git a/debian/patches/series b/debian/patches/series
index 13459b9..7c2eb7f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-Use-local-objects.inv-in-intersphinx-mapping.patch
+0002-workaround-LP-test-failure.patch