remove namespace hook; use new names in tests

fortyninemaps · Sep 16, 2016 · ce626f0 · ce626f0
1 parent 616cd34
commit ce626f0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 11 deletions.
diff --git 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
@@ -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]