vtool-ibeis 2.2.0__py3-none-any.whl → 2.3.0__py3-none-any.whl

vtool_ibeis/__init__.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 VTool - Computer vision tools
 
@@ -6,9 +5,7 @@ Autogenerate Command:
     mkinit vtool_ibeis -i
 """
 # flake8: noqa
-from __future__ import absolute_import, division, print_function
-
-__version__ = '2.2.0'
+__version__ = '2.3.0'
 __author__ = 'Jon Crall, Avi Weinstock, Chuck Stewart, Hendrik Weideman, Jason Parham, Zackary Rutfield'
 __author_email__ = 'erotemic@gmail.com'
 __url__ = 'https://github.com/Erotemic/vtool_ibeis'

vtool_ibeis/_rhomb_dist.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, print_function, unicode_literals
 import numpy as np
 import collections
 

vtool_ibeis/blend.py

@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-# LICENCE: Apache2
-from __future__ import absolute_import, division, print_function
-from six.moves import zip, map, range  # NOQA
 import numpy as np
 import utool as ut
 import ubelt as ub
@@ -9,7 +5,7 @@ import ubelt as ub
 
 def testdata_blend(scale=128):
     import vtool_ibeis as vt
-    img_fpath = ut.grab_test_imgpath('lena.png')
+    img_fpath = ut.grab_test_imgpath('astro')
     img1 = vt.imread(img_fpath)
     rng = np.random.RandomState(0)
     img2 = vt.perlin_noise(img1.shape[0:2], scale=scale, rng=rng)[None, :].T

vtool_ibeis/chip.py

@@ -1,5 +1,3 @@
-# LICENCE
-from __future__ import absolute_import, division, print_function
 import numpy as np
 import numpy.linalg as npl
 from vtool_ibeis import linalg as ltool
@@ -7,10 +5,9 @@ from vtool_ibeis import image as gtool
 import utool as ut
 try:
     import cv2
-except ImportError as ex:
+except ImportError:
     print('ERROR: import cv2 is failing!')
-    cv2 = ut.DynStruct()
-    cv2.INTER_LANCZOS4 = None
+    raise
 
 
 def get_image_to_chip_transform(bbox, chipsz, theta):

vtool_ibeis/clustering2.py

@@ -1,12 +1,8 @@
-# -*- coding: utf-8 -*-
-# LICENCE
 """
 TODO:
     Does HDBSCAN work on 128 dim vectors?
     http://nbviewer.jupyter.org/github/lmcinnes/hdbscan/blob/master/notebooks/Comparing%20Clustering%20Algorithms.ipynb
 """
-from __future__ import absolute_import, division, print_function, unicode_literals
-from six.moves import zip, map  # NOQA
 import ubelt as ub
 import numpy as np
 import utool as ut
@@ -171,7 +167,8 @@ def group_indices(idx2_groupid, assume_sorted=False):
         >>> (keys, groupxs) = group_indices(idx2_groupid)
         >>> result = ut.repr2((keys, groupxs), nl=2, nobr=True, with_dtype=True)
         >>> print(result)
-        np.array([False,  True], dtype=np.bool),
+
+        np.array([False,  True], dtype=bool),
         [
             np.array([2, 4, 5], dtype=np.int64),
             np.array([0, 1, 3, 6], dtype=np.int64),
@@ -293,10 +290,10 @@ def find_duplicate_items(item_arr):
     sortx = item_arr.argsort()
     groupids_sorted = item_arr.take(sortx)
 
-    #duplicate_idxs = np.flatnonzero(~np.diff(groupids_sorted).astype(np.bool))
+    #duplicate_idxs = np.flatnonzero(~np.diff(groupids_sorted).astype(bool))
     diff = np.diff(groupids_sorted)
-    #notdiff = np.bitwise_not(diff.astype(np.bool))
-    edges = np.flatnonzero(diff.astype(np.bool)) + 1
+    #notdiff = np.bitwise_not(diff.astype(bool))
+    edges = np.flatnonzero(diff.astype(bool)) + 1
     duplicate_items = [group[0] for group in np.split(groupids_sorted, edges)
                        if group.shape[0] > 1]
     #duplicate_items = groupids_sorted.take(duplicate_idxs)

vtool_ibeis/confusion.py

@@ -1,11 +1,9 @@
-# -*- coding: utf-8 -*-
 """
 Module for -- Confusion matrix, contingency, error matrix,
 
 References:
     http://en.wikipedia.org/wiki/Confusion_matrix
 """
-from __future__ import absolute_import, division, print_function
 import utool as ut
 import ubelt as ub
 import numpy as np
@@ -373,7 +371,7 @@ class ConfusionMetrics(ub.NiceRepr):
         scores = np.asarray(scores)
         labels = np.asarray(labels)
         # must be binary
-        labels = labels.astype(np.bool)
+        labels = labels.astype(bool)
         if verbose:
             print('[confusion] building confusion metrics.')
             print('[confusion]  * scores.shape=%r, scores.dtype=%r' %
@@ -499,7 +497,7 @@ class ConfusionMetrics(ub.NiceRepr):
             python -m vtool_ibeis.confusion --exec-interact_roc_factory --show
 
         Example:
-            >>> # DISABLE_DOCTEST
+            >>> # xdoctest: +SKIP
             >>> from vtool_ibeis.confusion import *  # NOQA
             >>> scores, labels = testdata_scores_labels()
             >>> self = ConfusionMetrics().fit(scores, labels)
@@ -798,15 +796,15 @@ def interpolate_replbounds(xdata, ydata, pt, maximize=True):
         >>> print('thresh = %r' % (thresh,))
 
     Example:
-        >>> # DISABLE_DOCTEST
+        >>> # xdoctest: +SKIP
         >>> from vtool_ibeis.confusion import *  # NOQA
         >>> xdata = np.array([0.7,  0.8,  0.8,  0.9,  0.9, 0.9])
         >>> ydata = np.array([34,    26,   23,   22,   19,  17])
         >>> pt = np.array([.85, 1.0, -1.0])
         >>> interp_vals = interpolate_replbounds(xdata, ydata, pt)
         >>> result = ('interp_vals = %s' % (str(interp_vals),))
+        >>> assert np.allclose(results, [ 22.5,  17.,   34., ])
         >>> print(result)
-        interp_vals = [ 22.5  17.   34. ]
     """
     if not ut.issorted(xdata):
         if ut.issorted(xdata[::-1]):
