From 63b12fb7fe4616131ea70617a7624e2c4c36f5f5 Mon Sep 17 00:00:00 2001
From: Rohit Goswami <rog32@hi.is>
Date: Sun, 4 Feb 2024 00:39:21 +0000
Subject: [PATCH] MAINT: Lint things better

---
 test/test_environment_bench.py | 4 +++-
 test/tools.py                  | 9 +++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/test/test_environment_bench.py b/test/test_environment_bench.py
index a5199a682..593945164 100644
--- a/test/test_environment_bench.py
+++ b/test/test_environment_bench.py
@@ -1,7 +1,9 @@
 import subprocess
 import os
-import pytest
 import json
+
+import pytest
+
 from . import tools
 
 ENVIRONMENTS = []
diff --git a/test/tools.py b/test/tools.py
index bbae6acff..a9703d4ee 100644
--- a/test/tools.py
+++ b/test/tools.py
@@ -16,6 +16,7 @@
 import subprocess
 import platform
 import http.server
+import importlib
 from os.path import abspath, join, dirname, relpath, isdir
 from contextlib import contextmanager
 from hashlib import sha256
@@ -95,10 +96,10 @@ def _check_conda():
 def _check_mamba():
     conda = _find_conda()
     try:
-        # Attempt to import libmambapy to check if libmambapy is available
-        import libmambapy
-        subprocess.check_call([conda, 'build', '--version'], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-        # If both checks pass, return True indicating Mamba is available and conda-build is installed
+        importlib.import_module('libmambapy')
+        subprocess.check_call([conda, 'build', '--version'],
+                              stdout=subprocess.PIPE,
+                              stderr=subprocess.PIPE)
         return True
     except (ImportError, subprocess.CalledProcessError, FileNotFoundError):
         return False