From 3a980f1311c7a8a388b66417e90cd5b16edb82f9 Mon Sep 17 00:00:00 2001 From: Joris Van den Bossche Date: Fri, 24 Nov 2017 11:15:55 +0100 Subject: [PATCH 1/2] Revert "TST: move melt tests to separate file (#18428)" This reverts commit e6eac0b308af9869ee123caa8c256bd8a7cc126b. From f5af11bdd8ebd0e1366d02fdf2467445377706ce Mon Sep 17 00:00:00 2001 From: Joris Van den Bossche Date: Fri, 24 Nov 2017 11:15:55 +0100 Subject: [PATCH 2/2] Revert "CI: temp skip geopandas downstream tests (GH18456) (#18457)" This reverts commit 5e670653e50dcbbafc0ba004b16328f49925f041. --- pandas/tests/test_downstream.py | 1 - 1 file changed, 1 deletion(-) diff --git a/pandas/tests/test_downstream.py b/pandas/tests/test_downstream.py index 1ec25bc8bb295..0f0abd8cd3400 100644 --- a/pandas/tests/test_downstream.py +++ b/pandas/tests/test_downstream.py @@ -92,7 +92,6 @@ def test_pandas_datareader(): pandas_datareader.get_data_google('AAPL') -@pytest.mark.skip(reason="import issue with fiona GH18456") def test_geopandas(): geopandas = import_module('geopandas') # noqa