Skip to content

Commit 191bc89

Browse files
committed
Merge pull request #4267 from cpcloud/html5lib-fix
TST: skip if no html5lib since bs4 needs it
2 parents df5af03 + 56e57e5 commit 191bc89

File tree

3 files changed

+3
-1
lines changed

3 files changed

+3
-1
lines changed

doc/source/release.rst

+1
Original file line numberDiff line numberDiff line change
@@ -341,6 +341,7 @@ pandas 0.12
341341
(:issue:`4226`)
342342
- Fixed bug in initializing ``DatetimeIndex`` with an array of strings
343343
in a certain time zone (:issue:`4229`)
344+
- Fixed bug where html5lib wasn't being properly skipped (:issue:`4265`)
344345

345346
pandas 0.11.0
346347
=============

doc/source/v0.12.0.txt

+1
Original file line numberDiff line numberDiff line change
@@ -474,6 +474,7 @@ Bug Fixes
474474
(:issue:`4226`)
475475
- Fixed bug in initializing ``DatetimeIndex`` with an array of strings
476476
in a certain time zone (:issue:`4229`)
477+
- Fixed bug where html5lib wasn't being properly skipped (:issue:`4265`)
477478

478479
See the :ref:`full release notes
479480
<release>` or issue tracker

pandas/io/tests/test_html.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ def assert_framelist_equal(list1, list2, *args, **kwargs):
7777

7878

7979
def test_bs4_version_fails():
80-
_skip_if_no('bs4')
80+
_skip_if_none_of(('bs4', 'html5lib'))
8181
import bs4
8282
if bs4.__version__ == LooseVersion('4.2.0'):
8383
assert_raises(AssertionError, read_html, os.path.join(DATA_PATH,

0 commit comments

Comments
 (0)