Skip to content

no longer claim/test support for Python 2.6/2.7 #249

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

no longer claim/test support for Python 2.6/2.7 #249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ dist: trusty
sudo: false
language: python
python:
- 2.6
- 2.7
- 3.4
- 3.5
env:
Expand Down
18 changes: 2 additions & 16 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,7 @@

import sys

if sys.version_info < (3, 0):
execfile('zerorpc/version.py')
else:
exec(compile(open('zerorpc/version.py', encoding='utf8').read(), 'zerorpc/version.py', 'exec'))
exec(compile(open('zerorpc/version.py', encoding='utf8').read(), 'zerorpc/version.py', 'exec'))

try:
from setuptools import setup
Expand All @@ -36,21 +33,12 @@


requirements = [
'gevent>=1.1',
'msgpack>=0.5.2',
'pyzmq>=13.1.0',
'future',
]

if sys.version_info < (2, 7):
requirements.append('argparse')

if sys.version_info < (2, 7):
requirements.append('gevent>=1.1.0,<1.2.0')
elif sys.version_info < (3, 0):
requirements.append('gevent>=1.0')
else:
requirements.append('gevent>=1.1')

with open("README.rst", "r") as fh:
long_description = fh.read()

Expand All @@ -75,8 +63,6 @@
'Natural Language :: English',
'License :: OSI Approved :: MIT License',
'Programming Language :: Python',
'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3.4',
),
)
108 changes: 30 additions & 78 deletions tests/test_buffered_channel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,8 @@ def test_close_server_bufchan():
gevent.sleep(TIME_FACTOR * 3)
print('CLOSE SERVER SOCKET!!!')
server_bufchan.close()
if sys.version_info < (2, 7):
pytest.raises(zerorpc.LostRemote, client_bufchan.recv)
else:
with pytest.raises(zerorpc.LostRemote):
client_bufchan.recv()
with pytest.raises(zerorpc.LostRemote):
client_bufchan.recv()
print('CLIENT LOST SERVER :)')
client_bufchan.close()
server.close()
Expand Down Expand Up @@ -95,11 +92,8 @@ def test_close_client_bufchan():
gevent.sleep(TIME_FACTOR * 3)
print('CLOSE CLIENT SOCKET!!!')
client_bufchan.close()
if sys.version_info < (2, 7):
pytest.raises(zerorpc.LostRemote, client_bufchan.recv)
else:
with pytest.raises(zerorpc.LostRemote):
client_bufchan.recv()
with pytest.raises(zerorpc.LostRemote):
client_bufchan.recv()
print('SERVER LOST CLIENT :)')
server_bufchan.close()
server.close()
Expand Down Expand Up @@ -128,11 +122,8 @@ def test_heartbeat_can_open_channel_server_close():
gevent.sleep(TIME_FACTOR * 3)
print('CLOSE SERVER SOCKET!!!')
server_bufchan.close()
if sys.version_info < (2, 7):
pytest.raises(zerorpc.LostRemote, client_bufchan.recv)
else:
with pytest.raises(zerorpc.LostRemote):
client_bufchan.recv()
with pytest.raises(zerorpc.LostRemote):
client_bufchan.recv()
print('CLIENT LOST SERVER :)')
client_bufchan.close()
server.close()
Expand Down Expand Up @@ -169,11 +160,8 @@ def server_fn():
print('CLOSE CLIENT SOCKET!!!')
client_bufchan.close()
client.close()
if sys.version_info < (2, 7):
pytest.raises(zerorpc.LostRemote, server_coro.get)
else:
with pytest.raises(zerorpc.LostRemote):
server_coro.get()
with pytest.raises(zerorpc.LostRemote):
server_coro.get()
print('SERVER LOST CLIENT :)')
server.close()

