fix pandas testing imports

Author: phobson

pygridtools/tests/test_core.py

@@ -11,7 +11,7 @@
 
 import pytest
 import numpy.testing as nptest
-import pandas.util.testing as pdtest
+import pandas.testing as pdtest
 
 from pygridtools import core
 from pygridgen.tests import raises

pygridtools/tests/test_gefdc.py

@@ -9,7 +9,7 @@
 
 import pytest
 import numpy.testing as nptest
-import pandas.util.testing as pdtest
+import pandas.testing as pdtest
 
 from pygridtools import gefdc
 from . import utils

pygridtools/tests/test_iotools.py

@@ -10,7 +10,7 @@
 
 import pytest
 import numpy.testing as nptest
-import pandas.util.testing as pdtest
+import pandas.testing as pdtest
 
 try:
     import ipywidgets

pygridtools/tests/utils.py

@@ -1,7 +1,3 @@
-from pkg_resources import resource_filename
-from contextlib import contextmanager
-from functools import wraps
-from pathlib import Path
 import filecmp
 
 
@@ -10,15 +6,13 @@
 except ImportError:
     pytest = None
 
-import numpy.testing as nptest
-import pandas.util.testing as pdtest
+
+import pandas.testing as pdtest
 
 import geopandas
 
 
 def assert_textfiles_equal(baselinefile, outputfile):
-    expectedtext = Path(baselinefile).open('r').read()
-    resulttext = Path(outputfile).open('r').read()
     assert filecmp.cmp(baselinefile, outputfile)