Restore CI after PY2 drop

ci/azure/posix.yml

@@ -15,6 +15,18 @@ jobs:
           PATTERN: "not slow and not network"
 
       ${{ if eq(parameters.name, 'Linux') }}:
+        py35_compat:
+          ENV_FILE: ci/deps/azure-35-compat.yaml
+          CONDA_PY: "35"
+          PATTERN: "not slow and not network"
+
+        py36_locale_slow_old_np:
+          ENV_FILE: ci/deps/azure-36-locale.yaml
+          CONDA_PY: "36"
+          PATTERN: "slow"
+          LOCALE_OVERRIDE: "zh_CN.UTF-8"
+          EXTRA_APT: "language-pack-zh-hans"
+
         py36_locale_slow:
           ENV_FILE: ci/deps/azure-36-locale_slow.yaml
           CONDA_PY: "36"

ci/azure/windows.yml

@@ -12,6 +12,10 @@ jobs:
         ENV_FILE: ci/deps/azure-windows-36.yaml
         CONDA_PY: "36"
 
+      py37_np141:
+        ENV_FILE: ci/deps/azure-windows-37.yaml
+        CONDA_PY: "37"
+
   steps:
     - task: CondaEnvironment@1
       inputs:

ci/deps/azure-35-compat.yaml

@@ -0,0 +1,29 @@
+name: pandas-dev
+channels:
+  - defaults
+  - conda-forge
+dependencies:
+  - beautifulsoup4==4.4.1
+  - bottleneck=1.2.0
+  - cython=0.28.2
+  - hypothesis>=3.58.0
+  - jinja2=2.8
+  - numexpr=2.6.1
+  - numpy=1.12.0
+  - openpyxl=2.2.6
+  - pytables=3.4.2
+  - python-dateutil=2.5.0
+  - python=3.5*
+  - pytz=2015.4
+  - scipy=0.18.1
+  - xlrd=1.0.0
+  - xlsxwriter=0.7.7
+  - xlwt=1.0.0
+  # universal
+  - pytest-xdist
+  - pytest-mock
+  - isort
+  - pip:
+    # for python 3.5, pytest>=4.0.2 is not available in conda
+    - pytest>=4.0.2
+    - html5lib==1.0b2

ci/deps/azure-36-locale.yaml

@@ -0,0 +1,29 @@
+name: pandas-dev
+channels:
+  - defaults
+  - conda-forge
+dependencies:
+  - beautifulsoup4==4.5.1
+  - bottleneck=1.2.0
+  - cython=0.28.2
+  - lxml
+  - matplotlib=2.0.0
+  - numpy=1.12.0
+  - openpyxl=2.4.0
+  - python-dateutil
+  - python-blosc
+  - python=3.6
+  - pytz=2016.10
+  - scipy
+  - sqlalchemy=1.1.4
+  - xlrd=1.0.0
+  - xlsxwriter=0.9.4
+  - xlwt=1.2.0
+  # universal
+  - pytest>=4.0.2
+  - pytest-xdist
+  - pytest-mock
+  - hypothesis>=3.58.0
+  - isort
+  - pip:
+    - html5lib==1.0b2

ci/deps/azure-windows-37.yaml

@@ -0,0 +1,33 @@
+name: pandas-dev
+channels:
+  - defaults
+  - conda-forge
+dependencies:
+  - beautifulsoup4
+  - bottleneck
+  - gcsfs
+  - html5lib
+  - jinja2
+  - lxml
+  - matplotlib=3.0.1
+  - numexpr
+  - numpy=1.14.*
+  - openpyxl
+  - pytables
+  - python=3.7.*
+  - python-dateutil
+  - pytz
+  - s3fs
+  - scipy
+  - sqlalchemy
+  - xlrd
+  - xlsxwriter
+  - xlwt
+  # universal
+  - cython>=0.28.2
+  - pytest>=4.0.2
+  - pytest-xdist
+  - pytest-mock
+  - moto
+  - hypothesis>=3.58.0
+  - isort

pandas/tests/io/test_excel.py

@@ -2182,6 +2182,8 @@ def test_write_cells_merge_styled(self, merge_cells, ext, engine):
             assert xcell_b1.font == openpyxl_sty_merged
             assert xcell_a2.font == openpyxl_sty_merged
 
+    @pytest.mark.xfail(not PY36, reason='only fails on Linux',
+                       strict=False)
     @pytest.mark.parametrize("mode,expected", [
         ('w', ['baz']), ('a', ['foo', 'bar', 'baz'])])
     def test_write_append_mode(self, merge_cells, ext, engine, mode, expected):

pandas/tests/test_algos.py

@@ -11,8 +11,9 @@
 
 from pandas._libs import (
     algos as libalgos, groupby as libgroupby, hashtable as ht)
-from pandas.compat import PY2, lrange, range
-from pandas.compat.numpy import np_array_datetime64_compat
+from pandas.compat import lrange, range
+from pandas.compat.numpy import (
+    _np_version_under1p14, np_array_datetime64_compat)
 import pandas.util._test_decorators as td
 
 from pandas.core.dtypes.dtypes import CategoricalDtype as CDT
@@ -224,14 +225,15 @@ def test_factorize_tuple_list(self, data, expected_label, expected_level):
                                                      dtype=object)
         tm.assert_numpy_array_equal(result[1], expected_level_array)
 
-    @pytest.mark.skipif(PY2, reason="pytest.raises match regex fails")
     def test_complex_sorting(self):
         # gh 12666 - check no segfault
         x17 = np.array([complex(i) for i in range(17)], dtype=object)
 
-        msg = (r"'(<|>)' not supported between instances of 'complex' and"
-               r" 'complex'|"
-               r"unorderable types: complex\(\) > complex\(\)")
+        msg = (r"unorderable types: {0} [<>] {0}".format(r"complex\(\)")
+               if _np_version_under1p14 else
+               r"'[<>]' not supported between instances of {0} and {0}".format(
+                   "'complex'")
+               )
         with pytest.raises(TypeError, match=msg):
             algos.factorize(x17[::-1], sort=True)
 

pandas/tests/test_sorting.py

@@ -7,7 +7,7 @@
 from numpy import nan
 import pytest
 
-from pandas.compat import PY2
+from pandas.compat.numpy import _np_version_under1p14
 
 from pandas import (
     DataFrame, MultiIndex, Series, compat, concat, merge, to_datetime)
@@ -413,14 +413,16 @@ def test_mixed_integer_from_list(self):
         expected = np.array([0, 0, 1, 'a', 'b', 'b'], dtype=object)
         tm.assert_numpy_array_equal(result, expected)
 
-    @pytest.mark.skipif(PY2, reason="pytest.raises match regex fails")
     def test_unsortable(self):
         # GH 13714
         arr = np.array([1, 2, datetime.now(), 0, 3], dtype=object)
-        msg = (r"'(<|>)' not supported between instances of ('"
-               r"datetime\.datetime' and 'int'|'int' and 'datetime\.datetime"
-               r"')|"
-               r"unorderable types: int\(\) > datetime\.datetime\(\)")
+        msg = (r"unorderable types: ({0} [<>] {1}|{1} [<>] {0})".format(
+                   r"int\(\)", r"datetime\.datetime\(\)")  # noqa: E126
+               if _np_version_under1p14 else
+               (r"'[<>]' not supported between instances of "
+                r"({0} and {1}|{1} and {0})").format(
+                    "'int'", r"'datetime\.datetime'")
+               )
         if compat.PY2:
             # RuntimeWarning: tp_compare didn't return -1 or -2 for exception
             with warnings.catch_warnings():