@@ -939,7 +937,7 @@ def interact_roc_factory(confusions, target_tpr=None, show_operating_point=False
         python -m vtool_ibeis.confusion --exec-interact_roc_factory --show
 
     Example:
-        >>> # DISABLE_DOCTEST
+        >>> # xdoctest: +SKIP
         >>> from vtool_ibeis.confusion import *  # NOQA
         >>> scores, labels = testdata_scores_labels()
         >>> print('scores = %r' % (scores,))
@@ -1026,7 +1024,7 @@ def draw_roc_curve(fpr, tpr, fnum=None, pnum=None, marker='', target_tpr=None,
         python -m vtool_ibeis.confusion --exec-draw_roc_curve --show --lightbg
 
     Example:
-        >>> # DISABLE_DOCTEST
+        >>> # xdoctest: +SKIP
         >>> from vtool_ibeis.confusion import *  # NOQA
         >>> scores, labels = testdata_scores_labels()
         >>> confusions = ConfusionMetrics().fit(scores, labels)

vtool_ibeis/coverage_grid.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, print_function, unicode_literals
-from six.moves import zip, range, map  # NOQA
 import numpy as np
 import utool as ut
 import ubelt as ub
@@ -37,7 +34,7 @@ def make_grid_coverage_mask(kpts, chipsize, weights, pxl_per_bin=4,
         >>> from vtool_ibeis.coverage_grid import *  # NOQA
         >>> import vtool_ibeis as vt
         >>> # build test data
-        >>> kpts, chipsize, weights = coverage_kpts.testdata_coverage('easy1.png')
+        >>> kpts, chipsize, weights = coverage_kpts.testdata_coverage('tsukuba_l')
         >>> pxl_per_bin = 4
         >>> grid_steps = 2
         >>> # execute function
@@ -326,7 +323,7 @@ def gridsearch_coverage_grid_mask():
     """
     import plottool_ibeis as pt
     cfgdict_list, cfglbl_list = get_coverage_grid_gridsearch_configs()
-    kpts, chipsize, weights = coverage_kpts.testdata_coverage('easy1.png')
+    kpts, chipsize, weights = coverage_kpts.testdata_coverage('astro')
     gridmask_list = [
         255 *  make_grid_coverage_mask(kpts, chipsize, weights, **cfgdict)
         for cfgdict in ub.ProgIter(cfgdict_list, desc='coverage grid')

vtool_ibeis/coverage_kpts.py

@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, print_function, unicode_literals
-from six.moves import zip, range, map, reduce  # NOQA
+from functools import reduce
 import cv2
 import numpy as np
 import utool as ut
@@ -39,7 +37,7 @@ def make_kpts_heatmask(kpts, chipsize, cmap='plasma'):
         >>> from vtool_ibeis.coverage_kpts import *  # NOQA
         >>> import vtool_ibeis as vt
         >>> import pyhesaff
-        >>> img_fpath = ut.grab_test_imgpath('carl.jpg')
+        >>> img_fpath = ut.grab_test_imgpath('carl')
         >>> (kpts, vecs) = pyhesaff.detect_feats(img_fpath)
         >>> chip = vt.imread(img_fpath)
         >>> kpts = kpts[0:100]
@@ -131,7 +129,7 @@ def make_kpts_coverage_mask(
         >>> import vtool_ibeis as vt
         >>> import plottool_ibeis as pt
         >>> import pyhesaff
-        >>> img_fpath = ut.grab_test_imgpath('carl.jpg')
+        >>> img_fpath = ut.grab_test_imgpath('carl')
         >>> (kpts, vecs) = pyhesaff.detect_feats(img_fpath)
         >>> kpts = kpts[::10]
         >>> chip = vt.imread(img_fpath)
@@ -212,7 +210,7 @@ def warp_patch_onto_kpts(
         >>> from vtool_ibeis.coverage_kpts import *  # NOQA
         >>> import vtool_ibeis as vt
         >>> import pyhesaff
-        >>> img_fpath    = ut.grab_test_imgpath('carl.jpg')
+        >>> img_fpath    = ut.grab_test_imgpath('carl')
         >>> (kpts, vecs) = pyhesaff.detect_feats(img_fpath)
         >>> kpts = kpts[::15]
         >>> chip = vt.imread(img_fpath)
@@ -436,7 +434,8 @@ def gridsearch_kpts_coverage_mask():
     """
     import plottool_ibeis as pt
     cfgdict_list, cfglbl_list = get_coverage_kpts_gridsearch_configs()
-    kpts, chipsize, weights = testdata_coverage('easy1.png')
+    # kpts, chipsize, weights = testdata_coverage('easy1.png')
+    kpts, chipsize, weights = testdata_coverage('astro')
     imgmask_list = [
         255 *  make_kpts_coverage_mask(kpts, chipsize, weights,
                                        return_patch=False, **cfgdict)
@@ -461,18 +460,18 @@ def testdata_coverage(fname=None):
     # build test data
     kpts, vecs = vt.demodata.get_testdata_kpts(fname, with_vecs=True)
     # HACK IN DISTINCTIVENESS
-    if fname is not None:
-        from ibeis.algo.hots import distinctiveness_normalizer
-        cachedir = ub.ensure_app_cache_dir('ibeis', 'distinctiveness_model')
-        species = 'zebra_plains'
-        dstcnvs_normer = distinctiveness_normalizer.DistinctivnessNormalizer(species, cachedir=cachedir)
-        dstcnvs_normer.load(cachedir)
-        weights = dstcnvs_normer.get_distinctiveness(vecs)
-    else:
-        kpts = np.vstack((kpts, [0, 0, 1, 1, 1, 0]))
-        kpts = np.vstack((kpts, [0.01, 10, 1, 1, 1, 0]))
-        kpts = np.vstack((kpts, [0.94, 11.5, 1, 1, 1, 0]))
-        weights = np.ones(len(kpts))
+    # if fname is not None:
+    #     from ibeis.algo.hots import distinctiveness_normalizer
+    #     cachedir = ub.ensure_app_cache_dir('ibeis', 'distinctiveness_model')
+    #     species = 'zebra_plains'
+    #     dstcnvs_normer = distinctiveness_normalizer.DistinctivnessNormalizer(species, cachedir=cachedir)
+    #     dstcnvs_normer.load(cachedir)
+    #     weights = dstcnvs_normer.get_distinctiveness(vecs)
+    # else:
+    kpts = np.vstack((kpts, [0, 0, 1, 1, 1, 0]))
+    kpts = np.vstack((kpts, [0.01, 10, 1, 1, 1, 0]))
+    kpts = np.vstack((kpts, [0.94, 11.5, 1, 1, 1, 0]))
+    weights = np.ones(len(kpts))
     chipsize = tuple(vt.iceil(vt.get_kpts_image_extent(kpts)[2:4]).tolist())
     return kpts, chipsize, weights
 

vtool_ibeis/demodata.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, print_function, unicode_literals
 from vtool_ibeis import keypoint as ktool
 import vtool_ibeis.util_math as mtool
 import numpy as np
@@ -314,7 +312,7 @@ def testdata_binary_scores():
         -0.6 , 5.76,  -0.79,  13.99,   9.82,  30.6 ,  -1.13,  -2.05,  21.3 ,
         -1.87,  17.61, -1.25,   8.64,  -2.06,   4.48,  19.48,  -0.64, 15.85,
         4.54,  -1.57,  -1.28, 12.3 ,  -1.39,  -0.04,  12.81, -0.09,   4.83,
-        6.42,   4.26,   7.65,  -0.43, -0.23,  -1.98], dtype=np.float)
+        6.42,   4.26,   7.65,  -0.43, -0.23,  -1.98], dtype=float)
 
     y = np.array([
         1, 1, 1, 1, 0, 1, 0, 1, 0, 0, 1, 0, 1, 0, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1,
@@ -358,7 +356,7 @@ def testdata_binary_scores():
         1, 1, 1, 1, 0, 0, 1, 0, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 0,
         0, 1, 0, 0, 1, 1, 1, 0, 1, 1, 0, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 1, 0, 0,
         0, 0, 1, 1, 1, 0, 0, 1, 0, 1, 0, 0, 0, 1, 1, 0, 1, 0, 1, 0, 1, 1, 0, 1,
-        0, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1], dtype=np.bool)
+        0, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1], dtype=bool)
     return X, y
 
 
