python/python-zeroconf
SHA256
14
0
Fork 0
forked from pool/python-zeroconf
Code Pull Requests Activity

Accepting request 577228 from home:alarrosa:branches:devel:languages:python

Browse Source 
- Remove patch which was breaking zeroconf dependency check with python3
  (it was making pkg_resources generate a DistributionNotFound exception
  because enum34 wasn't found). enum34 is only required by the python2
  package, which is what the enum-compat  package is all about.
  * python-zeroconf-0.19.1-enum34-instead-of-enum-compat.patch 
- Require python-enum-compat to require python-enum34 on python2 and
  nothing on python3, just as the egg's requires.txt file does.

OBS-URL: https://build.opensuse.org/request/show/577228
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-zeroconf?expand=0&rev=17
This commit is contained in:
Antoine Belvire
2018-02-16 11:55:24 +00:00
committed by Git OBS Bridge
parent 53880ddb9c
commit 3f2636bdf3
3 changed files with 14 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
python-zeroconf-0.19.1-enum34-instead-of-enum-compat.patch
View File

@@ -1,31 +0,0 @@
From 7021e671cb7b2113188419b36b0b823d0e2e8004 Mon Sep 17 00:00:00 2001
From: Ruben Undheim <ruben.undheim@gmail.com>
Date: Sun, 6 Mar 2016 10:26:23 +0100
Subject: Set install_requires to enum34 instead of enum-compat
---
setup.py | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/setup.py b/setup.py
index ddda07c..a742454 100755
--- a/setup.py
+++ b/setup.py
@@ -55,12 +55,8 @@ setup(
'mDNS',
],
install_requires=[
- 'enum-compat',
- # netifaces 0.10.5 has a bug that results in all interfaces' netmasks
- # to be 255.255.255.255 on Windows which breaks things. See:
- # * https://github.com/jstasiak/python-zeroconf/issues/84
- # * https://bitbucket.org/al45tair/netifaces/issues/39/netmask-is-always-255255255255
- 'netifaces!=0.10.5',
+ 'enum34',
+ 'netifaces',
'six',
],
)
--
cgit v0.12

12
python-zeroconf.changes
View File

@@ -1,3 +1,15 @@
-------------------------------------------------------------------
Thu Feb 15 19:04:17 UTC 2018 - alarrosa@suse.com
- Remove patch which was breaking zeroconf dependency check with python3
(it was making pkg_resources generate a DistributionNotFound exception
because enum34 wasn't found). enum34 is only required by the python2
package, which is what the enum-compat package is all about.
* python-zeroconf-0.19.1-enum34-instead-of-enum-compat.patch
- Require python-enum-compat to require python-enum34 on python2 and
nothing on python3, just as the egg's requires.txt file does.
-------------------------------------------------------------------
Fri Jul 7 22:47:48 UTC 2017 - antoine.belvire@opensuse.org

9
python-zeroconf.spec
View File

@@ -1,7 +1,7 @@
#
# spec file for package python-zeroconf
#
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -25,13 +25,9 @@ License: LGPL-2.0
Group: Development/Languages/Python
Url: https://github.com/jstasiak/python-zeroconf
Source: https://pypi.io/packages/source/z/zeroconf/zeroconf-%{version}.tar.gz
# PATCH-FIX-OPENSUSE python-zeroconf-0.19.1-enum34-instead-of-enum-compat.patch -- replace enum-compat by enum34 (picked from Debian)
Patch: python-zeroconf-0.19.1-enum34-instead-of-enum-compat.patch
BuildRequires: %{python_module setuptools}
BuildRequires: python-rpm-macros
%ifpython2
Requires: python-enum34
%endif
Requires: python-enum-compat
Requires: python-netifaces
Requires: python-six
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -48,7 +44,6 @@ does not force you to use a particular event loop or python-twisted.
%prep
%setup -q -n zeroconf-%{version}
%patch -p1
%build
%python_build