Fix tests

cadet · Feb 17, 2025 · d334756 · d334756
1 parent 4c8a6dc
commit d334756
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 19 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -68,7 +68,7 @@ jobs:
 
       - name: Run Tests
         run: |
-          pytest tests -m "not server_api"
+          pytest tests -m "not server_api and not slow"
 
   build-release:
     name: Build and Upload Release

diff --git a/cadetrdm/environment.py b/cadetrdm/environment.py
@@ -215,11 +215,11 @@ def prepare_install_instructions(self):
                 if "git+" in spec:
                     raise ValueError(f"Conda can not use git+ dependencies for {package} {spec}")
                 elif "~" in spec:
-                    conda_command += f" '{package}={spec.replace('~', '').replace('=', '')}'"
+                    conda_command += f" {package}={spec.replace('~', '').replace('=', '')}"
                 elif ">" in spec or "<" in spec or "=" in spec:
-                    conda_command += f" '{package}{spec}'"
+                    conda_command += f" {package}{spec}"
                 else:
-                    conda_command += f" '{package}={spec}'"
+                    conda_command += f" {package}={spec}"
 
         if self.pip_packages is not None:
             pip_command = "pip install"

diff --git a/tests/test_logging.py b/tests/test_logging.py
@@ -117,36 +117,35 @@ def test_environment():
         pip_packages={"xarray": ">2024.2.0", "pydantic": "<=2.6.4", }
     )
 
-    install_instructions = ('conda install -y cadet=4.4.0 tbb=2024.0.0', 'pip install xarray==2024.2.0')
+    install_instructions = ("conda install -y cadet=4.4.0 tbb=2024.0.0", "pip install 'xarray==2024.2.0'")
     assert environment.prepare_install_instructions() == install_instructions
 
 
 @pytest.mark.slow
 def test_update_environment():
     subprocess.run(f'conda env remove -n testing_env_cadet_rdm  -y', shell=True)
-    subprocess.run(f'conda create -n testing_env_cadet_rdm python=3.12 -y', shell=True)
+    subprocess.run(f'conda create -n testing_env_cadet_rdm python=3.11 -y', shell=True)
     target_env = Environment(
         conda_packages={"libiconv": "1.17", "openssl": ">=3.3"},
-        pip_packages={"cadet-rdm": "0.0.44"}
+        # pip_packages={"cadet-rdm": "0.0.44"}
     )
-    current_env = Environment.from_yml_string(subprocess.check_output(
-        "conda activate testing_env_cadet_rdm & conda env export",
-        shell=True
-    ).decode())
+
+    check = subprocess.run("conda env export -n testing_env_cadet_rdm ", shell=True, capture_output=True)
+    current_env = Environment.from_yml_string(check.stdout.decode())
     assert not current_env.fulfils_environment(target_env)
 
     conda_instructions, pip_instructions = target_env.prepare_install_instructions()
-    conda_instructions = "conda activate testing_env_cadet_rdm && " + conda_instructions
-    pip_instructions = "conda activate testing_env_cadet_rdm && " + pip_instructions
+    conda_instructions = conda_instructions.replace("install -y", "install --name testing_env_cadet_rdm -y")
     print(conda_instructions)
-    print(pip_instructions)
     subprocess.run(conda_instructions, shell=True)
-    subprocess.run(pip_instructions, shell=True)
 
-    current_env = Environment.from_yml_string(subprocess.check_output(
-        f"conda activate testing_env_cadet_rdm && conda env export",
-        shell=True
-    ).decode())
+    # Currently not aware of any way of activating a conda env and then running commands in it.
+    # pip_instructions = "conda run -n testing_env_cadet_rdm " + pip_instructions
+    # print(pip_instructions)
+    # subprocess.run(pip_instructions, shell=True)
+
+    check = subprocess.run("conda env export -n testing_env_cadet_rdm ", shell=True, capture_output=True)
+    current_env = Environment.from_yml_string(check.stdout.decode())
     assert current_env.fulfils_environment(target_env)