@@ -635,7 +633,7 @@ def get_testdata_kpts(fname=None, with_vecs=False):
         return kpts
 
 
-def testdata_ratio_matches(fname1='easy1.png', fname2='easy2.png', **kwargs):
+def testdata_ratio_matches(fname1='tsukuba_r', fname2='tsukuba_l', **kwargs):
     r"""
     Runs simple ratio-test matching between two images.
     Technically this is not demodata data.
@@ -661,8 +659,8 @@ def testdata_ratio_matches(fname1='easy1.png', fname2='easy2.png', **kwargs):
         >>> # xdoctest: +REQUIRES(module:pyhesaff)
         >>> from vtool_ibeis.demodata import *  # NOQA
         >>> import vtool_ibeis as vt
-        >>> fname1 = ut.get_argval('--fname1', type_=str, default='easy1.png')
-        >>> fname2 = ut.get_argval('--fname2', type_=str, default='easy2.png')
+        >>> fname1 = ut.get_argval('--fname1', type_=str, default='tsukuba_l')
+        >>> fname2 = ut.get_argval('--fname2', type_=str, default='tsukuba_r')
         >>> default_dict = vt.get_extract_features_default_params()
         >>> default_dict['ratio_thresh'] = .625
         >>> kwargs = ut.argparse_dict(default_dict)

vtool_ibeis/distance.py

@@ -1,10 +1,6 @@
-# -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, print_function, unicode_literals
 import numpy as np
-import utool as ut
 import ubelt as ub
 import itertools
-from six.moves import range, zip
 from collections import OrderedDict
 import scipy.spatial.distance as spdist
 from .util_math import TAU
@@ -129,8 +125,8 @@ def ori_distance(ori1, ori2, out=None):
                 func_orig()
                 '''
         >>> ).split('\n')
-        >>> ut.util_dev.rrr()
-        >>> ut.util_dev.timeit_compare(stmt_list, setup, int(1E3))
+        >>> # ut.util_dev.rrr()
+        >>> # ut.util_dev.timeit_compare(stmt_list, setup, int(1E3))
 
     CommandLine:
         python -m vtool_ibeis.distance --test-ori_distance
@@ -258,7 +254,7 @@ def L2_sqrd(hist1, hist2, dtype=TEMP_VEC_DTYPE):
         >>> # ENABLE_DOCTEST
         >>> from vtool_ibeis.distance import *  # NOQA
         >>> import numpy
-        >>> ut.exec_funckw(L2_sqrd, globals())
+        >>> #ut.exec_funckw(L2_sqrd, globals())
         >>> rng = np.random.RandomState(53)
         >>> hist1 = rng.rand(5, 2)
         >>> hist2 = rng.rand(5, 2)
@@ -622,10 +618,10 @@ def emd(hist1, hist2, cost_matrix='sift'):
 
     if len(hist1.shape) == 2:
         dist = np.array([
-            pyemd.emd(hist1_.astype(np.float), hist2_.astype(np.float), cost_matrix)
+            pyemd.emd(hist1_.astype(float), hist2_.astype(float), cost_matrix)
             for hist1_, hist2_ in zip(hist1, hist2)])
     else:
-        dist = pyemd.emd(hist1.astype(np.float), hist2.astype(np.float), cost_matrix)
+        dist = pyemd.emd(hist1.astype(float), hist2.astype(float), cost_matrix)
     return dist
 
 
@@ -634,7 +630,6 @@ def nearest_point(x, y, pts, conflict_mode='next', __next_counter=[0]):
 
     TODO: depricate
     """
