CI: update tests for dateutil >= 2.7.0

closes #18332

Author: jreback

ci/requirements-3.6_NUMPY_DEV.build.sh

@@ -12,8 +12,7 @@ PRE_WHEELS="https://7933911d6844c6c53a7d-47bd50c35cd79bd838daf386af554a83.ssl.cf
 pip install --pre --upgrade --timeout=60 -f $PRE_WHEELS numpy scipy
 
 # install dateutil from master
-# pip install -U git+git://github.com/dateutil/dateutil.git
-pip install dateutil
+pip install -U git+git://github.com/dateutil/dateutil.git
 
 # cython via pip
 pip install cython

pandas/conftest.py

@@ -1,9 +1,7 @@
 import pytest
 
-from distutils.version import LooseVersion
 import numpy
 import pandas
-import dateutil
 import pandas.util._test_decorators as td
 
 
@@ -68,14 +66,6 @@ def ip():
     return InteractiveShell()
 
 
-is_dateutil_le_261 = pytest.mark.skipif(
-    LooseVersion(dateutil.__version__) > LooseVersion('2.6.1'),
-    reason="dateutil api change version")
-is_dateutil_gt_261 = pytest.mark.skipif(
-    LooseVersion(dateutil.__version__) <= LooseVersion('2.6.1'),
-    reason="dateutil stable version")
-
-
 @pytest.fixture(params=[None, 'gzip', 'bz2', 'zip',
                         pytest.param('xz', marks=td.skip_if_no_lzma)])
 def compression(request):

pandas/tests/indexes/datetimes/test_tools.py

@@ -12,7 +12,6 @@
 from distutils.version import LooseVersion
 
 import pandas as pd
-from pandas.conftest import is_dateutil_le_261, is_dateutil_gt_261
 from pandas._libs import tslib
 from pandas._libs.tslibs import parsing
 from pandas.core.tools import datetimes as tools
@@ -1058,7 +1057,7 @@ def test_dayfirst(self, cache):
 class TestGuessDatetimeFormat(object):
 
     @td.skip_if_not_us_locale
-    @is_dateutil_le_261
+    @td.skip_if_dateutil_le_261
     def test_guess_datetime_format_for_array(self):
         expected_format = '%Y-%m-%d %H:%M:%S.%f'
         dt_string = datetime(2011, 12, 30, 0, 0, 0).strftime(expected_format)
@@ -1079,7 +1078,7 @@ def test_guess_datetime_format_for_array(self):
         assert format_for_string_of_nans is None
 
     @td.skip_if_not_us_locale
-    @is_dateutil_gt_261
+    @td.skip_if_dateutil_gt_261
     def test_guess_datetime_format_for_array_gt_261(self):
         expected_format = '%Y-%m-%d %H:%M:%S.%f'
         dt_string = datetime(2011, 12, 30, 0, 0, 0).strftime(expected_format)

pandas/tests/tslibs/test_parsing.py

@@ -8,7 +8,6 @@
 from dateutil.parser import parse
 
 import pandas.util._test_decorators as td
-from pandas.conftest import is_dateutil_le_261, is_dateutil_gt_261
 from pandas import compat
 from pandas.util import testing as tm
 from pandas._libs.tslibs import parsing
@@ -96,7 +95,7 @@ def test_parsers_monthfreq(self):
 class TestGuessDatetimeFormat(object):
 
     @td.skip_if_not_us_locale
