can now import things from symlinks_paths directly

Author: wangpatrick57

benchmark/job/cli.py

@@ -2,7 +2,7 @@
 from typing import Optional
 
 import click
-from gymlib.symlinks_paths import (
+from gymlib import (
     get_tables_dirname,
     get_workload_dirname,
     get_workload_suffix,

benchmark/job/load_info.py

@@ -1,7 +1,7 @@
 from pathlib import Path
 from typing import Optional
 
-from gymlib.symlinks_paths import get_tables_symlink_path
+from gymlib import get_tables_symlink_path
 
 from benchmark.constants import DEFAULT_SCALE_FACTOR
 from dbms.load_info_base_class import LoadInfoBaseClass

benchmark/tests/integtest_benchmark.py

@@ -2,7 +2,7 @@
 import unittest
 from pathlib import Path
 
-from gymlib.symlinks_paths import (
+from gymlib import (
     get_tables_symlink_path,
     get_workload_suffix,
     get_workload_symlink_path,

benchmark/tpch/cli.py

@@ -1,7 +1,7 @@
 import logging
 
 import click
-from gymlib.symlinks_paths import (
+from gymlib import (
     get_scale_factor_string,
     get_tables_dirname,
     get_tables_symlink_path,

benchmark/tpch/load_info.py

@@ -1,7 +1,7 @@
 from pathlib import Path
 from typing import Optional
 
-from gymlib.symlinks_paths import get_tables_symlink_path
+from gymlib import get_tables_symlink_path
 
 from dbms.load_info_base_class import LoadInfoBaseClass
 from util.workspace import DBGymWorkspace, fully_resolve_path

dbms/postgres/cli.py

@@ -10,7 +10,7 @@
 
 import click
 import sqlalchemy
-from gymlib.symlinks_paths import (
+from gymlib import (
     get_dbdata_tgz_symlink_path,
     get_pgbin_symlink_path,
     get_repo_symlink_path,

dbms/tests/integtest_dbms.py

@@ -3,7 +3,7 @@
 import unittest
 from pathlib import Path
 
-from gymlib.symlinks_paths import get_dbdata_tgz_symlink_path, get_repo_symlink_path
+from gymlib import get_dbdata_tgz_symlink_path, get_repo_symlink_path
 
 from benchmark.tpch.cli import _tpch_tables
 from dbms.postgres.cli import _postgres_build, _postgres_dbdata

env/tests/gymlib_integtest_util.py

@@ -4,7 +4,7 @@
 from typing import Optional
 
 # TODO: remove symlinks_paths from the import
-from gymlib.symlinks_paths import (
+from gymlib import (
     get_dbdata_tgz_symlink_path,
     get_pgbin_symlink_path,
     get_workload_suffix,

gymlib_package/gymlib/__init__.py

@@ -1 +1,2 @@
-from . import magic, symlinks_paths
+from .magic import *
+from .symlinks_paths import *

util/workspace.py

@@ -12,7 +12,7 @@
 from typing import IO, Any, Optional
 
 import yaml
-from gymlib.symlinks_paths import is_linkname, name_to_linkname
+from gymlib import is_linkname, name_to_linkname
 
 from util.log import DBGYM_LOGGER_NAME