[ty] improve base conda distinction child conda

Author: Danielkonge

crates/ty/tests/cli/python_environment.rs

@@ -943,9 +943,9 @@ fn defaults_to_a_new_python_version() -> anyhow::Result<()> {
 /// The `site-packages` directory is used by ty for external import.
 /// Ty does the following checks to discover the `site-packages` directory in the order:
 /// 1) If `VIRTUAL_ENV` environment variable is set
-/// 2) If `CONDA_PREFIX` environment variable is set (and .filename != `CONDA_DEFAULT_ENV`)
+/// 2) If `CONDA_PREFIX` environment variable is set (and .filename == `CONDA_DEFAULT_ENV`)
 /// 3) If a `.venv` directory exists at the project root
-/// 4) If `CONDA_PREFIX` environment variable is set (and .filename == `CONDA_DEFAULT_ENV`)
+/// 4) If `CONDA_PREFIX` environment variable is set (and .filename != `CONDA_DEFAULT_ENV`)
 ///
 /// This test (and the next one) is aiming at validating the logic around these cases.
 ///
@@ -986,15 +986,14 @@ fn defaults_to_a_new_python_version() -> anyhow::Result<()> {
 /// │           └── site-packages
 /// │               └── package1
 /// │                   └── __init__.py
-/// ├── conda-env
-/// │   └── lib
-/// │       └── python3.13
-/// │           └── site-packages
-/// │               └── package1
-/// │                   └── __init__.py
 /// └── conda
+///     ├── lib
+///     │   └── python3.13
+///     │       └── site-packages
+///     │           └── package1
+///     │               └── __init__.py
 ///     └── envs
-///         └── base
+///         └── conda-env
 ///             └── lib
 ///                 └── python3.13
 ///                     └── site-packages
@@ -1006,15 +1005,15 @@ fn defaults_to_a_new_python_version() -> anyhow::Result<()> {
 #[test]
 fn check_venv_resolution_with_working_venv() -> anyhow::Result<()> {
     let child_conda_package1_path = if cfg!(windows) {
-        "conda-env/Lib/site-packages/package1/__init__.py"
+        "conda/envs/conda-env/Lib/site-packages/package1/__init__.py"
     } else {
-        "conda-env/lib/python3.13/site-packages/package1/__init__.py"
+        "conda/envs/conda-env/lib/python3.13/site-packages/package1/__init__.py"
     };
 
     let base_conda_package1_path = if cfg!(windows) {
-        "conda/envs/base/Lib/site-packages/package1/__init__.py"
+        "conda/Lib/site-packages/package1/__init__.py"
     } else {
-        "conda/envs/base/lib/python3.13/site-packages/package1/__init__.py"
+        "conda//lib/python3.13/site-packages/package1/__init__.py"
     };
 
     let working_venv_package1_path = if cfg!(windows) {
@@ -1136,7 +1135,7 @@ home = ./
     // run with CONDA_PREFIX set, should find the child conda
     assert_cmd_snapshot!(case.command()
         .current_dir(case.root().join("project"))
-        .env("CONDA_PREFIX", case.root().join("conda-env")), @r"
+        .env("CONDA_PREFIX", case.root().join("conda/envs/conda-env")), @r"
     success: false
     exit_code: 1
     ----- stdout -----
@@ -1157,21 +1156,21 @@ home = ./
     WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
     ");
 
-    // run with CONDA_PREFIX and CONDA_DEFAULT_ENV set (unequal), should find child conda
+    // run with CONDA_PREFIX and CONDA_DEFAULT_ENV set (unequal), should find working venv
     assert_cmd_snapshot!(case.command()
         .current_dir(case.root().join("project"))
-        .env("CONDA_PREFIX", case.root().join("conda-env"))
+        .env("CONDA_PREFIX", case.root().join("conda"))
         .env("CONDA_DEFAULT_ENV", "base"), @r"
     success: false
     exit_code: 1
     ----- stdout -----
-    error[unresolved-import]: Module `package1` has no member `ChildConda`
-     --> test.py:3:22
+    error[unresolved-import]: Module `package1` has no member `WorkingVenv`
+     --> test.py:4:22
       |
     2 | from package1 import ActiveVenv
     3 | from package1 import ChildConda
-      |                      ^^^^^^^^^^
     4 | from package1 import WorkingVenv
+      |                      ^^^^^^^^^^^
     5 | from package1 import BaseConda
       |
     info: rule `unresolved-import` is enabled by default
@@ -1186,7 +1185,7 @@ home = ./
     // should find child active venv
     assert_cmd_snapshot!(case.command()
         .current_dir(case.root().join("project"))
-        .env("CONDA_PREFIX", case.root().join("conda-env"))
+        .env("CONDA_PREFIX", case.root().join("conda"))
         .env("CONDA_DEFAULT_ENV", "base")
         .env("VIRTUAL_ENV", case.root().join("myvenv")), @r"
     success: false
@@ -1208,21 +1207,21 @@ home = ./
     WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
     ");
 
-    // run with CONDA_PREFIX and CONDA_DEFAULT_ENV (equal!) set, should find working venv
+    // run with CONDA_PREFIX and CONDA_DEFAULT_ENV (equal!) set, should find ChildConda
     assert_cmd_snapshot!(case.command()
         .current_dir(case.root().join("project"))
-        .env("CONDA_PREFIX", case.root().join("conda/envs/base"))
-        .env("CONDA_DEFAULT_ENV", "base"), @r"
+        .env("CONDA_PREFIX", case.root().join("conda/envs/conda-env"))
+        .env("CONDA_DEFAULT_ENV", "conda-env"), @r"
     success: false
     exit_code: 1
     ----- stdout -----
-    error[unresolved-import]: Module `package1` has no member `WorkingVenv`
-     --> test.py:4:22
+    error[unresolved-import]: Module `package1` has no member `ChildConda`
+     --> test.py:3:22
       |
     2 | from package1 import ActiveVenv
     3 | from package1 import ChildConda
+      |                      ^^^^^^^^^^
     4 | from package1 import WorkingVenv
-      |                      ^^^^^^^^^^^
     5 | from package1 import BaseConda
       |
     info: rule `unresolved-import` is enabled by default
@@ -1242,15 +1241,15 @@ home = ./
 #[test]
 fn check_venv_resolution_without_working_venv() -> anyhow::Result<()> {
     let child_conda_package1_path = if cfg!(windows) {
-        "conda-env/Lib/site-packages/package1/__init__.py"
+        "conda/envs/conda-env/Lib/site-packages/package1/__init__.py"
     } else {
-        "conda-env/lib/python3.13/site-packages/package1/__init__.py"
+        "conda/envs/conda-env/lib/python3.13/site-packages/package1/__init__.py"
     };
 
     let base_conda_package1_path = if cfg!(windows) {
-        "conda/envs/base/Lib/site-packages/package1/__init__.py"
+        "conda/Lib/site-packages/package1/__init__.py"
     } else {
-        "conda/envs/base/lib/python3.13/site-packages/package1/__init__.py"
+        "conda/lib/python3.13/site-packages/package1/__init__.py"
     };
 
     let active_venv_package1_path = if cfg!(windows) {
@@ -1398,7 +1397,7 @@ home = ./
     // run with CONDA_PREFIX set, should find the child conda
     assert_cmd_snapshot!(case.command()
         .current_dir(case.root().join("project"))
-        .env("CONDA_PREFIX", case.root().join("conda-env")), @r"
+        .env("CONDA_PREFIX", case.root().join("conda/envs/conda-env")), @r"
     success: false
     exit_code: 1
     ----- stdout -----
@@ -1419,22 +1418,21 @@ home = ./
     WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
     ");
 
-    // run with CONDA_PREFIX and CONDA_DEFAULT_ENV set (unequal), should find child conda
+    // run with CONDA_PREFIX and CONDA_DEFAULT_ENV set (unequal), should find base conda
     assert_cmd_snapshot!(case.command()
         .current_dir(case.root().join("project"))
-        .env("CONDA_PREFIX", case.root().join("conda-env"))
+        .env("CONDA_PREFIX", case.root().join("conda"))
         .env("CONDA_DEFAULT_ENV", "base"), @r"
     success: false
     exit_code: 1
     ----- stdout -----
-    error[unresolved-import]: Module `package1` has no member `ChildConda`
-     --> test.py:3:22
+    error[unresolved-import]: Module `package1` has no member `BaseConda`
+     --> test.py:5:22
       |
-    2 | from package1 import ActiveVenv
     3 | from package1 import ChildConda
-      |                      ^^^^^^^^^^
     4 | from package1 import WorkingVenv
     5 | from package1 import BaseConda
+      |                      ^^^^^^^^^
       |
     info: rule `unresolved-import` is enabled by default
 
@@ -1448,7 +1446,7 @@ home = ./
     // should find child active venv
     assert_cmd_snapshot!(case.command()
         .current_dir(case.root().join("project"))
-        .env("CONDA_PREFIX", case.root().join("conda-env"))
+        .env("CONDA_PREFIX", case.root().join("conda"))
         .env("CONDA_DEFAULT_ENV", "base")
         .env("VIRTUAL_ENV", case.root().join("myvenv")), @r"
     success: false
@@ -1470,10 +1468,10 @@ home = ./
     WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
     ");
 
-    // run with CONDA_PREFIX and CONDA_DEFAULT_ENV (equal!) set, should find base conda
+    // run with CONDA_PREFIX and CONDA_DEFAULT_ENV (unequal!) set, should find base conda
     assert_cmd_snapshot!(case.command()
         .current_dir(case.root().join("project"))
-        .env("CONDA_PREFIX", case.root().join("conda/envs/base"))
+        .env("CONDA_PREFIX", case.root().join("conda"))
         .env("CONDA_DEFAULT_ENV", "base"), @r"
     success: false
     exit_code: 1

crates/ty_python_semantic/src/site_packages.rs

@@ -633,9 +633,9 @@ impl CondaEnvironmentKind {
         };
 
         if name == default_env {
-            CondaEnvironmentKind::Base
-        } else {
             CondaEnvironmentKind::Child
+        } else {
+            CondaEnvironmentKind::Base
         }
     }
 }