Expand Down Expand Up @@ -243,11 +231,8 @@ def client_do():
assert event.name == 'OK'
assert list(event.args) == [x + x * x]
client_bufchan.emit('add', (x, x * x))
if sys.version_info < (2, 7):
pytest.raises(zerorpc.LostRemote, client_bufchan.recv)
else:
with pytest.raises(zerorpc.LostRemote):
client_bufchan.recv()
with pytest.raises(zerorpc.LostRemote):
client_bufchan.recv()
client_bufchan.close()

coro_pool = gevent.pool.Pool()
Expand Down Expand Up @@ -307,11 +292,8 @@ def server_do():
assert event.name == 'add'
server_bufchan.emit('OK', (sum(event.args),))

if sys.version_info < (2, 7):
pytest.raises(zerorpc.LostRemote, server_bufchan.recv)
else:
with pytest.raises(zerorpc.LostRemote):
server_bufchan.recv()
with pytest.raises(zerorpc.LostRemote):
server_bufchan.recv()
server_bufchan.close()

coro_pool.spawn(server_do)
Expand All @@ -336,21 +318,12 @@ def client_do():
client_hbchan = zerorpc.HeartBeatOnChannel(client_channel, freq=TIME_FACTOR * 2)
client_bufchan = zerorpc.BufferedChannel(client_hbchan)

if sys.version_info < (2, 7):
def _do_with_assert_raises():
for x in range(10):
client_bufchan.emit('sleep', (x,))
event = client_bufchan.recv(timeout=TIME_FACTOR * 3)
assert event.name == 'OK'
assert list(event.args) == [x]
pytest.raises(zerorpc.TimeoutExpired, _do_with_assert_raises)
else:
with pytest.raises(zerorpc.TimeoutExpired):
for x in range(10):
client_bufchan.emit('sleep', (x,))
event = client_bufchan.recv(timeout=TIME_FACTOR * 3)
assert event.name == 'OK'
assert list(event.args) == [x]
with pytest.raises(zerorpc.TimeoutExpired):
for x in range(10):
client_bufchan.emit('sleep', (x,))
event = client_bufchan.recv(timeout=TIME_FACTOR * 3)
assert event.name == 'OK'
assert list(event.args) == [x]
client_bufchan.close()

coro_pool = gevent.pool.Pool()
Expand All @@ -362,21 +335,12 @@ def server_do():
server_hbchan = zerorpc.HeartBeatOnChannel(server_channel, freq=TIME_FACTOR * 2)
server_bufchan = zerorpc.BufferedChannel(server_hbchan)

if sys.version_info < (2, 7):
def _do_with_assert_raises():
for x in range(20):
event = server_bufchan.recv()
assert event.name == 'sleep'
gevent.sleep(TIME_FACTOR * event.args[0])
server_bufchan.emit('OK', event.args)
pytest.raises(zerorpc.LostRemote, _do_with_assert_raises)
else:
with pytest.raises(zerorpc.LostRemote):
for x in range(20):
event = server_bufchan.recv()
assert event.name == 'sleep'
gevent.sleep(TIME_FACTOR * event.args[0])
server_bufchan.emit('OK', event.args)
with pytest.raises(zerorpc.LostRemote):
for x in range(20):
event = server_bufchan.recv()
assert event.name == 'sleep'
gevent.sleep(TIME_FACTOR * event.args[0])
server_bufchan.emit('OK', event.args)
server_bufchan.close()


