openstack/deb-python-cassandra-driver
Code Issues Proposed changes

travis-ci: Switch CYTHON_DEP tox env for setup env var

Browse Source
This commit is contained in:
Adam Holmberg
2015-08-14 09:00:07 -05:00
parent 133e597d7e
commit fdf577c33f
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
.travis.yml
View File

@@ -1,18 +1,18 @@
language: python language: python
python: 2.7 python: 2.7
env: env:
- TOX_ENV=py26 CASS_VER=21 CASS_DRIVER_NO_CYTHON=1
- TOX_ENV=py26 CASS_VER=21 - TOX_ENV=py26 CASS_VER=21
- TOX_ENV=py26 CASS_VER=21 CYTHON_DEP=cython - TOX_ENV=py27 CASS_VER=12 CASS_DRIVER_NO_CYTHON=1
- TOX_ENV=py27 CASS_VER=12 - TOX_ENV=py27 CASS_VER=20 CASS_DRIVER_NO_CYTHON=1
- TOX_ENV=py27 CASS_VER=20 - TOX_ENV=py27 CASS_VER=21 CASS_DRIVER_NO_CYTHON=1
- TOX_ENV=py27 CASS_VER=21 - TOX_ENV=py27 CASS_VER=21
- TOX_ENV=py27 CASS_VER=21 CYTHON_DEP=cython - TOX_ENV=py33 CASS_VER=21 CASS_DRIVER_NO_CYTHON=1
- TOX_ENV=py33 CASS_VER=21 - TOX_ENV=py33 CASS_VER=21
- TOX_ENV=py33 CASS_VER=21 CYTHON_DEP=cython - TOX_ENV=py34 CASS_VER=21 CASS_DRIVER_NO_CYTHON=1
- TOX_ENV=py34 CASS_VER=21 - TOX_ENV=py34 CASS_VER=21
- TOX_ENV=py34 CASS_VER=21 CYTHON_DEP=cython - TOX_ENV=pypy CASS_VER=21 CASS_DRIVER_NO_CYTHON=1
- TOX_ENV=pypy CASS_VER=21 - TOX_ENV=pypy3 CASS_VER=21 CASS_DRIVER_NO_CYTHON=1
- TOX_ENV=pypy3 CASS_VER=21
before_install: before_install:
- sudo apt-get update -y - sudo apt-get update -y

2
cassandra/io/libevreactor.py
View File

@@ -123,10 +123,8 @@ class LibevLoop(object):
conn.close() conn.close()
if conn._write_watcher: if conn._write_watcher:
conn._write_watcher.stop() conn._write_watcher.stop()
del conn._write_watcher
if conn._read_watcher: if conn._read_watcher:
conn._read_watcher.stop() conn._read_watcher.stop()
del conn._read_watcher
self.notify() # wake the timer watcher self.notify() # wake the timer watcher
log.debug("Waiting for event loop thread to join...") log.debug("Waiting for event loop thread to join...")