-    #with ut.embed_on_exception_context:
     dists = (pts.T[0] - x) ** 2 + (pts.T[1] - y) ** 2
     fx = dists.argmin()
     mindist = dists[fx]
@@ -713,7 +708,7 @@ def haversine(latlon1, latlon2):
         >>> dist_vector_list = list(map(haversin_pdist, gpsarr_track_list_))
         >>> dist_matrix_list = list(map(spdist.squareform, dist_vector_list))
         >>> #xdoctest: +IGNORE_WHITESPACE
-        >>> result = ('dist_matrix_list = %s' % (ut.repr3(dist_matrix_list, precision=2, with_dtype=True),))
+        >>> result = ('dist_matrix_list = %s' % (ub.repr2(dist_matrix_list, precision=2, with_dtype=True),))
         >>> print(result)
     """
     # FIXME; lat, lon should be different columns not different rows
@@ -787,10 +782,10 @@ def pdist_argsort(x):
         sortx_2d = [(r, c) for r, c in zip(sortx_row, sortx_col) if (c > r)]
     else:
         num_rows = len(x) // 2
-        compare_idxs = ut.flatten([[(r, c)  for c in range(r + 1, num_rows)]
-                                   for r in range(num_rows)])
+        compare_idxs = list(ub.flatten([[(r, c)  for c in range(r + 1, num_rows)]
+                                        for r in range(num_rows)]))
         sortx = x.argsort()
-        sortx_2d = ut.take(compare_idxs, sortx)
+        sortx_2d = list(ub.take(compare_idxs, sortx))
     return sortx_2d
 
 

vtool_ibeis/ellipse.py

@@ -3,20 +3,17 @@ OLD MODULE, needs reimplemenetation of select features and deprication
 
 This module should handle all things elliptical
 """
