From ce626f0424017481b43e4e9650666297f824f8a8 Mon Sep 17 00:00:00 2001 From: Nat Wilson Date: Thu, 15 Sep 2016 18:25:57 -0700 Subject: [PATCH] remove namespace hook; use new names in tests --- karta/__init__.py | 3 --- tests/geotiff_tests.py | 16 ++++++++-------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/karta/__init__.py b/karta/__init__.py index 55f391e..913f993 100644 --- a/karta/__init__.py +++ b/karta/__init__.py @@ -3,9 +3,6 @@ geospatial data. """ -import pkgutil -__path__ = pkgutil.extend_path(__path__, __name__) - __all__ = ["vector", "raster", "crs", "tile", "errors"] from .version import __version__ diff --git a/tests/geotiff_tests.py b/tests/geotiff_tests.py index 8f2d7bd..82db853 100644 --- a/tests/geotiff_tests.py +++ b/tests/geotiff_tests.py @@ -29,8 +29,8 @@ def test_io(self): g = karta.RegularGrid([15.0, 15.0, 30.0, 30.0, 0.0, 0.0], v, crs=utm7) fpath = os.path.join(TMPDATA, "test.tif") - g.to_gtiff(fpath, compress=None) - gnew = karta.read_gtiff(fpath) + g.to_geotiff(fpath, compress=None) + gnew = karta.read_geotiff(fpath) self.assertTrue("+proj=utm" in gnew.crs.get_proj4()) self.assertTrue("+zone=7" in gnew.crs.get_proj4()) @@ -47,8 +47,8 @@ def test_io_virtual(self): g = karta.RegularGrid([15.0, 15.0, 30.0, 30.0, 0.0, 0.0], v, crs=utm7) fpath = os.path.join(TMPDATA, "test.tif") - g.to_gtiff(fpath, compress=None) - gnew = karta.read_gtiff(fpath, in_memory=False) + g.to_geotiff(fpath, compress=None) + gnew = karta.read_geotiff(fpath, in_memory=False) self.assertEqual(g.transform, gnew.transform) self.assertEqual(g.values.dtype, gnew.values.dtype) @@ -65,8 +65,8 @@ def test_write_compress(self): g = karta.RegularGrid([15.0, 15.0, 30.0, 30.0, 0.0, 0.0], v, crs=utm7) fpath = os.path.join(TMPDATA, "test.tif") - g.to_gtiff(fpath, compress="LZW") - g.to_gtiff(fpath, compress="PACKBITS") + g.to_geotiff(fpath, compress="LZW") + g.to_geotiff(fpath, compress="PACKBITS") return class GdalVirtualArrayTests(unittest.TestCase): @@ -78,8 +78,8 @@ def setUp(self): g = karta.RegularGrid([15.0, 15.0, 30.0, 30.0, 0.0, 0.0], v, crs=utm7) fpath = os.path.join(TMPDATA, "test.tif") - g.to_gtiff(fpath, compress=None) - self.grid = karta.read_gtiff(fpath, in_memory=False) + g.to_geotiff(fpath, compress=None) + self.grid = karta.read_geotiff(fpath, in_memory=False) def test_slicing_virtual(self): self.grid[5:10, 7:15]