up_moto_optional

Gbp-Pq: Name up_moto_optional

diff --git a/pandas/tests/io/conftest.py b/pandas/tests/io/conftest.py
index 828d5d0ccd3c6ee93b6f04c8d67f98ca46907787..f0b8e14c562e8ada8b8a2114d1fb2edc2af58f4f 100644 (file)
--- a/pandas/tests/io/conftest.py
+++ b/pandas/tests/io/conftest.py
@@ -1,6 +1,10 @@
 import os
 
-import moto
+try:
+    import moto
+except ImportError:
+    from unittest import SkipTest
+    moto = None
 import pytest
 from pandas.io.parsers import read_table
 
@@ -42,6 +46,8 @@ def s3_resource(tips_file, jsonl_file):
     is yielded by the fixture.
     """
     pytest.importorskip('s3fs')
+    if not moto:
+        raise SkipTest("requires moto")
     moto.mock_s3().start()
 
     test_s3_files = [

diff --git a/pandas/tests/io/json/test_compression.py b/pandas/tests/io/json/test_compression.py
index e9976da6f67748b094bce25532a7a48fe1a51616..1310d4138753ae5cab1ca49530247ddcf5a742b4 100644 (file)
--- a/pandas/tests/io/json/test_compression.py
+++ b/pandas/tests/io/json/test_compression.py
@@ -1,5 +1,8 @@
 import pytest
-import moto
+try:
+    import moto
+except ImportError:
+    moto = None
 
 import pandas as pd
 from pandas import compat
@@ -69,6 +72,7 @@ def test_read_zipped_json():
     assert_frame_equal(uncompressed_df, compressed_df)
 
 
+@pytest.mark.skipif(not moto, reason="requires moto")
 @pytest.mark.parametrize('compression', COMPRESSION_TYPES)
 def test_with_s3_url(compression):
     boto3 = pytest.importorskip('boto3')

diff --git a/pandas/tests/io/test_excel.py b/pandas/tests/io/test_excel.py
index 7af8bd12ca805d2bbd1b9d0a6d364b0e5d32bc8f..806f4f807cb15a754f6a06dcdee18497ef8b5f41 100644 (file)
--- a/pandas/tests/io/test_excel.py
+++ b/pandas/tests/io/test_excel.py
@@ -12,7 +12,10 @@ from warnings import catch_warnings
 import numpy as np
 import pytest
 from numpy import nan
-import moto
+try:
+    import moto
+except ImportError:
+    moto = None
 
 import pandas as pd
 import pandas.util.testing as tm
@@ -615,6 +618,7 @@ class XlrdTests(ReadingTestsBase):
         local_table = self.get_exceldf('test1')
         tm.assert_frame_equal(url_table, local_table)
 
+    @pytest.mark.skipif(not moto, reason="requires moto")
     def test_read_from_s3_url(self):
         boto3 = pytest.importorskip('boto3')
         pytest.importorskip('s3fs')