Skip to content

Removed old xarr and ipython decorators #18814

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 18, 2017
Merged

Removed old xarr and ipython decorators #18814

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion pandas/tests/generic/test_frame.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
assert_almost_equal)

import pandas.util.testing as tm
import pandas.util._test_decorators as td
from .test_generic import Generic

try:
Expand Down Expand Up @@ -218,8 +219,8 @@ def test_to_xarray_index_types(self, index):
assert_frame_equal(result.to_dataframe(), expected,
check_index_type=False, check_categorical=False)

@td.skip_if_no('xarray', min_version='0.7.0')
def test_to_xarray(self):
tm._skip_if_no_xarray()
from xarray import Dataset

df = DataFrame({'a': list('abc'),
Expand Down
7 changes: 3 additions & 4 deletions pandas/tests/generic/test_panel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,16 @@
assert_almost_equal)

import pandas.util.testing as tm
import pandas.util._test_decorators as td
from .test_generic import Generic


class TestPanel(Generic):
_typ = Panel
_comparator = lambda self, x, y: assert_panel_equal(x, y, by_blocks=True)

@td.skip_if_no('xarray', min_version='0.7.0')
def test_to_xarray(self):

tm._skip_if_no_xarray()
from xarray import DataArray

with catch_warnings(record=True):
Expand All @@ -44,9 +44,8 @@ class TestPanel4D(Generic):
def test_sample(self):
pytest.skip("sample on Panel4D")

@td.skip_if_no('xarray', min_version='0.7.0')
def test_to_xarray(self):

tm._skip_if_no_xarray()
from xarray import DataArray

with catch_warnings(record=True):
Expand Down
4 changes: 2 additions & 2 deletions pandas/tests/generic/test_series.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
assert_almost_equal)

import pandas.util.testing as tm
import pandas.util._test_decorators as td
from .test_generic import Generic

try:
Expand Down Expand Up @@ -200,9 +201,8 @@ def test_to_xarray_index_types(self, index):
check_index_type=False,
check_categorical=True)

@td.skip_if_no('xarray', min_version='0.7.0')
def test_to_xarray(self):

tm._skip_if_no_xarray()
from xarray import DataArray

s = Series([])
Expand Down
16 changes: 0 additions & 16 deletions pandas/util/testing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,17 +348,6 @@ def _skip_if_no_lzma():
return _check_if_lzma() or pytest.skip('need backports.lzma to run')


def _skip_if_no_xarray():
import pytest

xarray = pytest.importorskip("xarray")
v = xarray.__version__

if LooseVersion(v) < LooseVersion('0.7.0'):
import pytest
pytest.skip("xarray version is too low: {version}".format(version=v))


def skip_if_no_ne(engine='numexpr'):
from pandas.core.computation.expressions import (
_USE_NUMEXPR,
Expand All @@ -383,11 +372,6 @@ def _skip_if_no_mock():
import pytest
raise pytest.skip("mock is not installed")


def _skip_if_no_ipython():
import pytest
pytest.importorskip("IPython")

# -----------------------------------------------------------------------------
# locale utilities

Expand Down