Skip to content

Commit

Permalink
Merge pull request #159 from hoefling/3.8-travis
Browse files Browse the repository at this point in the history
Fix failing test for 3.7, extend job matrix on Travis with 3.8 support
  • Loading branch information
JelleZijlstra committed Jan 25, 2020
2 parents 4e6703c + 2dd382e commit 9a81564
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
7 changes: 2 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ language: python
python:
- "3.5"
- "3.6"
- "3.7"
- "3.8"

before_install:
- sudo apt-get update -qq
Expand Down Expand Up @@ -40,12 +42,7 @@ cache: apt

jobs:
fast_finish: true
allow_failures:
- python: 3.7
include:
- python: 3.7
dist: xenial
sudo: required
- stage: Deploy to PYPI
python: 3.6
script: skip
Expand Down
5 changes: 4 additions & 1 deletion aiozmq/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -654,7 +654,10 @@ def _force_close(self, exc):
if not self._closing:
self._closing = True
if not self._paused:
self._loop.remove_reader(self._zmq_sock)
if self._zmq_sock.closed:
self._loop._remove_reader(self._zmq_sock)
else:
self._loop.remove_reader(self._zmq_sock)
self._conn_lost += 1
self._loop.call_soon(self._call_connection_lost, exc)

Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from setuptools import setup, find_packages


install_requires = ['pyzmq>=13.1,<17.1.2']
install_requires = ['pyzmq>=13.1,!=17.1.2']

tests_require = install_requires + ['msgpack>=0.5.0']

Expand Down

0 comments on commit 9a81564

Please sign in to comment.