From 64bdc116b300efd1a4ba015f0ef63d80476350cd Mon Sep 17 00:00:00 2001
From: swyoon <sangwoong24yoon@gmail.com>
Date: Tue, 15 Aug 2017 15:20:20 +0900
Subject: [PATCH] TST: pytest deprecation warnings GH17197

Test parameters with marks are updated according to the updated API of
Pytest.
https://docs.pytest.org/en/latest/changelog.html#pytest-3-2-0-2017-07-30
https://docs.pytest.org/en/latest/parametrize.html
---
 doc/source/contributing.rst            |  8 ++++++++
 pandas/tests/computation/test_eval.py  | 15 ++++++++-------
 pandas/tests/io/parser/test_network.py |  6 ++++--
 pandas/tests/io/test_excel.py          |  6 ++++--
 pandas/tests/io/test_parquet.py        | 12 ++++++++----
 pandas/tests/test_window.py            |  5 +++--
 6 files changed, 35 insertions(+), 17 deletions(-)

diff --git a/doc/source/contributing.rst b/doc/source/contributing.rst
index b44d0f36b86a1c..e46a55560230ed 100644
--- a/doc/source/contributing.rst
+++ b/doc/source/contributing.rst
@@ -598,6 +598,10 @@ Like many packages, *pandas* uses `pytest
 extensions in `numpy.testing
 <http://docs.scipy.org/doc/numpy/reference/routines.testing.html>`_.
 
+.. note::
+
+   The earliest supported pytest version is 3.1.0.
+
 Writing tests
 ~~~~~~~~~~~~~
 
@@ -709,6 +713,10 @@ A test run of this yields
 
 Tests that we have ``parametrized`` are now accessible via the test name, for example we could run these with ``-k int8`` to sub-select *only* those tests which match ``int8``.
 
+.. note::
+
+   When marking a parameter, ``pytest.param(, marks=...)`` should be used. Otherwise, it will raise ``RemovedInPytest4Warning``.
+   See `pytest documentation <https://docs.pytest.org/en/latest/parametrize.html>`_.
 
 .. code-block:: shell
 
diff --git a/pandas/tests/computation/test_eval.py b/pandas/tests/computation/test_eval.py
index 7fc091ebb18924..d2874b1606e729 100644
--- a/pandas/tests/computation/test_eval.py
+++ b/pandas/tests/computation/test_eval.py
@@ -38,13 +38,14 @@
 
 
 @pytest.fixture(params=(
-    pytest.mark.skipif(engine == 'numexpr' and not _USE_NUMEXPR,
-                       reason='numexpr enabled->{enabled}, '
-                              'installed->{installed}'.format(
-                                  enabled=_USE_NUMEXPR,
-                                  installed=_NUMEXPR_INSTALLED))(engine)
-                       for engine in _engines  # noqa
-))
+    pytest.param(engine,
+                 marks=pytest.mark.skipif(
+                     engine == 'numexpr' and not _USE_NUMEXPR,
+                     reason='numexpr enabled->{enabled}, '
+                            'installed->{installed}'.format(
+                                enabled=_USE_NUMEXPR,
+                                installed=_NUMEXPR_INSTALLED)))
+                 for engine in _engines))  # noqa
 def engine(request):
     return request.param
 
diff --git a/pandas/tests/io/parser/test_network.py b/pandas/tests/io/parser/test_network.py
index cfa60248605ade..3344243f8137af 100644
--- a/pandas/tests/io/parser/test_network.py
+++ b/pandas/tests/io/parser/test_network.py
@@ -23,8 +23,10 @@ def salaries_table():
 @pytest.mark.parametrize(
     "compression,extension",
     [('gzip', '.gz'), ('bz2', '.bz2'), ('zip', '.zip'),
-     pytest.mark.skipif(not tm._check_if_lzma(),
-                        reason='need backports.lzma to run')(('xz', '.xz'))])
+     pytest.param('xz', '.xz',
+                  marks=pytest.mark.skipif(not tm._check_if_lzma(),
+                                           reason='need backports.lzma '
+                                                  'to run'))])
 @pytest.mark.parametrize('mode', ['explicit', 'infer'])
 @pytest.mark.parametrize('engine', ['python', 'c'])
 def test_compressed_urls(salaries_table, compression, extension, mode, engine):
diff --git a/pandas/tests/io/test_excel.py b/pandas/tests/io/test_excel.py
index 856e8d6466526f..92147b46097b80 100644
--- a/pandas/tests/io/test_excel.py
+++ b/pandas/tests/io/test_excel.py
@@ -2400,8 +2400,10 @@ def check_called(func):
 
 
 @pytest.mark.parametrize('engine', [
-    pytest.mark.xfail('xlwt', reason='xlwt does not support '
-                                     'openpyxl-compatible style dicts'),
+    pytest.param('xlwt',
+                 marks=pytest.mark.xfail(reason='xlwt does not support '
+                                                'openpyxl-compatible '
+                                                'style dicts')),
     'xlsxwriter',
     'openpyxl',
 ])
diff --git a/pandas/tests/io/test_parquet.py b/pandas/tests/io/test_parquet.py
index ff0935c7dcc6f9..78c72e2a055669 100644
--- a/pandas/tests/io/test_parquet.py
+++ b/pandas/tests/io/test_parquet.py
@@ -26,10 +26,14 @@
 
 # setup engines & skips
 @pytest.fixture(params=[
-    pytest.mark.skipif(not _HAVE_FASTPARQUET,
-                       reason='fastparquet is not installed')('fastparquet'),
-    pytest.mark.skipif(not _HAVE_PYARROW,
-                       reason='pyarrow is not installed')('pyarrow')])
+    pytest.param('fastparquet',
+                 marks=pytest.mark.skipif(not _HAVE_FASTPARQUET,
+                                          reason='fastparquet is '
+                                                 'not installed')),
+    pytest.param('pyarrow',
+                 marks=pytest.mark.skipif(not _HAVE_PYARROW,
+                                          reason='pyarrow is '
+                                                 'not installed'))])
 def engine(request):
     return request.param
 
diff --git a/pandas/tests/test_window.py b/pandas/tests/test_window.py
index d94e34c41786b2..21a9b05d481262 100644
--- a/pandas/tests/test_window.py
+++ b/pandas/tests/test_window.py
@@ -530,8 +530,9 @@ def test_numpy_compat(self):
 
     @pytest.mark.parametrize(
         'expander',
-        [1, pytest.mark.xfail(
-            reason='GH 16425 expanding with offset not supported')('1s')])
+        [1, pytest.param('ls', marks=pytest.mark.xfail(
+                         reason='GH 16425 expanding with '
+                                'offset not supported'))])
     def test_empty_df_expanding(self, expander):
         # GH 15819 Verifies that datetime and integer expanding windows can be
         # applied to empty DataFrames