Fixing tests

conda-incubator · May 7, 2024 · bc03847 · bc03847
1 parent 84fce45
commit bc03847
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/conda-store-server/conda_store_server/_internal/action/generate_constructor_installer.py b/conda-store-server/conda_store_server/_internal/action/generate_constructor_installer.py
@@ -9,6 +9,7 @@
 import yaml
 
 from conda_store_server._internal import action, schema
+from conda_store_server._internal.action.utils import logged_command
 
 
 def get_installer_platform():
@@ -42,7 +43,7 @@ def write_file(filename, s):
             "constructor",
             "--help",
         ]
-        action.utils.logged_command(context, command)
+        logged_command(context, command)
     except FileNotFoundError:
         warnings.warn(
             "Installer generation requires constructor: https://github.com/conda/constructor"
@@ -146,6 +147,6 @@ def write_file(filename, s):
             get_installer_platform(),
             str(tmp_dir),
         ]
-        action.utils.logged_command(context, command)
+        logged_command(context, command)
 
     return installer_filename
diff --git a/conda-store-server/conda_store_server/_internal/action/generate_lockfile.py b/conda-store-server/conda_store_server/_internal/action/generate_lockfile.py
@@ -8,6 +8,7 @@
 from conda_lock.conda_lock import run_lock
 
 from conda_store_server._internal import action, conda_utils, schema, utils
+from conda_store_server._internal.action.utils import logged_command
 
 
 @action.action
@@ -27,10 +28,10 @@ def action_solve_lockfile(
         json.dump(specification.dict(), f)
 
     # The info command can be used with either mamba or conda
-    action.utils.logged_command(context, [conda_command, "info"])
+    logged_command(context, [conda_command, "info"])
     # The config command is not supported by mamba
-    action.utils.logged_command(context, ["conda", "config", "--show"])
-    action.utils.logged_command(context, ["conda", "config", "--show-sources"])
+    logged_command(context, ["conda", "config", "--show"])
+    logged_command(context, ["conda", "config", "--show-sources"])
 
     # conda-lock ignores variables defined in the specification, so this code
     # gets the value of CONDA_OVERRIDE_CUDA and passes it to conda-lock via