From c8d38436685ce23f5ad0948a0b2c9b7592c926b1 Mon Sep 17 00:00:00 2001 From: Adam Holmberg Date: Fri, 14 Aug 2015 09:26:57 -0500 Subject: [PATCH] Revert "travis-ci: Switch CYTHON_DEP tox env for setup env var" This reverts commit fdf577c33f5f05558b543978fd5f6b98804696af. (inadvertently included other changes, now separating) --- .travis.yml | 16 ++++++++-------- cassandra/io/libevreactor.py | 2 ++ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index f5755e24..dea98552 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,18 +1,18 @@ language: python python: 2.7 env: - - TOX_ENV=py26 CASS_VER=21 CASS_DRIVER_NO_CYTHON=1 - TOX_ENV=py26 CASS_VER=21 - - TOX_ENV=py27 CASS_VER=12 CASS_DRIVER_NO_CYTHON=1 - - TOX_ENV=py27 CASS_VER=20 CASS_DRIVER_NO_CYTHON=1 - - TOX_ENV=py27 CASS_VER=21 CASS_DRIVER_NO_CYTHON=1 + - TOX_ENV=py26 CASS_VER=21 CYTHON_DEP=cython + - TOX_ENV=py27 CASS_VER=12 + - TOX_ENV=py27 CASS_VER=20 - TOX_ENV=py27 CASS_VER=21 - - TOX_ENV=py33 CASS_VER=21 CASS_DRIVER_NO_CYTHON=1 + - TOX_ENV=py27 CASS_VER=21 CYTHON_DEP=cython - TOX_ENV=py33 CASS_VER=21 - - TOX_ENV=py34 CASS_VER=21 CASS_DRIVER_NO_CYTHON=1 + - TOX_ENV=py33 CASS_VER=21 CYTHON_DEP=cython - TOX_ENV=py34 CASS_VER=21 - - TOX_ENV=pypy CASS_VER=21 CASS_DRIVER_NO_CYTHON=1 - - TOX_ENV=pypy3 CASS_VER=21 CASS_DRIVER_NO_CYTHON=1 + - TOX_ENV=py34 CASS_VER=21 CYTHON_DEP=cython + - TOX_ENV=pypy CASS_VER=21 + - TOX_ENV=pypy3 CASS_VER=21 before_install: - sudo apt-get update -y diff --git a/cassandra/io/libevreactor.py b/cassandra/io/libevreactor.py index 88678cb6..6b2036e2 100644 --- a/cassandra/io/libevreactor.py +++ b/cassandra/io/libevreactor.py @@ -123,8 +123,10 @@ class LibevLoop(object): conn.close() if conn._write_watcher: conn._write_watcher.stop() + del conn._write_watcher if conn._read_watcher: conn._read_watcher.stop() + del conn._read_watcher self.notify() # wake the timer watcher log.debug("Waiting for event loop thread to join...")