From b3c11700922699b9ea49f5a663d2e0d021296a42 Mon Sep 17 00:00:00 2001 From: Honza Kral Date: Wed, 2 Oct 2013 00:56:23 +0200 Subject: [PATCH] only require thrift if we are going to use it This commit is mostly for travis since thrift has trouble downloading at times. --- setup.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index b1bfd120..6d0afa18 100644 --- a/setup.py +++ b/setup.py @@ -2,8 +2,7 @@ from os.path import join, dirname from setuptools import setup, find_packages import sys - - +import os VERSION = (0, 4, 1) __version__ = VERSION @@ -30,7 +29,9 @@ if sys.version_info[:2] == (2, 6): tests_require.append('unittest2') if sys.version_info[0] == 2: - tests_require.append('thrift==0.9.1') + # only require thrift if we are going to use it + if os.environ.get('TEST_ES_CONNECTION', None) == 'ThriftConnection': + tests_require.append('thrift==0.9.1') tests_require.append('pylibmc==1.2.3') setup(