Skip to content

Commit

Permalink
3.26.1 (#4970)
Browse files Browse the repository at this point in the history
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Conda Bot <conda-bot@users.noreply.github.com>
Co-authored-by: Ken Odegard <kodegard@anaconda.com>
Co-authored-by: Jannis Leidel <jannis@leidel.info>
Co-authored-by: Bianca Henderson <bhenderson@anaconda.com>
Co-authored-by: conda-bot <18747875+conda-bot@users.noreply.github.com>
fix islist (#4184)
  • Loading branch information
dholth authored Aug 17, 2023
1 parent 01ee210 commit c2bfe2b
Show file tree
Hide file tree
Showing 12 changed files with 269 additions and 100 deletions.
28 changes: 14 additions & 14 deletions .authors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: jjhelmus@gmail.com
Expand Down Expand Up @@ -63,7 +63,7 @@
alternate_emails:
- mandeep@users.noreply.github.com
- mbhutani@continuum.io
num_commits: 86
num_commits: 43
first_commit: 2017-05-17 23:54:01
github: mandeep
- name: Filipe Fernandes
Expand Down Expand Up @@ -117,7 +117,7 @@
- heather999@users.noreply.github.com
aliases:
- heather999
num_commits: 4
num_commits: 2
first_commit: 2016-04-11 12:02:50
github: heather999
- name: Ryan Grout
Expand Down Expand Up @@ -571,7 +571,7 @@
alternate_emails:
- scastellarin95@gmail.com
- scastellarin@anaconda.com
num_commits: 196
num_commits: 98
first_commit: 2016-09-06 16:58:21
github: soapy1
- name: Bruno Oliveira
Expand Down Expand Up @@ -754,7 +754,7 @@
alternate_emails:
- kirkhamj@janelia.hhmi.org
- jakirkham@gmail.com
num_commits: 146
num_commits: 73
first_commit: 2015-04-21 13:26:39
github: jakirkham
- name: Anthony Scopatz
Expand Down Expand Up @@ -873,7 +873,7 @@
alternate_emails:
- 5738695+183amir@users.noreply.github.com
- amir.mohammadi@idiap.ch
num_commits: 12
num_commits: 6
first_commit: 2018-02-27 16:37:19
- name: David Li
email: li.davidm96@gmail.com
Expand Down Expand Up @@ -967,7 +967,7 @@
first_commit: 2019-01-26 13:17:33
- name: Rachel Rigdon
email: rrigdon@anaconda.com
num_commits: 268
num_commits: 134
first_commit: 2019-01-24 15:12:09
github: rrigdon
aliases:
Expand Down Expand Up @@ -1118,7 +1118,7 @@
alternate_emails:
- becker.mr@gmail.com
- beckermr@users.noreply.github.com
num_commits: 38
num_commits: 19
first_commit: 2019-10-17 23:05:16
github: beckermr
- name: Jinzhe Zeng
Expand Down Expand Up @@ -1199,7 +1199,7 @@
alternate_emails:
- clee@anaconda.com
- name: Ken Odegard
num_commits: 128
num_commits: 130
email: kodegard@anaconda.com
first_commit: 2020-09-08 19:53:41
github: kenodegard
Expand All @@ -1222,7 +1222,7 @@
first_commit: 2020-11-19 10:46:41
- name: Jannis Leidel
email: jannis@leidel.info
num_commits: 26
num_commits: 27
github: jezdez
first_commit: 2020-11-19 10:46:41
- name: Christof Kaufmann
Expand All @@ -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: jacobtylerwalls@gmail.com
Expand All @@ -1248,7 +1248,7 @@
github: beeankha
alternate_emails:
- beeankha@gmail.com
num_commits: 20
num_commits: 19
first_commit: 2022-01-19 16:40:06
- name: Conda Bot
email: 18747875+conda-bot@users.noreply.github.com
Expand All @@ -1259,7 +1259,7 @@
alternate_emails:
- ad-team+condabot@anaconda.com
- 18747875+conda-bot@users.noreply.github.com
num_commits: 66
num_commits: 35
first_commit: 2022-01-17 18:09:22
- name: Uwe L. Korn
email: xhochy@users.noreply.github.com
Expand All @@ -1268,7 +1268,7 @@
- name: Daniel Holth
email: dholth@anaconda.com
github: dholth
num_commits: 10
num_commits: 12
first_commit: 2022-04-28 05:22:14
- name: Rylan Chord
email: rchord@users.noreply.github.com
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cla.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
# (default: secrets.GITHUB_TOKEN)
token: ${{ secrets.CLA_ACTION_TOKEN }}
# [required]
# Label to apply to contributor's PR once CLA is singed
# Label to apply to contributor's PR once CLA is signed
label: cla-signed

# [required]
Expand Down
8 changes: 4 additions & 4 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,15 @@ repos:
- id: check-merge-conflict
# Python verification and formatting
- repo: https://github.com/Lucas-C/pre-commit-hooks
rev: v1.5.1
rev: v1.5.4
hooks:
# auto inject license blurb
- id: insert-license
files: \.py$
args: [--license-filepath, .github/disclaimer.txt, --no-extra-eol]
exclude: ^conda_build/version.py
- repo: https://github.com/asottile/pyupgrade
rev: v3.9.0
rev: v3.10.1
hooks:
# upgrade standard Python codes
- id: pyupgrade
Expand All @@ -58,7 +58,7 @@ repos:
# auto sort Python imports
- id: isort
- repo: https://github.com/psf/black
rev: 23.3.0
rev: 23.7.0
hooks:
# auto format Python codes
- id: black
Expand All @@ -69,7 +69,7 @@ repos:
- id: blacken-docs
additional_dependencies: [black]
- repo: https://github.com/PyCQA/flake8
rev: 6.0.0
rev: 6.1.0
hooks:
# lint Python codes
- id: flake8
18 changes: 18 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Loading

0 comments on commit c2bfe2b

Please sign in to comment.