Update `feature/plugins` Feature Branch #11892

beeankha · 2022-09-27T19:34:33Z

Merging latest main changes into feature/plugins

* Rename conda.recipe to recipe * Add news

Co-authored-by: Jannis Leidel <jannis@leidel.info> Co-authored-by: Bianca Henderson <bhenderson@anaconda.com>

Co-authored-by: Conda Bot <conda-bot@users.noreply.github.com>

updates: - [github.com/akaihola/darker: 1.5.0 → 1.5.1](akaihola/darker@1.5.0...1.5.1) - [github.com/PyCQA/pylint: v2.15.0 → v2.15.2](pylint-dev/pylint@v2.15.0...v2.15.2) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

* Fixes an issue that we are having with carnary builds See this issue for more information: conda/conda-build#4572 * undoing upates to cytoolz

Change all references to `triaging` to `issue sorting` per conda/infrastructure#575

* Updated .authors.yml * Updated .mailmap * Updated news * Updated authorship for 22.9.0 * Updated CHANGELOG for 22.9.0 * Added first contributions * Update CHANGELOG.md Co-authored-by: Ken Odegard <kodegard@anaconda.com> * Update CHANGELOG.md Co-authored-by: Ken Odegard <kodegard@anaconda.com> * Update CHANGELOG.md Co-authored-by: Ken Odegard <kodegard@anaconda.com> * Update CHANGELOG.md Co-authored-by: Ken Odegard <kodegard@anaconda.com> * Update CHANGELOG.md Co-authored-by: Ken Odegard <kodegard@anaconda.com> * Add special announcement to changelog. * Remove emoji to not freak out rever. Co-authored-by: Jannis Leidel <jannis@leidel.info> Co-authored-by: Ken Odegard <kodegard@anaconda.com>

updates: - [github.com/PyCQA/pylint: v2.15.2 → v2.15.3](pylint-dev/pylint@v2.15.2...v2.15.3) 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>

Updating the flask to address multiple CVEs including ones listed in #11831

* Try using maintained ruamel.yaml The conda specific fork is maintained as a conda package only in https://github.com/conda-forge/ruamel_yaml-feedstock/tree/master/recipe. My understanding of what's being patched there seems to indicate it's just the __init__.py file. I'm hoping just a rename of the import will be enough, or at least surface what real problems exist. Ref #10691 * Only use ruamel.yaml * Use updated ruamel.yaml API stringio * Cache yaml parsers * TEMP CI CHANGE, REMOVE BEFORE MERGE * Add ruamel_yaml fallback * Add news * Undo CI fixes * Update news Co-authored-by: YuviPanda <yuvipanda@gmail.com> Co-authored-by: Orion Poplawski <orion@nwra.com>

* document conda-build: pkg_format: 2 * Apply suggestions from code review Co-authored-by: Katherine Kinnaman <kkinnaman@anaconda.com>

dholth

LGTM

jezdez · 2022-09-28T08:15:18Z

Thank you @beeankha!