Expand Down Expand Up @@ -418,25 +382,13 @@ def server_do():
server_channel = server.channel(event)
server_hbchan = zerorpc.HeartBeatOnChannel(server_channel, freq=TIME_FACTOR * 2)
server_bufchan = zerorpc.BufferedChannel(server_hbchan, inqueue_size=100)
if sys.version_info < (2, 7):
def _do_with_assert_raises():
for x in range(200):
server_bufchan.emit('coucou', x, timeout=0) # will fail when x == 1
pytest.raises(zerorpc.TimeoutExpired, _do_with_assert_raises)
else:
with pytest.raises(zerorpc.TimeoutExpired):
for x in range(200):
server_bufchan.emit('coucou', x, timeout=0) # will fail when x == 1
with pytest.raises(zerorpc.TimeoutExpired):
for x in range(200):
server_bufchan.emit('coucou', x, timeout=0) # will fail when x == 1
server_bufchan.emit('coucou', 1) # block until receiver is ready
if sys.version_info < (2, 7):
def _do_with_assert_raises():
for x in range(2, 200):
server_bufchan.emit('coucou', x, timeout=0) # will fail when x == 100
pytest.raises(zerorpc.TimeoutExpired, _do_with_assert_raises)
else:
with pytest.raises(zerorpc.TimeoutExpired):
for x in range(2, 200):
server_bufchan.emit('coucou', x, timeout=0) # will fail when x == 100
with pytest.raises(zerorpc.TimeoutExpired):
for x in range(2, 200):
server_bufchan.emit('coucou', x, timeout=0) # will fail when x == 100
for x in range(read_cnt.value, 200):
server_bufchan.emit('coucou', x) # block until receiver is ready
server_bufchan.close()
Expand Down
9 changes: 2 additions & 7 deletions tests/test_client_async.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,13 +55,8 @@ def add(self, a, b):

async_result = client.add(1, 4, async_=True)

if sys.version_info < (2, 7):
def _do_with_assert_raises():
print(async_result.get())
pytest.raises(zerorpc.TimeoutExpired, _do_with_assert_raises)
else:
with pytest.raises(zerorpc.TimeoutExpired):
print(async_result.get())
with pytest.raises(zerorpc.TimeoutExpired):
print(async_result.get())
client.close()
srv.close()

Expand Down
2 changes: 0 additions & 2 deletions tests/test_client_heartbeat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@
# SOFTWARE.


from __future__ import print_function
from __future__ import absolute_import
from builtins import next
from builtins import range

Expand Down
84 changes: 24 additions & 60 deletions tests/test_heartbeat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,8 @@ def test_close_server_hbchan():
gevent.sleep(TIME_FACTOR * 3)
print('CLOSE SERVER SOCKET!!!')
server_hbchan.close()
if sys.version_info < (2, 7):
pytest.raises(zerorpc.LostRemote, client_hbchan.recv)
else:
with pytest.raises(zerorpc.LostRemote):
client_hbchan.recv()
with pytest.raises(zerorpc.LostRemote):
client_hbchan.recv()
print('CLIENT LOST SERVER :)')
client_hbchan.close()
server.close()
Expand Down Expand Up @@ -91,11 +88,8 @@ def test_close_client_hbchan():
gevent.sleep(TIME_FACTOR * 3)
print('CLOSE CLIENT SOCKET!!!')
client_hbchan.close()
if sys.version_info < (2, 7):
pytest.raises(zerorpc.LostRemote, server_hbchan.recv)
else:
with pytest.raises(zerorpc.LostRemote):
server_hbchan.recv()
with pytest.raises(zerorpc.LostRemote):
server_hbchan.recv()
print('SERVER LOST CLIENT :)')
server_hbchan.close()
server.close()
Expand All @@ -122,11 +116,8 @@ def test_heartbeat_can_open_channel_server_close():
gevent.sleep(TIME_FACTOR * 3)
print('CLOSE SERVER SOCKET!!!')
server_hbchan.close()
if sys.version_info < (2, 7):
pytest.raises(zerorpc.LostRemote, client_hbchan.recv)
else:
with pytest.raises(zerorpc.LostRemote):
client_hbchan.recv()
with pytest.raises(zerorpc.LostRemote):
client_hbchan.recv()
print('CLIENT LOST SERVER :)')
client_hbchan.close()
server.close()
Expand Down Expand Up @@ -154,11 +145,8 @@ def test_heartbeat_can_open_channel_client_close():
print('CLOSE CLIENT SOCKET!!!')
client_hbchan.close()
client.close()
if sys.version_info < (2, 7):
pytest.raises(zerorpc.LostRemote, server_hbchan.recv)
else:
with pytest.raises(zerorpc.LostRemote):
server_hbchan.recv()
with pytest.raises(zerorpc.LostRemote):
server_hbchan.recv()
print('SERVER LOST CLIENT :)')
server_hbchan.close()
server.close()
Expand Down Expand Up @@ -226,11 +214,8 @@ def client_do():
assert event.name == 'OK'
assert list(event.args) == [x + x * x]
client_hbchan.emit('add', (x, x * x))
if sys.version_info < (2, 7):
pytest.raises(zerorpc.LostRemote, client_hbchan.recv)
else:
with pytest.raises(zerorpc.LostRemote):
client_hbchan.recv()
with pytest.raises(zerorpc.LostRemote):
client_hbchan.recv()
client_hbchan.close()