-from __future__ import absolute_import, division, print_function
-from six.moves import zip, range
 # from numpy.core.umath_tests import matrix_multiply
 import operator as op
 import scipy.signal as spsignal
 import numpy as np
 from vtool_ibeis import keypoint as ktool
 from vtool_ibeis import image as gtool
-import utool as ut
 try:
     import cv2
 except ImportError:
     print('ERROR: import cv2 is failing!')
-    cv2 = ut.DynStruct()
+    cv2 = object()
 
 
 def adaptive_scale(img_fpath, kpts, nScales=4, low=-.5, high=.5, nSamples=16):
@@ -60,7 +57,7 @@ def check_kpts_in_bounds(kpts_, width, height):
     minx = np.array([pts[0].min() for pts in bbox_pts]) > 0
     maxy = np.array([pts[1].max() for pts in bbox_pts]) < height
     miny = np.array([pts[1].min() for pts in bbox_pts]) > 0
-    isvalid = np.array(maxx * minx * maxy * miny, dtype=np.bool)
+    isvalid = np.array(maxx * minx * maxy * miny, dtype=bool)
     return isvalid
 
 

vtool_ibeis/exif.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-# LICENCE
 """
 References:
     http://www.exiv2.org/tags.html
@@ -7,9 +5,6 @@ References:
 TODO:
     https://github.com/recurser/exif-orientation-examples
 """
