Skip to content

Commit df5af03

Browse files
committed
Merge pull request #4259 from cpcloud/add-bad-bs4-version-to-travis
TST/BLD: add proper skips for bad bs4 version
2 parents a310890 + 2af7e67 commit df5af03

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

ci/requirements-2.6.txt

+2
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,5 @@ numpy==1.6.1
22
cython==0.19.1
33
python-dateutil==2.1
44
pytz==2013b
5+
http://www.crummy.com/software/BeautifulSoup/bs4/download/4.2/beautifulsoup4-4.2.0.tar.gz
6+
html5lib==1.0b2

pandas/io/tests/test_html.py

+7-5
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ def _have_module(module_name):
3737

3838
def _skip_if_no(module_name):
3939
if not _have_module(module_name):
40-
raise nose.SkipTest
40+
raise nose.SkipTest("{0} not found".format(module_name))
4141

4242

4343
def _skip_if_none_of(module_names):
@@ -46,14 +46,16 @@ def _skip_if_none_of(module_names):
4646
if module_names == 'bs4':
4747
import bs4
4848
if bs4.__version__ == LooseVersion('4.2.0'):
49-
raise nose.SkipTest
49+
raise nose.SkipTest("Bad version of bs4: 4.2.0")
5050
else:
51-
if not all(_have_module(module_name) for module_name in module_names):
52-
raise nose.SkipTest
51+
not_found = [module_name for module_name in module_names if not
52+
_have_module(module_name)]
53+
if not_found == module_names:
54+
raise nose.SkipTest("{0} not found".format(not_found))
5355
if 'bs4' in module_names:
5456
import bs4
5557
if bs4.__version__ == LooseVersion('4.2.0'):
56-
raise nose.SkipTest
58+
raise nose.SkipTest("Bad version of bs4: 4.2.0")
5759

5860

5961
DATA_PATH = get_data_path()

0 commit comments

Comments
 (0)