From e2390d09fd09f09a71572f7849ffbb845c2bc6482763ee170b256b082f360e2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sat, 28 Dec 2019 22:49:47 +0000 Subject: [PATCH] Accepting request 759821 from home:mnhauke - Adjust dependencies and the %check section so the testsuite can still be executed - Add patch: * python-zeroconf-disable-some-tests.patch - Update to version 0.24.3 * Fixed import-time "TypeError: 'ellipsis' object is not iterable." on CPython 3.5.2 - Update to version 0.24.2 * Added support for AWDL interface on macOS (needed and used by the opendrop project but should be useful in general) * Added missing type hints - Update to version 0.24.1 * Applied some significant performance optimizations * Fixed flushing outdated cache entries when incoming record is unique * Fixed handling updates of TXT records (they'd not get recorded previously) - Update to version 0.24.0 * Added IPv6 support * Added additional recommended records to PTR responses * Added handling of ENOTCONN being raised during shutdown when using Eventlet * Included the py.typed marker in the package so that type checkers know to use type hints from the source code OBS-URL: https://build.opensuse.org/request/show/759821 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-zeroconf?expand=0&rev=26 --- 0.23.0.tar.gz | 3 -- python-zeroconf-0.24.3.tar.gz | 3 ++ python-zeroconf-disable-some-tests.patch | 44 ++++++++++++++++++++++++ python-zeroconf.changes | 28 +++++++++++++++ python-zeroconf.spec | 17 +++++---- 5 files changed, 85 insertions(+), 10 deletions(-) delete mode 100644 0.23.0.tar.gz create mode 100644 python-zeroconf-0.24.3.tar.gz create mode 100644 python-zeroconf-disable-some-tests.patch diff --git a/0.23.0.tar.gz b/0.23.0.tar.gz deleted file mode 100644 index f3c8542..0000000 --- a/0.23.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e194df93ae5d5158fd62434e395fe73ef9eb9580e5d326aad06d02c56031b31a -size 41000 diff --git a/python-zeroconf-0.24.3.tar.gz b/python-zeroconf-0.24.3.tar.gz new file mode 100644 index 0000000..670605b --- /dev/null +++ b/python-zeroconf-0.24.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dd381839f6558aaf618af7dbfd7c0bb25defeb954d1187dc6e5ad11c59939bf1 +size 52444 diff --git a/python-zeroconf-disable-some-tests.patch b/python-zeroconf-disable-some-tests.patch new file mode 100644 index 0000000..792a611 --- /dev/null +++ b/python-zeroconf-disable-some-tests.patch @@ -0,0 +1,44 @@ +diff --git a/zeroconf/test.py b/zeroconf/test.py +index f0d5ad4..26e6216 100644 +--- a/zeroconf/test.py ++++ b/zeroconf/test.py +@@ -435,6 +435,7 @@ class Names(unittest.TestCase): + + + class Framework(unittest.TestCase): ++ @unittest.skip("Does not work in an OBS chroot") + def test_launch_and_close(self): + rv = r.Zeroconf(interfaces=r.InterfaceChoice.All) + rv.close() +@@ -443,6 +444,7 @@ class Framework(unittest.TestCase): + + @unittest.skipIf(not socket.has_ipv6, 'Requires IPv6') + @attr('IPv6') ++ @unittest.skip("Does not work in an OBS chroot") + def test_launch_and_close_v4_v6(self): + rv = r.Zeroconf(interfaces=r.InterfaceChoice.All, ip_version=r.IPVersion.All) + rv.close() +@@ -451,6 +453,7 @@ class Framework(unittest.TestCase): + + @unittest.skipIf(not socket.has_ipv6, 'Requires IPv6') + @attr('IPv6') ++ @unittest.skip("Does not work in an OBS chroot") + def test_launch_and_close_v6_only(self): + rv = r.Zeroconf(interfaces=r.InterfaceChoice.All, ip_version=r.IPVersion.V6Only) + rv.close() +@@ -770,6 +773,7 @@ class TestDNSCache(unittest.TestCase): + + + class ServiceTypesQuery(unittest.TestCase): ++ @unittest.skip("Does not work in an OBS chroot") + def test_integration_with_listener(self): + + type_ = "_test-srvc-type._tcp.local." +@@ -818,6 +822,7 @@ class ServiceTypesQuery(unittest.TestCase): + + @unittest.skipIf(not socket.has_ipv6, 'Requires IPv6') + @attr('IPv6') ++ @unittest.skip("Does not work in an OBS chroot") + def test_integration_with_listener_ipv6(self): + + type_ = "_test-srvc-type._tcp.local." diff --git a/python-zeroconf.changes b/python-zeroconf.changes index e187825..70ddaef 100644 --- a/python-zeroconf.changes +++ b/python-zeroconf.changes @@ -1,3 +1,31 @@ +------------------------------------------------------------------- +Sat Dec 28 20:25:16 UTC 2019 - Martin Hauke + +- Adjust dependencies and the %check section so the testsuite can + still be executed +- Add patch: + * python-zeroconf-disable-some-tests.patch +- Update to version 0.24.3 + * Fixed import-time "TypeError: 'ellipsis' object is not + iterable." on CPython 3.5.2 +- Update to version 0.24.2 + * Added support for AWDL interface on macOS (needed and used by + the opendrop project but should be useful in general) + * Added missing type hints +- Update to version 0.24.1 + * Applied some significant performance optimizations + * Fixed flushing outdated cache entries when incoming record + is unique + * Fixed handling updates of TXT records (they'd not get recorded + previously) +- Update to version 0.24.0 + * Added IPv6 support + * Added additional recommended records to PTR responses + * Added handling of ENOTCONN being raised during shutdown when + using Eventlet + * Included the py.typed marker in the package so that type + checkers know to use type hints from the source code + ------------------------------------------------------------------- Thu Jun 6 07:35:15 UTC 2019 - Adrian Schröter diff --git a/python-zeroconf.spec b/python-zeroconf.spec index 571adf9..ae20b6a 100644 --- a/python-zeroconf.spec +++ b/python-zeroconf.spec @@ -19,15 +19,16 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} %define skip_python2 1 Name: python-zeroconf -Version: 0.23.0 +Version: 0.24.3 Release: 0 Summary: Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible) License: LGPL-2.0-only Group: Development/Languages/Python URL: https://github.com/jstasiak/python-zeroconf -Source: https://github.com/jstasiak/python-zeroconf/archive/%{version}.tar.gz +Source: https://github.com/jstasiak/python-zeroconf/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz +Patch0: python-zeroconf-disable-some-tests.patch BuildRequires: %{python_module ifaddr} -BuildRequires: %{python_module pytest} +BuildRequires: %{python_module nose} BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros @@ -43,22 +44,24 @@ is not tied to Bonjour or Avahi, does not use D-Bus and does not force you to use a particular event loop or python-twisted. %prep -%setup -q -n python-zeroconf-%{version} +%setup -q +%patch0 -p1 %build %python_build %install %python_install +%python_expand rm -f %{buildroot}%{$python_sitelib}/zeroconf/test.py %python_expand %fdupes %{buildroot}%{$python_sitelib} %check -# needs network interface test_launch_and_close -%python_expand PYTHONPATH=%{buildroot}%{$python_sitelib} py.test-%{$python_bin_suffix} -v -k 'not test_launch_and_close' +# tests that do not run in an OBS chroot are disabled via python-zeroconf-disable-some-tests.patch +%python_expand PYTHONPATH=%{buildroot}%{$python_sitelib} %python_exec -m unittest discover -v %files %{python_files} %doc README.rst %license COPYING -%{python_sitelib}/* +%{python_sitelib}/zeroconf* %changelog