From ea948bbb38927b6dd24037a7dadd83f3f2435f0a Mon Sep 17 00:00:00 2001
From: Jonathon Reinhart <Jonathon.Reinhart@gmail.com>
Date: Mon, 18 Mar 2024 22:43:12 -0400
Subject: [PATCH 1/2] scuba: Don't use wildcard imports in scuba.config

---
 scuba/config.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scuba/config.py b/scuba/config.py
index e6e399cd..4e1ecb48 100644
--- a/scuba/config.py
+++ b/scuba/config.py
@@ -10,8 +10,8 @@
 import yaml
 import yaml.nodes
 
-from .constants import *
-from .utils import *
+from .constants import DEFAULT_SHELL, SCUBA_YML
+from .utils import expand_env_vars, parse_env_var
 from .dockerutil import make_vol_opt
 
 CfgNode = Any

From 4cd5bbe38983a7060738ba6123067f77797f0244 Mon Sep 17 00:00:00 2001
From: Jonathon Reinhart <Jonathon.Reinhart@gmail.com>
Date: Mon, 18 Mar 2024 22:46:14 -0400
Subject: [PATCH 2/2] tests: Don't use wildcard imports

---
 tests/test_config.py     |  7 ++++---
 tests/test_dockerutil.py |  8 ++++----
 tests/test_main.py       | 30 +++++++++++++++++-------------
 tests/test_utils.py      |  8 ++++----
 4 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/tests/test_config.py b/tests/test_config.py
index a982874c..d07b4812 100644
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -1,12 +1,13 @@
 # coding=utf-8
-from .utils import *
-import pytest
-
 import logging
 import os
 from os.path import join
 from pathlib import Path
+import pytest
 from shutil import rmtree
+from unittest import mock
+
+from .utils import assert_paths_equal, assert_vol
 
 import scuba.config
 
diff --git a/tests/test_dockerutil.py b/tests/test_dockerutil.py
index b0b72a81..dd418d4e 100644
--- a/tests/test_dockerutil.py
+++ b/tests/test_dockerutil.py
@@ -1,11 +1,11 @@
 # coding=utf-8
-from unittest import mock
-import pytest
-
 from pathlib import Path
+import pytest
 import subprocess
 from typing import Sequence
-from .const import *
+from unittest import mock
+
+from .const import ALT_DOCKER_IMAGE, DOCKER_IMAGE
 
 import scuba.dockerutil as uut
 
diff --git a/tests/test_main.py b/tests/test_main.py
index ab288948..5e77b323 100644
--- a/tests/test_main.py
+++ b/tests/test_main.py
@@ -1,25 +1,29 @@
-from .utils import *
-from unittest import mock
-import pytest
-import warnings
-
+from grp import getgrgid
 import logging
 import os
-import sys
 from pathlib import Path
-from tempfile import TemporaryFile, NamedTemporaryFile
-import subprocess
-import shlex
 from pwd import getpwuid
-from grp import getgrgid
+import pytest
+import re
+import shlex
+import subprocess
+import sys
+from tempfile import TemporaryFile, NamedTemporaryFile
+from unittest import mock
+import warnings
 
 import scuba.__main__ as main
-import scuba.constants
 import scuba.dockerutil
-import scuba
-import re
 
 from .const import DOCKER_IMAGE
+from .utils import (
+    assert_seq_equal,
+    assert_str_equalish,
+    InTempDir,
+    make_executable,
+    skipUnlessTty,
+)
+
 
 SCUBAINIT_EXIT_FAIL = 99
 
diff --git a/tests/test_utils.py b/tests/test_utils.py
index 26633382..eef34f01 100644
--- a/tests/test_utils.py
+++ b/tests/test_utils.py
@@ -1,11 +1,11 @@
-import shlex
+import io
 from itertools import chain
 import os
-import io
+import pytest
+import shlex
 from typing import List, Sequence
 
-from .utils import *
-import pytest
+from .utils import assert_seq_equal
 
 import scuba.utils