[Python-modules-commits] [python-zeroconf] 01/06: Import python-zeroconf_0.19.1.orig.tar.gz
Ruben Undheim
rubund-guest at moszumanska.debian.org
Thu Jul 13 20:00:38 UTC 2017
This is an automated email from the git hooks/post-receive script.
rubund-guest pushed a commit to branch master
in repository python-zeroconf.
commit ca5286c3284c6e62d42b24d715ba5d63e76ab81e
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date: Thu Jul 13 19:40:00 2017 +0000
Import python-zeroconf_0.19.1.orig.tar.gz
---
.travis.yml | 2 +-
README.rst | 17 ++++++++++++++--
examples/browser.py | 1 +
examples/old_browser.py | 54 -------------------------------------------------
requirements-dev.txt | 3 ++-
setup.py | 6 +++++-
zeroconf.py | 2 +-
7 files changed, 25 insertions(+), 60 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 2a48f51..4fe2541 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,7 @@ python:
- "3.5"
- "3.6"
- "pypy"
- - "pypy3"
+ - "pypy3.3-5.2-alpha1"
matrix:
fast_finish: true
install:
diff --git a/README.rst b/README.rst
index 251ed0b..6af6d24 100644
--- a/README.rst
+++ b/README.rst
@@ -122,8 +122,21 @@ See examples directory for more.
Changelog
=========
-0.18.0 (not released yet)
--------------------------
+0.19.1
+------
+
+* Allowed installation with netifaces >= 0.10.6 (a bug that was concerning us
+ got fixed)
+
+0.19.0
+------
+
+* Technically backwards incompatible - restricted netifaces dependency version to
+ work around a bug, see https://github.com/jstasiak/python-zeroconf/issues/84 for
+ details
+
+0.18.0
+------
* Dropped Python 2.6 support
* Improved error handling inside code executed when Zeroconf object is being closed
diff --git a/examples/browser.py b/examples/browser.py
index 633ea0e..acfb69d 100755
--- a/examples/browser.py
+++ b/examples/browser.py
@@ -30,6 +30,7 @@ def on_service_state_change(zeroconf, service_type, name, state_change):
print(" No info")
print('\n')
+
if __name__ == '__main__':
logging.basicConfig(level=logging.DEBUG)
if len(sys.argv) > 1:
diff --git a/examples/old_browser.py b/examples/old_browser.py
deleted file mode 100755
index 4ad1cc1..0000000
--- a/examples/old_browser.py
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/usr/bin/env python
-from __future__ import absolute_import, division, print_function, unicode_literals
-
-""" Example of browsing for a service (in this case, HTTP) """
-
-import logging
-import socket
-import sys
-from time import sleep
-
-from zeroconf import ServiceBrowser, Zeroconf
-
-
-class MyListener(object):
-
- def remove_service(self, zeroconf, type, name):
- print("Service %s removed" % (name,))
- print('\n')
-
- def add_service(self, zeroconf, type, name):
- print("Service %s added" % (name,))
- print(" Type is %s" % (type,))
- info = zeroconf.get_service_info(type, name)
- if info:
- print(" Address is %s:%d" % (socket.inet_ntoa(info.address),
- info.port))
- print(" Weight is %d, Priority is %d" % (info.weight,
- info.priority))
- print(" Server is", info.server)
- if info.properties:
- print(" Properties are")
- for key, value in info.properties.items():
- print(" %s: %s" % (key, value))
- else:
- print(" No info")
- print('\n')
-
-if __name__ == '__main__':
- logging.basicConfig(level=logging.DEBUG)
- if len(sys.argv) > 1:
- assert sys.argv[1:] == ['--debug']
- logging.getLogger('zeroconf').setLevel(logging.DEBUG)
-
- zeroconf = Zeroconf()
- print("\nBrowsing services, press Ctrl-C to exit...\n")
- listener = MyListener()
- browser = ServiceBrowser(zeroconf, "_http._tcp.local.", listener)
- try:
- while True:
- sleep(0.1)
- except KeyboardInterrupt:
- pass
- finally:
- zeroconf.close()
diff --git a/requirements-dev.txt b/requirements-dev.txt
index 83145b4..0656512 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -8,7 +8,8 @@ flake8-blind-except
# Upper bound because of https://github.com/public/flake8-import-order/issues/42
flake8-import-order>=0.4.0, <0.6.0
mock
-netifaces
+# See setup.py comment for why this version is restricted
+netifaces<=0.10.4
nose
pep8==1.5.7
pep8-naming
diff --git a/setup.py b/setup.py
index a8af0a9..ddda07c 100755
--- a/setup.py
+++ b/setup.py
@@ -56,7 +56,11 @@ setup(
],
install_requires=[
'enum-compat',
- 'netifaces',
+ # 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',
'six',
],
)
diff --git a/zeroconf.py b/zeroconf.py
index 1d36b7f..31416af 100644
--- a/zeroconf.py
+++ b/zeroconf.py
@@ -41,7 +41,7 @@ from six.moves import xrange
__author__ = 'Paul Scott-Murphy, William McBrine'
__maintainer__ = 'Jakub Stasiak <jakub at stasiak.at>'
-__version__ = '0.18.0'
+__version__ = '0.19.1'
__license__ = 'LGPL'
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-zeroconf.git
More information about the Python-modules-commits
mailing list