Merge pull request #13010 from conda/23.7.x

Merge `23.7.x` branch back into `main`
conda · Aug 22, 2023 · 79c952f · 79c952f
2 parents d554ed1 + a9b1838
commit 79c952f
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/.authors.yml b/.authors.yml
@@ -1957,7 +1957,7 @@
   first_commit: 2016-12-11 16:14:03
 - name: Ken Odegard
   email: kodegard@anaconda.com
-  num_commits: 554
+  num_commits: 558
   first_commit: 2016-09-27 18:04:21
   github: kenodegard
   aliases:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,17 @@
 [//]: # (current developments)
 
+## 23.7.3 (2023-08-21)
+
+### Bug fixes
+
+* Fix regression for supporting conda executable plugins installed into non-base environments. (#13006)
+
+### Contributors
+
+* @kenodegard
+
+
+
 ## 23.7.2 (2023-07-27)
 
 ### Bug fixes

diff --git a/conda/cli/find_commands.py b/conda/cli/find_commands.py
@@ -58,6 +58,8 @@ def find_commands(include_others=True):
     else:
         dir_paths = []
 
+    dir_paths.extend(os.environ.get("PATH", "").split(os.pathsep))
+
     if on_win:
         pat = re.compile(r"conda-([\w\-]+)\.(exe|bat)$")
     else: