From 0795d45f3432bf1331ec4ef0e54e53b9dc89882e Mon Sep 17 00:00:00 2001 From: Phillip Cloud Date: Tue, 16 Jul 2013 10:28:47 -0400 Subject: [PATCH 1/2] TST/BLD: add testing for bad bs4 version --- ci/requirements-2.6.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ci/requirements-2.6.txt b/ci/requirements-2.6.txt index 3873f56fa6070..ac77449b2df02 100644 --- a/ci/requirements-2.6.txt +++ b/ci/requirements-2.6.txt @@ -2,3 +2,5 @@ numpy==1.6.1 cython==0.19.1 python-dateutil==2.1 pytz==2013b +http://www.crummy.com/software/BeautifulSoup/bs4/download/4.2/beautifulsoup4-4.2.0.tar.gz +html5lib==1.0b2 From 2af7e6729b42b51c276bb718a78a37dde83fc611 Mon Sep 17 00:00:00 2001 From: Phillip Cloud Date: Tue, 16 Jul 2013 13:48:53 -0400 Subject: [PATCH 2/2] TST: add message to nose.SkipTest --- pandas/io/tests/test_html.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pandas/io/tests/test_html.py b/pandas/io/tests/test_html.py index ad6c2d215be32..9a196048e1959 100644 --- a/pandas/io/tests/test_html.py +++ b/pandas/io/tests/test_html.py @@ -37,7 +37,7 @@ def _have_module(module_name): def _skip_if_no(module_name): if not _have_module(module_name): - raise nose.SkipTest + raise nose.SkipTest("{0} not found".format(module_name)) def _skip_if_none_of(module_names): @@ -46,14 +46,16 @@ def _skip_if_none_of(module_names): if module_names == 'bs4': import bs4 if bs4.__version__ == LooseVersion('4.2.0'): - raise nose.SkipTest + raise nose.SkipTest("Bad version of bs4: 4.2.0") else: - if not all(_have_module(module_name) for module_name in module_names): - raise nose.SkipTest + not_found = [module_name for module_name in module_names if not + _have_module(module_name)] + if not_found == module_names: + raise nose.SkipTest("{0} not found".format(not_found)) if 'bs4' in module_names: import bs4 if bs4.__version__ == LooseVersion('4.2.0'): - raise nose.SkipTest + raise nose.SkipTest("Bad version of bs4: 4.2.0") DATA_PATH = get_data_path()