Eliminate legacy models. Nobody cares any more!

Author: riastradh-probcomp

MANIFEST.in

@@ -114,7 +114,6 @@ include src/grammar.sha256
 include src/grammar.y
 include tests/dha.csv
 include tests/dha_codebook.csv
-include tests/dha_models.pkl.gz
 include tests/test_bql.py
 include tests/test_codebook.py
 include tests/test_column_dep.py
@@ -123,7 +122,6 @@ include tests/test_correlation.py
 include tests/test_csv.py
 include tests/test_geweke.py
 include tests/test_guess.py
-include tests/test_legacy.py
 include tests/test_math_util.py
 include tests/test_metamodels.py
 include tests/test_parse.py

shell/src/core.py

@@ -69,7 +69,6 @@ def __init__(self, bdb, metamodel, stdin=None, stdout=None, stderr=None):
         self._installcmd('guess', self.dot_guess)
         self._installcmd('help', self.dot_help)
         self._installcmd('hook', self.dot_hook)
-        self._installcmd('legacymodels', self.dot_legacymodels)
         self._installcmd('open', self.dot_open)
         self._installcmd('pythexec', self.dot_pythexec)
         self._installcmd('python', self.dot_python)
@@ -499,33 +498,6 @@ def dot_guess(self, line):
         except Exception:
             self.stdout.write(traceback.format_exc())
 
-    def dot_legacymodels(self, line):
-        '''load legacy models
-        <generator> <table> </path/to/models.pkl.gz>
-
-        Create a Crosscat generator named <generator> for the table
-        <table> from the legacy models stored in
-        </path/to/models.pkl.gz>.
-        '''
-        # XXX Lousy, lousy tokenizer.
-        tokens = line.split()
-        if len(tokens) != 3:
-            self.stdout.write('Usage:'
-                              ' .legacymodels <generator> <table>'
-                              ' </path/to/models.pkl.gz>\n')
-            return
-        generator = tokens[0]
-        table = tokens[1]
-        pathname = tokens[2]
-        try:
-            bayeslite.bayesdb_load_legacy_models(self._bdb, generator, table,
-                                                 self._metamodel, pathname,
-                                                 create=True)
-        except IOError as e:
-            self.stdout.write('%s\n' % (e,))
-        except Exception:
-            self.stdout.write(traceback.format_exc())
-
     def dot_describe(self, line):
         '''describe BayesDB entities
         [table(s)|generator(s)|columns|model(s)] [<name>...]

shell/tests/test_shell.py

@@ -153,20 +153,19 @@ def test_help_returns_list_of_commands(spawnbdb):
     c = spawnbdb
     c.sendexpectcmd('.help')
     c.expect_lines([
-        '     .codebook    load codebook for table',
-        '          .csv    create table from CSV file',
-        '     .describe    describe BayesDB entities',
-        '        .guess    guess data generator',
-        '         .help    show help for commands',
-        '         .hook    add custom commands from a python source file',
-        ' .legacymodels    load legacy models',
-        '         .open    close existing database and open new one',
-        '     .pythexec    execute a Python statement',
-        '       .python    evaluate a Python expression',
-        '         .read    read a file of shell commands',
-        '          .sql    execute a SQL query',
-        '        .trace    trace queries',
-        '      .untrace    untrace queries',
+        ' .codebook    load codebook for table',
+        '      .csv    create table from CSV file',
+        ' .describe    describe BayesDB entities',
+        '    .guess    guess population schema',
+        '     .help    show help for commands',
+        '     .hook    add custom commands from a python source file',
+        '     .open    close existing database and open new one',
+        ' .pythexec    execute a Python statement',
+        '   .python    evaluate a Python expression',
+        '     .read    read a file of shell commands',
+        '      .sql    execute a SQL query',
+        '    .trace    trace queries',
+        '  .untrace    untrace queries',
         "Type `.help <cmd>' for help on the command <cmd>.",
     ])
     c.expect_prompt()
@@ -378,21 +377,20 @@ def test_hook(spawnbdb):
     c.expect_prompt()
     c.sendexpectcmd('.help')
     c.expect_lines([
-        '     .codebook    load codebook for table',
-        '          .csv    create table from CSV file',
-        '     .describe    describe BayesDB entities',
-        '        .guess    guess data generator',
-        '         .help    show help for commands',
-        '         .hook    add custom commands from a python source file',
-        ' .legacymodels    load legacy models',
-        '       .myhook    myhook help string',
-        '         .open    close existing database and open new one',
-        '     .pythexec    execute a Python statement',
-        '       .python    evaluate a Python expression',
-        '         .read    read a file of shell commands',
-        '          .sql    execute a SQL query',
-        '        .trace    trace queries',
-        '      .untrace    untrace queries',
+        ' .codebook    load codebook for table',
+        '      .csv    create table from CSV file',
+        ' .describe    describe BayesDB entities',
+        '    .guess    guess population schema',
+        '     .help    show help for commands',
+        '     .hook    add custom commands from a python source file',
+        '   .myhook    myhook help string',
+        '     .open    close existing database and open new one',
+        ' .pythexec    execute a Python statement',
+        '   .python    evaluate a Python expression',
+        '     .read    read a file of shell commands',
+        '      .sql    execute a SQL query',
+        '    .trace    trace queries',
+        '  .untrace    untrace queries',
         "Type `.help <cmd>' for help on the command <cmd>."
     ])
     c.expect_prompt()

src/__init__.py

@@ -72,7 +72,6 @@
 from bayeslite.codebook import bayesdb_load_codebook_csv_file
 from bayeslite.exception import BayesDBException
 from bayeslite.exception import BQLError
-from bayeslite.legacy_models import bayesdb_load_legacy_models
 from bayeslite.metamodel import IBayesDBMetamodel
 from bayeslite.metamodel import bayesdb_builtin_metamodel
 from bayeslite.metamodel import bayesdb_deregister_metamodel
@@ -102,7 +101,6 @@ def bql_quote_name(name):
     'BayesDBTxnError',
     'bayesdb_deregister_metamodel',
     'bayesdb_load_codebook_csv_file',
-    'bayesdb_load_legacy_models',
     'bayesdb_open',
     'bayesdb_read_csv',
     'bayesdb_read_csv_file',