-from __future__ import absolute_import, division, print_function
-from six.moves import zip, range
-import six
 from PIL.ExifTags import TAGS, GPSTAGS
 import PIL.ExifTags  # NOQA
 from PIL import Image
@@ -20,8 +15,8 @@ from vtool_ibeis import image_shared
 
 
 # Inverse of PIL.ExifTags.TAGS
-EXIF_TAG_TO_TAGID = {val: key for (key, val) in six.iteritems(TAGS)}
-GPS_TAG_TO_GPSID  = {val: key for (key, val) in six.iteritems(GPSTAGS)}
+EXIF_TAG_TO_TAGID = {val: key for (key, val) in TAGS.items()}
+GPS_TAG_TO_GPSID  = {val: key for (key, val) in GPSTAGS.items()}
 
 # Relevant EXIF Tags
 #'GPSInfo': 34853
@@ -115,7 +110,7 @@ def get_exif_dict2(pil_img):
 
 def make_exif_dict_human_readable(exif_dict):
     exif_dict2 = {TAGS.get(key, key): val
-                  for (key, val) in six.iteritems(exif_dict)}
+                  for (key, val) in exif_dict.items()}
     return exif_dict2
 
 
@@ -123,7 +118,7 @@ def check_exif_keys(pil_img):
     info_ = pil_img._getexif()
     valid_keys = []
     invalid_keys = []
-    for key, val in six.iteritems(info_):
+    for key, val in info_.items():
         try:
             exif_keyval = TAGS[key]
             valid_keys.append((key, exif_keyval))
@@ -137,7 +132,7 @@ def read_all_exif_tags(pil_img):
     info_ = pil_img._getexif()
     exif = {} if info_ is None else {
         TAGS.get(key, key): val
-        for key, val in six.iteritems(info_)
+        for key, val in info_.items()
     }
     return exif
 

vtool_ibeis/features.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import absolute_import, print_function, division
 import utool as ut
 import ubelt as ub
 import six
@@ -43,7 +41,7 @@ def extract_features(img_or_fpath, feat_type='hesaff+sift', **kwargs):
         >>> from vtool_ibeis.features import *  # NOQA
         >>> import vtool_ibeis as vt
         >>> # build test data
-        >>> img_fpath = ut.grab_test_imgpath(ut.get_argval('--fname', default='lena.png'))
+        >>> img_fpath = ut.grab_test_imgpath(ut.get_argval('--fname', default='astro'))
         >>> imgBGR = vt.imread(img_fpath)
         >>> feat_type = ub.argval('--feat_type', default='hesaff+sift')
         >>> import pyhesaff
@@ -111,8 +109,7 @@ def detect_opencv_keypoints():
     import vtool_ibeis as vt
     import numpy as np  # NOQA
 
-    #img_fpath = ut.grab_test_imgpath(ub.argval('--fname', default='lena.png'))
-    img_fpath = ut.grab_test_imgpath(ub.argval('--fname', default='zebra.png'))
+    img_fpath = ut.grab_test_imgpath(ub.argval('--fname', default='astro'))
     imgBGR = vt.imread(img_fpath)
     imgGray = cv2.cvtColor(imgBGR, cv2.COLOR_BGR2GRAY)
 
@@ -253,7 +250,7 @@ def test_mser():
             info = {key: list(ub.compress(val, flags)) for key, val in self.info.items()}
             return Keypoints(subarr, info)
 
