Merge commit 'v0.12.0rc1-101-gd070a1f' into debian

* commit 'v0.12.0rc1-101-gd070a1f':
  TST/CI: add scikits.timeseries wheel back
  TST: skip if no html5lib since bs4 needs it
  CLN: define __hash__ directly for _NaT; needed for some builds on py3k
  TST: add message to nose.SkipTest
  TST/BLD: add testing for bad bs4 version
  BLD/TST/CI: add script to show skipped tests at the end of a build

Author: yarikoptic

.travis.yml

@@ -49,3 +49,4 @@ script:
 
 after_script:
   - ci/print_versions.py
+  - ci/print_skipped.py /tmp/nosetests.xml

ci/print_skipped.py

@@ -0,0 +1,51 @@
+#!/usr/bin/env python
+
+import sys
+import math
+import xml.etree.ElementTree as et
+
+
+def parse_results(filename):
+    tree = et.parse(filename)
+    root = tree.getroot()
+    skipped = []
+
+    current_class = old_class = ''
+    i = 1
+    assert i - 1 == len(skipped)
+    for el in root.findall('testcase'):
+        cn = el.attrib['classname']
+        for sk in el.findall('skipped'):
+            old_class = current_class
+            current_class = cn
+            name = '{classname}.{name}'.format(classname=current_class,
+                                               name=el.attrib['name'])
+            msg = sk.attrib['message']
+            out = ''
+            if old_class != current_class:
+                ndigits = int(math.log(i, 10) + 1)
+                out += ('-' * (len(name + msg) + 4 + ndigits) + '\n') # 4 for : + space + # + space
+            out += '#{i} {name}: {msg}'.format(i=i, name=name, msg=msg)
+            skipped.append(out)
+            i += 1
+            assert i - 1 == len(skipped)
+    assert i - 1 == len(skipped)
+    assert len(skipped) == int(root.attrib['skip'])
+    return '\n'.join(skipped)
+
+
+def main(args):
+    print('SKIPPED TESTS:')
+    print(parse_results(args.filename))
+    return 0
+
+
+def parse_args():
+    import argparse
+    parser = argparse.ArgumentParser()
+    parser.add_argument('filename', help='XUnit file to parse')
+    return parser.parse_args()
+
+
+if __name__ == '__main__':
+    sys.exit(main(parse_args()))

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

ci/requirements-2.7.txt

@@ -12,7 +12,7 @@ xlrd==0.9.2
 patsy==0.1.0
 html5lib==1.0b2
 lxml==3.2.1
-http://downloads.sourceforge.net/project/pytseries/scikits.timeseries/0.91.3/scikits.timeseries-0.91.3.tar.gz?r=
+scikits.timeseries==0.91.3
 MySQL-python==1.2.4
 scipy==0.10.0
 beautifulsoup4==4.2.1

ci/script.sh

@@ -9,10 +9,5 @@ if [ x"$LOCALE_OVERRIDE" != x"" ]; then
 
 fi
 
-echo nosetests --exe -w /tmp -A "$NOSE_ARGS" pandas;
-nosetests --exe -w /tmp -A "$NOSE_ARGS" pandas;
-
-# if [ x"$VBENCH" == x"true" ]; then
-#     python vb_suite/perf_HEAD.py;
-#     exit
-# fi
+echo nosetests --exe -w /tmp -A "$NOSE_ARGS" pandas --with-xunit --xunit-file=/tmp/nosetests.xml
+nosetests --exe -w /tmp -A "$NOSE_ARGS" pandas --with-xunit --xunit-file=/tmp/nosetests.xml

doc/source/release.rst

@@ -341,6 +341,7 @@ pandas 0.12
     (:issue:`4226`)
   - Fixed bug in initializing ``DatetimeIndex`` with an array of strings
     in a certain time zone (:issue:`4229`)
+  - Fixed bug where html5lib wasn't being properly skipped (:issue:`4265`)
 
 pandas 0.11.0
 =============

doc/source/v0.12.0.txt

@@ -474,6 +474,7 @@ Bug Fixes
     (:issue:`4226`)
   - Fixed bug in initializing ``DatetimeIndex`` with an array of strings
     in a certain time zone (:issue:`4229`)
+  - Fixed bug where html5lib wasn't being properly skipped (:issue:`4265`)
 
 See the :ref:`full release notes
 <release>` or issue tracker

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()
@@ -75,7 +77,7 @@ def assert_framelist_equal(list1, list2, *args, **kwargs):
 
 
 def test_bs4_version_fails():
-    _skip_if_no('bs4')
+    _skip_if_none_of(('bs4', 'html5lib'))
     import bs4
     if bs4.__version__ == LooseVersion('4.2.0'):
         assert_raises(AssertionError, read_html, os.path.join(DATA_PATH,

pandas/tslib.pyx

@@ -581,6 +581,10 @@ cdef inline bint is_timestamp(object o):
 
 cdef class _NaT(_Timestamp):
 
+    def __hash__(_NaT self):
+        # py3k needs this defined here
+        return hash(self.value)
+
     def __richcmp__(_NaT self, object other, int op):
         # if not isinstance(other, (_NaT, _Timestamp)):
         #     raise TypeError('Cannot compare %s with NaT' % type(other))