From 052786919f89b8ed5643dfebffcc797e92584f1d Mon Sep 17 00:00:00 2001 From: Ken Odegard Date: Mon, 21 Aug 2023 18:29:59 -0400 Subject: [PATCH 1/2] Find `conda-*` executables on `PATH` (#13006) --- conda/cli/find_commands.py | 2 ++ news/13006-non-base-plugins | 19 +++++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 news/13006-non-base-plugins diff --git a/conda/cli/find_commands.py b/conda/cli/find_commands.py index 41da532e54..22adb34558 100644 --- 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: diff --git a/news/13006-non-base-plugins b/news/13006-non-base-plugins new file mode 100644 index 0000000000..8ad0a0da36 --- /dev/null +++ b/news/13006-non-base-plugins @@ -0,0 +1,19 @@ +### Enhancements + +* + +### Bug fixes + +* Fix regression for supporting conda executable plugins installed into non-base environments. (#13006) + +### Deprecations + +* + +### Docs + +* + +### Other + +* From a9b1838f059501528e6f48c35972fd5f379dec0a Mon Sep 17 00:00:00 2001 From: Ken Odegard Date: Mon, 21 Aug 2023 18:51:04 -0400 Subject: [PATCH 2/2] Release 23.7.3 (#13009) --- .authors.yml | 2 +- CHANGELOG.md | 12 ++++++++++++ news/13006-non-base-plugins | 19 ------------------- 3 files changed, 13 insertions(+), 20 deletions(-) delete mode 100644 news/13006-non-base-plugins diff --git a/.authors.yml b/.authors.yml index b61a182123..3dc34faabf 100644 --- 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 index 7ad87a4913..a8b4a8be5c 100644 --- 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/news/13006-non-base-plugins b/news/13006-non-base-plugins deleted file mode 100644 index 8ad0a0da36..0000000000 --- a/news/13006-non-base-plugins +++ /dev/null @@ -1,19 +0,0 @@ -### Enhancements - -* - -### Bug fixes - -* Fix regression for supporting conda executable plugins installed into non-base environments. (#13006) - -### Deprecations - -* - -### Docs - -* - -### Other - -*