* Add `win-arm64` as a recognized platform (conda#11778) * Rename `conda.recipe` to `recipe` (conda#11774) * Rename conda.recipe to recipe * Add news * Update canary-release action version (conda#11799) * Updated conda CLI help to be better for users. (conda#11708) Co-authored-by: Jannis Leidel <jannis@leidel.info> Co-authored-by: Bianca Henderson <bhenderson@anaconda.com> * 🔄 Synced file(s) with conda/infra (conda#11827) Co-authored-by: Conda Bot <conda-bot@users.noreply.github.com> * Fix pypy win (conda#11734) * [pre-commit.ci] pre-commit autoupdate (conda#11833) updates: - [github.com/akaihola/darker: 1.5.0 → 1.5.1](akaihola/darker@1.5.0...1.5.1) - [github.com/PyCQA/pylint: v2.15.0 → v2.15.2](pylint-dev/pylint@v2.15.0...v2.15.2) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> * Fixes an issue that we are having with carnary builds (conda#11803) * Fixes an issue that we are having with carnary builds See this issue for more information: conda/conda-build#4572 * undoing upates to cytoolz * Update CONTRIBUTING.md (conda#11816) Change all references to `triaging` to `issue sorting` per conda/infrastructure#575 * Release 22.9.0 (conda#11844) * Updated .authors.yml * Updated .mailmap * Updated news * Updated authorship for 22.9.0 * Updated CHANGELOG for 22.9.0 * Added first contributions * Update CHANGELOG.md Co-authored-by: Ken Odegard <kodegard@anaconda.com> * Update CHANGELOG.md Co-authored-by: Ken Odegard <kodegard@anaconda.com> * Update CHANGELOG.md Co-authored-by: Ken Odegard <kodegard@anaconda.com> * Update CHANGELOG.md Co-authored-by: Ken Odegard <kodegard@anaconda.com> * Update CHANGELOG.md Co-authored-by: Ken Odegard <kodegard@anaconda.com> * Add special announcement to changelog. * Remove emoji to not freak out rever. Co-authored-by: Jannis Leidel <jannis@leidel.info> Co-authored-by: Ken Odegard <kodegard@anaconda.com> * Expose --mach and --arch to devenv script (conda#11851) * [pre-commit.ci] pre-commit autoupdate (conda#11859) updates: - [github.com/PyCQA/pylint: v2.15.2 → v2.15.3](pylint-dev/pylint@v2.15.2...v2.15.3) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> * 🔄 Synced file(s) with conda/infra (conda#11853) Co-authored-by: Conda Bot <conda-bot@users.noreply.github.com> * Require `ruamel.yaml` (conda#11868) * Update requirements.txt (conda#11842) Updating the flask to address multiple CVEs including ones listed in conda#11831 * Grammatical correction in docs (conda#11870) * Removed allow_other_channels from conda docs. (conda#11866) * Use maintained `ruamel.yaml` (conda#11837) * Try using maintained ruamel.yaml The conda specific fork is maintained as a conda package only in https://github.com/conda-forge/ruamel_yaml-feedstock/tree/master/recipe. My understanding of what's being patched there seems to indicate it's just the __init__.py file. I'm hoping just a rename of the import will be enough, or at least surface what real problems exist. Ref conda#10691 * Only use ruamel.yaml * Use updated ruamel.yaml API stringio * Cache yaml parsers * TEMP CI CHANGE, REMOVE BEFORE MERGE * Add ruamel_yaml fallback * Add news * Undo CI fixes * Update news Co-authored-by: YuviPanda <yuvipanda@gmail.com> Co-authored-by: Orion Poplawski <orion@nwra.com> * document conda-build: pkg_format: 2 (conda#11881) * document conda-build: pkg_format: 2 * Apply suggestions from code review Co-authored-by: Katherine Kinnaman <kkinnaman@anaconda.com> Co-authored-by: Cheng H. Lee <chenghlee@users.noreply.github.com> Co-authored-by: Ken Odegard <kodegard@anaconda.com> Co-authored-by: Katherine Kinnaman <kkinnaman@anaconda.com> Co-authored-by: Jannis Leidel <jannis@leidel.info> Co-authored-by: Conda Bot <18747875+conda-bot@users.noreply.github.com> Co-authored-by: Conda Bot <conda-bot@users.noreply.github.com> Co-authored-by: Isuru Fernando <isuruf@gmail.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Travis Hathaway <travis.j.hathaway@gmail.com> Co-authored-by: Shaun Walbridge <46331011+scdub@users.noreply.github.com> Co-authored-by: Nikhil Raverkar <raverkar.nikhil@gmail.com> Co-authored-by: Satyam Vyas <vyas.satyam.04@gmail.com> Co-authored-by: YuviPanda <yuvipanda@gmail.com> Co-authored-by: Orion Poplawski <orion@nwra.com> Co-authored-by: Daniel Holth <dholth@anaconda.com>

chenghlee and others added 19 commits September 1, 2022 12:32

Add win-arm64 as a recognized platform (#11778)

9f16472

Rename conda.recipe to recipe (#11774)

7c5e2cd

* Rename conda.recipe to recipe * Add news

Update canary-release action version (#11799)

6519f43

Updated conda CLI help to be better for users. (#11708)

1d44ac0

Co-authored-by: Jannis Leidel <jannis@leidel.info> Co-authored-by: Bianca Henderson <bhenderson@anaconda.com>

🔄 Synced file(s) with conda/infra (#11827)

6f76e4c

Co-authored-by: Conda Bot <conda-bot@users.noreply.github.com>

Fix pypy win (#11734)

16f4c40

Fixes an issue that we are having with carnary builds (#11803)

c25cdbb

* Fixes an issue that we are having with carnary builds See this issue for more information: conda/conda-build#4572 * undoing upates to cytoolz

Update CONTRIBUTING.md (#11816)

de3db7f

Change all references to `triaging` to `issue sorting` per conda/infrastructure#575

Expose --mach and --arch to devenv script (#11851)

dcf517e

[pre-commit.ci] pre-commit autoupdate (#11859)

f39113e

updates: - [github.com/PyCQA/pylint: v2.15.2 → v2.15.3](pylint-dev/pylint@v2.15.2...v2.15.3) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

🔄 Synced file(s) with conda/infra (#11853)

264a59f

Co-authored-by: Conda Bot <conda-bot@users.noreply.github.com>

Require ruamel.yaml (#11868)

9cb366e

Update requirements.txt (#11842)

0ccdfa5

Updating the flask to address multiple CVEs including ones listed in #11831

Grammatical correction in docs (#11870)

cfc7c02

Removed allow_other_channels from conda docs. (#11866)

b83abc2

document conda-build: pkg_format: 2 (#11881)

6918d6f

* document conda-build: pkg_format: 2 * Apply suggestions from code review Co-authored-by: Katherine Kinnaman <kkinnaman@anaconda.com>

beeankha requested a review from a team as a code owner September 27, 2022 19:34

conda-bot added the cla-signed [bot] added once the contributor has signed the CLA label Sep 27, 2022

dholth approved these changes Sep 27, 2022

View reviewed changes

jezdez merged commit 14a27c1 into feature/plugins Sep 28, 2022

beeankha mentioned this pull request Oct 6, 2022

Update Feature/plugins #11937

Closed

github-actions bot added the locked [bot] locked due to inactivity label Sep 29, 2023

github-actions bot locked as resolved and limited conversation to collaborators Sep 29, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Update `feature/plugins` Feature Branch #11892

Update `feature/plugins` Feature Branch #11892

Uh oh!

beeankha commented Sep 27, 2022

Uh oh!

dholth left a comment

Uh oh!

jezdez commented Sep 28, 2022

Uh oh!

Uh oh!

Update feature/plugins Feature Branch #11892

Update feature/plugins Feature Branch #11892

Uh oh!

Conversation

beeankha commented Sep 27, 2022

Uh oh!

dholth left a comment

Choose a reason for hiding this comment

Uh oh!

jezdez commented Sep 28, 2022

Uh oh!

Uh oh!

Update `feature/plugins` Feature Branch #11892

Update `feature/plugins` Feature Branch #11892