Small fixes for tests that execute dbinfo, which is not turned off si…

…nce it is not needed
WildMeOrg · Jan 28, 2021 · 243b8ef · 243b8ef
1 parent 0db4a88
commit 243b8ef
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 6 deletions.
diff --git a/requirements/optional.txt b/requirements/optional.txt
@@ -3,13 +3,11 @@ autopep8
 
 Cython>=0.24
 
-descartes
 
 Flask-CAS
 
 flask-cors
 flask-swagger
-geopandas
 jupyter
 # Lasagne
 

diff --git a/requirements/runtime.txt b/requirements/runtime.txt
@@ -8,12 +8,15 @@ dateutils>=0.6.6
 
 delorean
 deprecated
+descartes
 docker
 flask>=0.10.1
 flask-cas
 flask-cors
 
 gdm
+geopandas
+
 imgaug
 
 ipython>=5.0.0

diff --git a/setup.py b/setup.py
@@ -231,6 +231,7 @@ def gen_packages_items():
         'tests': parse_requirements('requirements/tests.txt'),
         'build': parse_requirements('requirements/build.txt'),
         'runtime': parse_requirements('requirements/runtime.txt'),
+        'optional': parse_requirements('requirements/optional.txt'),
         'postgres': parse_requirements('requirements/postgres.txt'),
     },
     # --- VERSION ---

diff --git a/wbia/dbio/export_subset.py b/wbia/dbio/export_subset.py
@@ -88,7 +88,7 @@ def merge_databases(ibs_src, ibs_dst, rowid_subsets=None, localize_images=True):
         >>>                        delete_ibsdir=delete_ibsdir)
         >>> merge_databases(ibs_src, ibs_dst)
         >>> check_merge(ibs_src, ibs_dst)
-        >>> ibs_dst.print_dbinfo()
+        >>> # ibs_dst.print_dbinfo()
     """
     # TODO: ensure images are localized
     # otherwise this wont work

diff --git a/wbia/other/dbinfo.py b/wbia/other/dbinfo.py
@@ -59,8 +59,8 @@ def get_dbinfo(
     with_agesex=True,
     with_header=True,
     with_reviews=True,
-    with_ggr=True,
-    with_map=True,
+    with_ggr=False,
+    with_map=False,
     short=False,
     tag='dbinfo',
     aid_list=None,

diff --git a/wbia/research/metrics.py b/wbia/research/metrics.py
@@ -95,4 +95,4 @@ def research_print_metrics(ibs, tag='metrics'):
     flags = [confidence >= 0.5 for confidence in confidence_list]
     ibs.set_annot_canonical(aids, flags)
 
-    ibs.print_dbinfo()
+    ibs.print_dbinfo(with_ggr=True, with_map=True)