-    @is_dateutil_le_261
+    @td.skip_if_dateutil_le_261
     @pytest.mark.parametrize(
         "string, format",
         [
@@ -113,7 +112,7 @@ def test_guess_datetime_format_with_parseable_formats(
         assert result == format
 
     @td.skip_if_not_us_locale
-    @is_dateutil_gt_261
+    @td.skip_if_dateutil_gt_261
     @pytest.mark.parametrize(
         "string",
         ['20111230', '2011-12-30', '30-12-2011',
@@ -124,7 +123,7 @@ def test_guess_datetime_format_with_parseable_formats_gt_261(
         result = parsing._guess_datetime_format(string)
         assert result is None
 
-    @is_dateutil_le_261
+    @td.skip_if_dateutil_le_261
     @pytest.mark.parametrize(
         "dayfirst, expected",
         [
@@ -136,17 +135,22 @@ def test_guess_datetime_format_with_dayfirst(self, dayfirst, expected):
             ambiguous_string, dayfirst=dayfirst)
         assert result == expected
 
-    @is_dateutil_gt_261
-    @pytest.mark.parametrize(
-        "dayfirst", [True, False])
-    def test_guess_datetime_format_with_dayfirst_gt_261(self, dayfirst):
+    @td.skip_if_dateutil_gt_261
+    def test_guess_datetime_format_with_dayfirst_gt_261(self):
         ambiguous_string = '01/01/2011'
         result = parsing._guess_datetime_format(
-            ambiguous_string, dayfirst=dayfirst)
-        assert result is None
+            ambiguous_string, dayfirst=True)
+        assert result == '%d/%m/%Y'
+
+    @td.skip_if_dateutil_gt_261
+    def test_guess_datetime_format_no_dayfirst_gt_261(self):
+        ambiguous_string = '01/01/2011'
+        result = parsing._guess_datetime_format(
+            ambiguous_string, dayfirst=False)
+        assert result == '%m/%d/%Y'
 
     @td.skip_if_has_locale
-    @is_dateutil_le_261
+    @td.skip_if_dateutil_le_261
     @pytest.mark.parametrize(
         "string, format",
         [
@@ -158,19 +162,6 @@ def test_guess_datetime_format_with_locale_specific_formats(
         result = parsing._guess_datetime_format(string)
         assert result == format
 
-    @td.skip_if_has_locale
-    @is_dateutil_gt_261
-    @pytest.mark.parametrize(
-        "string",
-        [
-            '30/Dec/2011',
-            '30/December/2011',
-            '30/Dec/2011 00:00:00'])
-    def test_guess_datetime_format_with_locale_specific_formats_gt_261(
-            self, string):
-        result = parsing._guess_datetime_format(string)
-        assert result is None
-
     def test_guess_datetime_format_invalid_inputs(self):
         # A datetime string must include a year, month and a day for it
         # to be guessable, in addition to being a string that looks like
@@ -189,7 +180,7 @@ def test_guess_datetime_format_invalid_inputs(self):
         for invalid_dt in invalid_dts:
             assert parsing._guess_datetime_format(invalid_dt) is None
 
-    @is_dateutil_le_261
+    @td.skip_if_dateutil_le_261
     @pytest.mark.parametrize(
         "string, format",
         [
@@ -204,21 +195,6 @@ def test_guess_datetime_format_nopadding(self, string, format):
         result = parsing._guess_datetime_format(string)
         assert result == format
 
-    @is_dateutil_gt_261
-    @pytest.mark.parametrize(
-        "string",
-        [
-            '2011-1-1',
-            '30-1-2011',
-            '1/1/2011',
-            '2011-1-1 00:00:00',
-            '2011-1-1 0:0:0',
-            '2011-1-3T00:00:0'])
-    def test_guess_datetime_format_nopadding_gt_261(self, string):
-        # GH 11142
-        result = parsing._guess_datetime_format(string)
-        assert result is None
-
 
 class TestArrayToDatetime(object):
     def test_try_parse_dates(self):

pandas/util/_test_decorators.py

@@ -27,6 +27,7 @@ def test_foo():
 import pytest
 import locale
 from distutils.version import LooseVersion
+import dateutil
 
 from pandas.compat import (is_platform_windows, is_platform_32bit, PY3,
                            import_lzma)
@@ -187,3 +188,9 @@ def decorated_func(func):
                                    "installed->{installed}".format(
                                        enabled=_USE_NUMEXPR,
                                        installed=_NUMEXPR_INSTALLED))
+skip_if_dateutil_le_261 = pytest.mark.skipif(
+    LooseVersion(dateutil.__version__) > LooseVersion('2.6.1'),
+    reason="dateutil api change version")
+skip_if_dateutil_gt_261 = pytest.mark.skipif(
+    LooseVersion(dateutil.__version__) <= LooseVersion('2.6.1'),
+    reason="dateutil stable version")