Port changes from 3.26.x release branch to main

.authors.yml

@@ -7,7 +7,7 @@
   aliases:
   - Mike Sarahan
   - Michael Sarahan
-  num_commits: 4000
+  num_commits: 2000
   first_commit: 2015-09-04 21:31:08
 - name: Jonathan J. Helmus
   email: [email protected]
@@ -63,7 +63,7 @@
   alternate_emails:
   - [email protected]
   - [email protected]
-  num_commits: 86
+  num_commits: 43
   first_commit: 2017-05-17 23:54:01
   github: mandeep
 - name: Filipe Fernandes
@@ -117,7 +117,7 @@
   - [email protected]
   aliases:
   - heather999
-  num_commits: 4
+  num_commits: 2
   first_commit: 2016-04-11 12:02:50
   github: heather999
 - name: Ryan Grout
@@ -571,7 +571,7 @@
   alternate_emails:
   - [email protected]
   - [email protected]
-  num_commits: 196
+  num_commits: 98
   first_commit: 2016-09-06 16:58:21
   github: soapy1
 - name: Bruno Oliveira
@@ -754,7 +754,7 @@
   alternate_emails:
   - [email protected]
   - [email protected]
-  num_commits: 146
+  num_commits: 73
   first_commit: 2015-04-21 13:26:39
   github: jakirkham
 - name: Anthony Scopatz
@@ -873,7 +873,7 @@
   alternate_emails:
   - [email protected]
   - [email protected]
-  num_commits: 12
+  num_commits: 6
   first_commit: 2018-02-27 16:37:19
 - name: David Li
   email: [email protected]
@@ -967,7 +967,7 @@
   first_commit: 2019-01-26 13:17:33
 - name: Rachel Rigdon
   email: [email protected]
-  num_commits: 268
+  num_commits: 134
   first_commit: 2019-01-24 15:12:09
   github: rrigdon
   aliases:
@@ -1118,7 +1118,7 @@
   alternate_emails:
   - [email protected]
   - [email protected]
-  num_commits: 38
+  num_commits: 19
   first_commit: 2019-10-17 23:05:16
   github: beckermr
 - name: Jinzhe Zeng
@@ -1199,7 +1199,7 @@
   alternate_emails:
   - [email protected]
 - name: Ken Odegard
-  num_commits: 128
+  num_commits: 130
   email: [email protected]
   first_commit: 2020-09-08 19:53:41
   github: kenodegard
@@ -1222,7 +1222,7 @@
   first_commit: 2020-11-19 10:46:41
 - name: Jannis Leidel
   email: [email protected]
-  num_commits: 26
+  num_commits: 27
   github: jezdez
   first_commit: 2020-11-19 10:46:41
 - name: Christof Kaufmann
@@ -1237,7 +1237,7 @@
   github: pre-commit-ci[bot]
   aliases:
   - pre-commit-ci[bot]
-  num_commits: 44
+  num_commits: 48
   first_commit: 2021-11-20 01:47:17
 - name: Jacob Walls
   email: [email protected]
@@ -1248,7 +1248,7 @@
   github: beeankha
   alternate_emails:
   - [email protected]
-  num_commits: 20
+  num_commits: 19
   first_commit: 2022-01-19 16:40:06
 - name: Conda Bot
   email: [email protected]
@@ -1259,7 +1259,7 @@
   alternate_emails:
   - [email protected]
   - [email protected]
-  num_commits: 66
+  num_commits: 35
   first_commit: 2022-01-17 18:09:22
 - name: Uwe L. Korn
   email: [email protected]
@@ -1268,7 +1268,7 @@
 - name: Daniel Holth
   email: [email protected]
   github: dholth
-  num_commits: 10
+  num_commits: 12
   first_commit: 2022-04-28 05:22:14
 - name: Rylan Chord
   email: [email protected]

CHANGELOG.md

@@ -1,5 +1,23 @@
 [//]: # (current developments)
 
+## 3.26.1 (2023-08-17)
+
+### Bug fixes
+
+* Delay imports in conda command plugin until the command is used, avoiding
+  import-time side effects including unwanted logging configuration. (#4949)
+
+### Contributors
+
+* @beeankha
+* @conda-bot
+* @dholth
+* @jezdez
+* @kenodegard
+* @pre-commit-ci[bot]
+
+
+
 ## 3.26.0 (2023-07-18)
 
 ### Enhancements