-    img_fpath = ut.grab_test_imgpath(ub.argval('--fname', default='zebra.png'))
+    img_fpath = ut.grab_test_imgpath(ub.argval('--fname', default='astro'))
     imgBGR = vt.imread(img_fpath)
     imgGray = cv2.cvtColor(imgBGR, cv2.COLOR_BGR2GRAY)
     # http://docs.opencv.org/master/d3/d28/classcv_1_1MSER.html#gsc.tab=0

vtool_ibeis/fontdemo.py

@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
 # Needs freetype-py>=1.0
 # The MIT License (MIT)
 #
@@ -27,7 +25,6 @@ References:
     https://dbader.org/blog/monochrome-font-rendering-with-freetype-and-python
     https://gist.github.com/dbader/5488053#file-fontdemo-py-L244
 """
-from __future__ import absolute_import, division, print_function, unicode_literals
 
 
 class Bitmap(object):

vtool_ibeis/geometry.py

@@ -1,10 +1,6 @@
-# -*- coding: utf-8 -*-
-# LICENCE
-from __future__ import absolute_import, division, print_function, unicode_literals
-from six.moves import zip
 import numpy as np
 import utool as ut
-import ubelt as ub
+import ubelt as ub  # NOQA
 import cv2
 
 
@@ -27,9 +23,6 @@ def verts_from_bbox(bbox, close=False):
     Returns:
         list: verts
 
-    CommandLine:
-        python -m vtool_ibeis.geometry --test-verts_from_bbox
-
     Example:
         >>> # ENABLE_DOCTEST
         >>> from vtool_ibeis.geometry import *  # NOQA
@@ -70,14 +63,11 @@ def draw_border(img_in, color=(0, 128, 255), thickness=2, out=None):
         thickness (int):
         out (None):
 
-    CommandLine:
-        python -m vtool_ibeis.geometry --test-draw_border --show
-
     Example:
         >>> # ENABLE_DOCTEST
         >>> from vtool_ibeis.geometry import *  # NOQA
         >>> import vtool_ibeis as vt
-        >>> img_in = vt.imread(ut.grab_test_imgpath('carl.jpg'))
+        >>> img_in = vt.imread(ut.grab_test_imgpath('carl'))
         >>> color = (0, 128, 255)
         >>> thickness = 20
         >>> out = None
@@ -125,7 +115,7 @@ def draw_verts(img_in, verts, color=(0, 128, 255), thickness=2, out=None):
         >>> import plottool_ibeis as pt
         >>> import vtool_ibeis as vt
         >>> # build test data
-        >>> img_in = vt.imread(ut.grab_test_imgpath('carl.jpg'))
+        >>> img_in = vt.imread(ut.grab_test_imgpath('carl'))
         >>> verts = ((10, 10), (10, 100), (100, 100), (100, 10))
         >>> color = (0, 128, 255)
         >>> thickness = 2
@@ -147,7 +137,7 @@ def draw_verts(img_in, verts, color=(0, 128, 255), thickness=2, out=None):
         >>> import plottool_ibeis as pt
         >>> import vtool_ibeis as vt
         >>> # build test data
-        >>> img_in = vt.imread(ut.grab_test_imgpath('carl.jpg'))
+        >>> img_in = vt.imread(ut.grab_test_imgpath('carl'))
         >>> verts = ((10, 10), (10, 100), (100, 100), (100, 10))
         >>> color = (0, 128, 255)
         >>> thickness = 2
@@ -205,7 +195,7 @@ def closest_point_on_line_segment(p, e1, e2):
         >>> # ENABLE_DOCTEST
         >>> from vtool_ibeis.geometry import *  # NOQA
         >>> import vtool_ibeis as vt
-        >>> #bbox = np.array([10, 10, 10, 10], dtype=np.float)
+        >>> #bbox = np.array([10, 10, 10, 10], dtype=float)
         >>> #verts_ = np.array(vt.verts_from_bbox(bbox, close=True))
         >>> #R = vt.rotation_around_bbox_mat3x3(vt.TAU / 3, bbox)
         >>> #verts = vt.transform_points_with_homography(R, verts_.T).T
@@ -325,8 +315,8 @@ def closest_point_on_bbox(p, bbox):
     Example1:
         >>> # ENABLE_DOCTEST
         >>> from vtool_ibeis.geometry import *  # NOQA
-        >>> p_list = np.array([[19, 7], [7, 14], [14, 11], [8, 7], [23, 21]], dtype=np.float)
-        >>> bbox = np.array([10, 10, 10, 10], dtype=np.float)
+        >>> p_list = np.array([[19, 7], [7, 14], [14, 11], [8, 7], [23, 21]], dtype=float)
+        >>> bbox = np.array([10, 10, 10, 10], dtype=float)
         >>> [closest_point_on_bbox(p, bbox) for p in p_list]
     """
     import vtool_ibeis as vt
