Merge ~ahasenack/ubuntu/+source/python-opcua:jammy-py310-collections-import into ubuntu/+source/python-opcua:ubuntu/devel

[Andreas Hasenack]

Fix from upstream for the collections import error in python 3.10+.

Submitted to debian:
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1004937
https://salsa.debian.org/python-team/packages/python-opcua/-/merge_requests/2

PPA: https://launchpad.net/~ahasenack/+archive/ubuntu/py310-collections

[Bryce Harrington (bryce)]

Thanks for forwarding patch to Debian. Packaging and technical changes look proper.
Builds and autopkgtests successfully locally as well as via bileto:

Results from https://autopkgtest.ubuntu.com/results/autopkgtest-jammy-ahasenack-py310-collections/?format=plain:
  python-opcua @ amd64:
    03.02.22 23:36:31 Log 🗒️ ✅ Triggers: ['python-opcua/0.98.11-1ubuntu1~ppa1']
      basic-import-py3 PASS ✅
  python-opcua @ arm64:
    03.02.22 23:37:04 Log 🗒️ ✅ Triggers: ['python-opcua/0.98.11-1ubuntu1~ppa1']
      basic-import-py3 PASS ✅
  python-opcua @ armhf:
    03.02.22 23:39:49 Log 🗒️ ✅ Triggers: ['python-opcua/0.98.11-1ubuntu1~ppa1']
      basic-import-py3 PASS ✅
  python-opcua @ ppc64el:
    03.02.22 23:37:37 Log 🗒️ ✅ Triggers: ['python-opcua/0.98.11-1ubuntu1~ppa1']
      basic-import-py3 PASS ✅
  python-opcua @ s390x:
    03.02.22 23:36:10 Log 🗒️ ✅ Triggers: ['python-opcua/0.98.11-1ubuntu1~ppa1']
      basic-import-py3 PASS ✅

LGTM, +1

review: Approve

[Andreas Hasenack (ahasenack)]

Thanks Bryce, uploaded

diff --git a/debian/changelog b/debian/changelog
index e3e45fe..2e4274d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+python-opcua (0.98.11-1ubuntu1) jammy; urgency=medium
+
+  * d/p/0005-fix-collections-import.patch: fix collections import for
+    python 3.10+ (LP: #1959935)
+
+ -- Andreas Hasenack <[e-mail]>  Thu, 03 Feb 2022 20:22:48 +0000
+
 python-opcua (0.98.11-1) unstable; urgency=medium
 
   * Team upload
diff --git a/debian/control b/debian/control
index 9ec8109..02e3d1f 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: python-opcua
 Section: python
 Priority: optional
-Maintainer: Debian Python Modules Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Python Modules Team <[e-mail]>
 Uploaders: W. Martin Borgert <[e-mail]>
 Build-Depends: devscripts,
 	python3,
diff --git a/debian/patches/0005-fix-collections-import.patch b/debian/patches/0005-fix-collections-import.patch
new file mode 100644
index 0000000..61ffa34
--- /dev/null
+++ b/debian/patches/0005-fix-collections-import.patch
@@ -0,0 +1,35 @@
+From 34d98f992f9f7e494be20f028cdf9a05b3b62540 Mon Sep 17 00:00:00 2001
+From: Nick James <[e-mail]>
+Date: Fri, 19 Jun 2020 03:56:17 +0800
+Subject: [PATCH] remove DeprecationWarning: import Iterable from
+ collections.abc if python >= 3.6 (#1075)
+
+Co-authored-by: Nick James <[e-mail]>
+---
+ opcua/common/subscription.py | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+Origin: upstream, https://github.com/FreeOpcUa/python-opcua/commit/34d98f992f9f7e494be20f028cdf9a05b3b62540
+Bug: https://github.com/FreeOpcUa/python-opcua/pull/1075
+Bug-Debian: https://bugs.debian.org/1004937
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/python-opcua/+bug/1959935
+Applied-Upstream: 0.98.12
+Last-Update: 2022-02-03
+
+diff --git a/opcua/common/subscription.py b/opcua/common/subscription.py
+index 19b8d1a8..defbafb0 100644
+--- a/opcua/common/subscription.py
++++ b/opcua/common/subscription.py
+@@ -4,7 +4,11 @@
+ import time
+ import logging
+ from threading import Lock
+-from collections import Iterable
++import sys
++if sys.version_info.major == 3 and sys.version_info.minor >= 6:
++    from collections.abc import Iterable
++else:
++    from collections import Iterable
+ 
+ from opcua import ua
+ from opcua.common import events
diff --git a/debian/patches/series b/debian/patches/series
index 4cab713..f7e7f15 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 add-shebang.patch
 0003-Use-the-python3-binary-in-cmdline-tests.patch
 0004-Fix-comparison-with-literal.patch
+0005-fix-collections-import.patch