Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

3.26.1 #4970

Merged
merged 15 commits into from
Aug 17, 2023
Merged

3.26.1 #4970

merged 15 commits into from
Aug 17, 2023

Conversation

dholth
Copy link
Contributor

@dholth dholth commented Aug 17, 2023

Description

#4969

Checklist - did you ...

  • Add a file to the news directory (using the template) for the next release's release notes?
  • Add / update necessary tests?
  • Add / update outdated documentation?

pre-commit-ci bot and others added 12 commits July 17, 2023 22:03
updates:
- [github.com/psf/black: 23.3.0 → 23.7.0](psf/black@23.3.0...23.7.0)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
* Custom yaml Loader

Instead of monkeypatching the yaml Loader in an attempt to avoid parsing numbers make a custom Loader where the float/int tags are entirely removed.

* Test that all int/floats are parsed as str
* Add ability to change the conjunction used by comma_join.
* Fix islist bug which caused it to incorrectly treat classes with __iter__ as lists (e.g. islist(dict)).
Co-authored-by: Conda Bot <conda-bot@users.noreply.github.com>
* [pre-commit.ci] pre-commit autoupdate

updates:
- [github.com/asottile/pyupgrade: v3.9.0 → v3.10.1](asottile/pyupgrade@v3.9.0...v3.10.1)
- [github.com/PyCQA/flake8: 6.0.0 → 6.1.0](PyCQA/flake8@6.0.0...6.1.0)

* Ignore E721

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Ken Odegard <kodegard@anaconda.com>
* delay imports in command plugin
* add news item
updates:
- [github.com/Lucas-C/pre-commit-hooks: v1.5.1 → v1.5.3](Lucas-C/pre-commit-hooks@v1.5.1...v1.5.3)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
updates:
- [github.com/Lucas-C/pre-commit-hooks: v1.5.3 → v1.5.4](Lucas-C/pre-commit-hooks@v1.5.3...v1.5.4)

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>
@conda-bot conda-bot added the cla-signed [bot] added once the contributor has signed the CLA label Aug 17, 2023
@@ -7,7 +7,7 @@
aliases:
- Mike Sarahan
- Michael Sarahan
num_commits: 4000
num_commits: 2000
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

correct-counting rever

@dholth dholth force-pushed the 3.26.1 branch 2 times, most recently from 20e3131 to 19c09e6 Compare August 17, 2023 13:50
@jezdez jezdez changed the base branch from main to 3.26.x August 17, 2023 14:16
@jezdez
Copy link
Member

jezdez commented Aug 17, 2023

For the record, the branch should have been named differently than the tag and also focused on the release branch 3.26.x. I've updated the target branch of the PR to handle that.

@jezdez jezdez merged commit c2bfe2b into 3.26.x Aug 17, 2023
8 checks passed
@jezdez jezdez deleted the 3.26.1 branch August 17, 2023 14:17
@kenodegard kenodegard mentioned this pull request Aug 29, 2023
14 tasks
@github-actions github-actions bot added the locked [bot] locked due to inactivity label Aug 17, 2024
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Aug 17, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
cla-signed [bot] added once the contributor has signed the CLA locked [bot] locked due to inactivity
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

5 participants