@@ -557,7 +547,7 @@ def point_inside_bbox(point, bbox):
         >>> ]).T
         >>> bbox = (3, 2, 5, 7)
         >>> flag = point_inside_bbox(point, bbox)
-        >>> flag = flag.astype(np.int)
+        >>> flag = flag.astype(int)
         >>> result = ('flag = %s' % (ub.repr2(flag),))
         >>> print(result)
         >>> # xdoctest: +REQUIRES(--show)

vtool_ibeis/histogram.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, print_function, unicode_literals
-from six.moves import zip
 import warnings
 import scipy.signal
 import numpy as np
@@ -241,7 +238,7 @@ def argsubextrema2(op, ydata, xdata=None, thresh_factor=None, normalize_x=True,
 
     if thresh_factor is None:
         thresh_value = None
-        flags = np.ones(len(ydata), dtype=np.bool)
+        flags = np.ones(len(ydata), dtype=bool)
     else:
         # Find relative and flat extrema
         thresh_value = factor_op(abs_extreme_y, thresh_factor)
@@ -320,7 +317,7 @@ def argsubextrema2(op, ydata, xdata=None, thresh_factor=None, normalize_x=True,
 
     # Any non-flat mid extrema can be sublocalized
     other_argextrema = np.hstack([boundary_argextrema, flat_argextrema])
-    other_argextrema = other_argextrema.astype(np.int)
+    other_argextrema = other_argextrema.astype(int)
     other_subextrema_y = ydata[other_argextrema]
     if xdata is None:
         other_subextrema_x = other_argextrema
@@ -396,8 +393,8 @@ def linear_interpolation(arr, subindices):
         >>> assert np.allclose(subindices, subvalues)
         >>> assert np.allclose(2.3, linear_interpolation(arr, 2.3))
     """
-    idx1 = np.floor(subindices).astype(np.int)
-    idx2 = np.floor(subindices + 1).astype(np.int)
+    idx1 = np.floor(subindices).astype(int)
+    idx2 = np.floor(subindices + 1).astype(int)
     idx2 = np.minimum(idx2, len(arr) - 1)
     alpha = idx2 - subindices
     subvalues = arr[idx1] * (alpha) + arr[idx2] * (1 - alpha)
@@ -469,7 +466,7 @@ def hist_argmaxima2(hist, maxima_thresh=.8):
     # FIXME: Not handling general cases
     # [0] index because argrelmaxima returns a tuple
     if len(hist) == 0:
-        return np.empty(dtype=np.int)
+        return np.empty(dtype=int)
     comperetor = np.greater
     argmaxima_ = scipy.signal.argrelextrema(hist, comperetor)[0]
     if len(argmaxima_) == 0:
@@ -978,8 +975,8 @@ def show_ori_image_ondisk():
         >>> pt.show_if_requested()
     """
     #if img_fpath is not None:
-    #    img_fpath = ut.get_argval('--fpath', type_=str, default=ut.grab_test_imgpath('star.png'))
-    #    img_fpath = ut.get_argval('--fpath', type_=str, default=ut.grab_test_imgpath('star.png'))
+    #    img_fpath = ut.get_argval('--fpath', type_=str, default=ut.grab_test_imgpath('astro'))
+    #    img_fpath = ut.get_argval('--fpath', type_=str, default=ut.grab_test_imgpath('astro'))
     #    img = vt.imread(img_fpath)
     #    ori_img_fpath     = ut.get_argval('--fpath-ori', type_=str,
     #    default=ut.augpath(img_fpath, '_ori'))