client_task = gevent.spawn(client_do)
Expand Down Expand Up @@ -286,11 +271,8 @@ def server_do():
assert event.name == 'add'
server_hbchan.emit('OK', (sum(event.args),))

if sys.version_info < (2, 7):
pytest.raises(zerorpc.LostRemote, server_hbchan.recv)
else:
with pytest.raises(zerorpc.LostRemote):
server_hbchan.recv()
with pytest.raises(zerorpc.LostRemote):
server_hbchan.recv()
server_hbchan.close()

server_task = gevent.spawn(server_do)
Expand All @@ -315,21 +297,12 @@ def client_do():
client_channel = client.channel()
client_hbchan = zerorpc.HeartBeatOnChannel(client_channel, freq=TIME_FACTOR * 2)

if sys.version_info < (2, 7):
def _do_with_assert_raises():
for x in range(10):
client_hbchan.emit('sleep', (x,))
event = client_hbchan.recv(timeout=TIME_FACTOR * 3)
assert event.name == 'OK'
assert list(event.args) == [x]
pytest.raises(zerorpc.TimeoutExpired, _do_with_assert_raises)
else:
with pytest.raises(zerorpc.TimeoutExpired):
for x in range(10):
client_hbchan.emit('sleep', (x,))
event = client_hbchan.recv(timeout=TIME_FACTOR * 3)
assert event.name == 'OK'
assert list(event.args) == [x]
with pytest.raises(zerorpc.TimeoutExpired):
for x in range(10):
client_hbchan.emit('sleep', (x,))
event = client_hbchan.recv(timeout=TIME_FACTOR * 3)
assert event.name == 'OK'
assert list(event.args) == [x]
client_hbchan.close()

client_task = gevent.spawn(client_do)
Expand All @@ -339,21 +312,12 @@ def server_do():
server_channel = server.channel(event)
server_hbchan = zerorpc.HeartBeatOnChannel(server_channel, freq=TIME_FACTOR * 2)

if sys.version_info < (2, 7):
def _do_with_assert_raises():
for x in range(20):
event = server_hbchan.recv()
assert event.name == 'sleep'
gevent.sleep(TIME_FACTOR * event.args[0])
server_hbchan.emit('OK', event.args)
pytest.raises(zerorpc.LostRemote, _do_with_assert_raises)
else:
with pytest.raises(zerorpc.LostRemote):
for x in range(20):
event = server_hbchan.recv()
assert event.name == 'sleep'
gevent.sleep(TIME_FACTOR * event.args[0])
server_hbchan.emit('OK', event.args)
with pytest.raises(zerorpc.LostRemote):
for x in range(20):
event = server_hbchan.recv()
assert event.name == 'sleep'
gevent.sleep(TIME_FACTOR * event.args[0])
server_hbchan.emit('OK', event.args)
server_hbchan.close()

server_task = gevent.spawn(server_do)
Expand Down
Loading