Merge 23.7.x branch back into main

.authors.yml

@@ -645,7 +645,7 @@
   github: bradsaracik
 - name: Jaime Rodríguez-Guerra
   email: jaime.rogue@gmail.com
-  num_commits: 82
+  num_commits: 84
   first_commit: 2016-04-18 20:12:46
   github: jaimergp
   aliases:
@@ -930,7 +930,7 @@
   first_commit: 2017-03-23 21:48:07
 - name: Michael C. Grant
   email: mgrant@anaconda.com
-  num_commits: 307
+  num_commits: 308
   first_commit: 2020-07-14 01:45:08
   github: mcg1969
   aliases:
@@ -959,7 +959,7 @@
   - kdeldycke@scaleway.com
 - name: Jonathan J. Helmus
   email: jjhelmus@gmail.com
-  num_commits: 135
+  num_commits: 136
   first_commit: 2017-04-05 23:51:36
   github: jjhelmus
 - name: Mervin Fansler
@@ -1519,7 +1519,7 @@
   first_commit: 2019-08-26 04:18:04
 - name: Jannis Leidel
   email: jannis@leidel.info
-  num_commits: 93
+  num_commits: 100
   first_commit: 2021-06-07 16:46:45
   github: jezdez
 - name: Saranya Mahalingam
@@ -1957,7 +1957,7 @@
   first_commit: 2016-12-11 16:14:03
 - name: Ken Odegard
   email: kodegard@anaconda.com
-  num_commits: 466
+  num_commits: 546
   first_commit: 2016-09-27 18:04:21
   github: kenodegard
   aliases:
@@ -2022,7 +2022,7 @@
   github: pre-commit-ci[bot]
   aliases:
   - pre-commit-ci[bot]
-  num_commits: 53
+  num_commits: 57
   first_commit: 2021-11-16 10:37:29
 - name: Yuvi Panda
   email: yuvipanda@gmail.com
@@ -2041,7 +2041,7 @@
   first_commit: 2021-11-29 23:03:32
 - name: Conda Bot
   email: 18747875+conda-bot@users.noreply.github.com
-  num_commits: 82
+  num_commits: 104
   first_commit: 2022-01-17 20:22:29
   github: conda-bot
   aliases:
@@ -2083,7 +2083,7 @@
   github: beeankha
   alternate_emails:
   - beeankha@gmail.com
-  num_commits: 21
+  num_commits: 27
   first_commit: 2022-05-12 13:39:02
 - name: Kian-Meng Ang
   email: kianmeng.ang@gmail.com
@@ -2103,7 +2103,7 @@
 - name: Travis Hathaway
   email: travis.j.hathaway@gmail.com
   github: travishathaway
-  num_commits: 23
+  num_commits: 26
   first_commit: 2022-03-31 12:01:37
 - name: Tom Hu
   email: 88201630+thomasrockhu-codecov@users.noreply.github.com
@@ -2199,7 +2199,7 @@
   github: pkmooreanaconda
 - name: Mahe Iram Khan
   email: 65779580+ForgottenProgramme@users.noreply.github.com
-  num_commits: 7
+  num_commits: 8
   first_commit: 2022-10-07 23:21:54
   github: ForgottenProgramme
 - name: Erik Sundell
@@ -2250,7 +2250,7 @@
 - name: Dario Curreri
   email: 48800335+dariocurr@users.noreply.github.com
   github: dariocurr
-  num_commits: 1
+  num_commits: 2
   first_commit: 2022-12-07 09:10:25
 - name: Adrian Freund
   email: adrian.freund@quantco.com
@@ -2324,3 +2324,43 @@
   github: HeavenEvolved
   num_commits: 1
   first_commit: 2023-04-12 05:11:25
+- name: Katherine Abrikian
+  email: kalawac@users.noreply.github.com
+  github: kalawac
+  num_commits: 1
+  first_commit: 2023-06-02 14:46:49
+- name: Mark Edzel Potane
+  email: 1000100ten@gmail.com
+  github: mpotane
+  num_commits: 1
+  first_commit: 2023-05-30 08:40:51
+- name: Matt Kramer
+  email: matthew.robert.kramer@gmail.com
+  github: mattkram
+  num_commits: 1
+  first_commit: 2023-05-30 11:54:48
+- name: Johannes Köster
+  email: johannes.koester@uni-due.de
+  github: johanneskoester
+  num_commits: 1
+  first_commit: 2023-06-14 09:27:21
+- name: Kenneth Schackart
+  email: schackartk1@gmail.com
+  github: schackartk
+  num_commits: 1
+  first_commit: 2023-06-14 04:37:55
+- name: Loïc Estève
+  email: loic.esteve@ymail.com
+  github: lesteve
+  num_commits: 1
+  first_commit: 2023-05-30 10:31:55
+- name: Maurice Meyer
+  email: morre@mor.re
+  github: morremeyer
+  num_commits: 1
+  first_commit: 2023-07-12 07:59:22
+- name: Marco Esters
+  email: mesters@anaconda.com
+  github: marcoesters
+  num_commits: 1
+  first_commit: 2023-07-11 05:47:23

.mailmap

@@ -242,6 +242,7 @@ Joel Hull <joel.hull@continuum.io> joel.hull@continuum.io <joel.hull@continuum.i
 Joel Kim <kim.dohhyoung@gmail.com>
 Joel Tony <95355656+jay-tau@users.noreply.github.com>
 Johan Carlin <johan.carlin@gmail.com>
+Johannes Köster <johannes.koester@uni-due.de>
 John Ayad <johnhany97@gmail.com>
 John Flavin <flavinj@gmail.com>
 John Kirkham <jakirkham@gmail.com> jakirkham <kirkhamj@janelia.hhmi.org>
@@ -264,6 +265,7 @@ Kamil Kwiek <kamil.kwiek@continuum.io> irritum <kamil.kwiek@continuum.io>
 Kamil Kwiek <kamil.kwiek@continuum.io> Kamil Kwiek (irritum) <kamil.kwiek@continuum.io>
 Kannan Jayachandran <81518270+kannanjayachandran@users.noreply.github.com>
 Kara de la Marck <karadelamarck@gmail.com>
+Katherine Abrikian <kalawac@users.noreply.github.com>
 Katherine Kinnaman <kkinnaman@anaconda.com>
 Ken Odegard <kodegard@anaconda.com> kenodegard <kodegard@anaconda.com>
 Ken Odegard <kodegard@anaconda.com> kenodegard <ken.odegard@gmail.com>
@@ -277,6 +279,7 @@ Ken Odegard <kodegard@anaconda.com> Odegard, Ken <ken.odegard@bp.com>
 Ken Odegard <kodegard@anaconda.com> Odegard, Ken (Flamingo Technologies) <kodegard@anaconda.com>
 Ken Odegard <kodegard@anaconda.com> Odegard, Ken (Flamingo Technologies) <ken.odegard@gmail.com>
 Ken Odegard <kodegard@anaconda.com> Odegard, Ken (Flamingo Technologies) <ken.odegard@bp.com>
+Kenneth Schackart <schackartk1@gmail.com>
 Kerry Watson <kwatson@continuum.io> Kerry Watson <kwatson@anaconda.com>
 Kevin Deldycke <kevin@deldycke.com> Kevin Deldycke <kdeldycke@scaleway.com>
 Kfir Zvi <37975741+zvikfir@users.noreply.github.com>
@@ -288,6 +291,7 @@ Larry Bradley <larry.bradley@gmail.com>
 Lila Hickey <lila.hickey@continuum.io>
 Lorcan Hamill <lorcan@lorcanhamill.com>
 Lori A. Burns <lori.burns@gmail.com>
+Loïc Estève <loic.esteve@ymail.com>
 Luc J. Bourhis <luc_j_bourhis@mac.com>
 Luis Gutierrez <lg@luisg.net>
 Maggie Mari <maggie.mari@continuum.io>
@@ -302,10 +306,12 @@ Marcel Bargull <mbargull@users.noreply.github.com> Marcel Bargull <marcel.bargul
 Marcel Stimberg <marcel.stimberg@inserm.fr>
 Marcelo Duarte Trevisani <marcelotrevisani@users.noreply.github.com> Marcelo Duarte Trevisani <marceloduartetrevisani@gmail.com>
 Marcin Wojdyr <wojdyr@gmail.com>
+Marco Esters <mesters@anaconda.com>
 Marco Rossi <developer@marco-rossi.com>
 Marcos Vanetta <marcosvanetta@gmail.com>
 Marcus Caisey <marcus@teckna.com>
 Mario Juric <mjuric@astro.washington.edu>
+Mark Edzel Potane <1000100ten@gmail.com>
 Mark Harfouche <mark.harfouche@gmail.com>
 Mark Wiebe <mwiebe@continuum.io> Mark Wiebe <mwwiebe@gmail.com>
 Markus Gerstel <markus.gerstel@diamond.ac.uk>
@@ -315,6 +321,7 @@ Martin Kou <martin@coinalpha.com>
 Martin Prüsse <prusse@esss.com.br>
 Martin Raden <mmann@informatik.uni-freiburg.de>
 Matt Craig <mattwcraig@gmail.com>
+Matt Kramer <matthew.robert.kramer@gmail.com>
 Matthew Anderson <matta9001@gmail.com> matta9001 <matta9001@gmail.com>
 Matthew Dillon <matthewrdillon@gmail.com>
 Matthew Linebaugh <23125233+mlline00@users.noreply.github.com> mlline00 <23125233+mlline00@users.noreply.github.com>
@@ -327,6 +334,7 @@ Matthew Wardrop <mpwardrop@gmail.com>
 Matthieu Guillaumin <matthieg@amazon.com>
 MatthieuDartiailh <marul@laposte.net>
 Matti Picus <matti.picus@gmail.com> mattip <matti.picus@gmail.com>
+Maurice Meyer <morre@mor.re> morre <morre@mor.re>
 Max Reeder <reeder.max@gmail.com>
 Maximilian Noethe <maximilian.noethe@tu-dortmund.de>
 Maya Gilad <ms.maya.gilad@gmail.com> mayagilad <ms.maya.gilad@gmail.com>

.pre-commit-config.yaml

@@ -59,7 +59,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

AUTHORS.md

@@ -188,6 +188,7 @@ Authors are sorted alphabetically.
 * Joel Kim
 * Joel Tony
 * Johan Carlin
+* Johannes Köster
 * John Ayad
 * John Flavin
 * John Kirkham
@@ -206,8 +207,10 @@ Authors are sorted alphabetically.
 * Kamil Kwiek
 * Kannan Jayachandran
 * Kara de la Marck
+* Katherine Abrikian
 * Katherine Kinnaman
 * Ken Odegard
+* Kenneth Schackart
 * Kerry Watson
 * Kevin Deldycke
 * Kfir Zvi
@@ -219,6 +222,7 @@ Authors are sorted alphabetically.
 * Lila Hickey
 * Lorcan Hamill
 * Lori A. Burns
+* Loïc Estève
 * Luc J. Bourhis
 * Luis Gutierrez
 * Maggie Mari
@@ -232,10 +236,12 @@ Authors are sorted alphabetically.
 * Marcel Stimberg
 * Marcelo Duarte Trevisani
 * Marcin Wojdyr
+* Marco Esters
 * Marco Rossi
 * Marcos Vanetta
 * Marcus Caisey
 * Mario Juric
+* Mark Edzel Potane
 * Mark Harfouche
 * Mark Wiebe
 * Markus Gerstel
@@ -245,6 +251,7 @@ Authors are sorted alphabetically.
 * Martin Prüsse
 * Martin Raden
 * Matt Craig
+* Matt Kramer
 * Matthew Anderson
 * Matthew Dillon
 * Matthew Linebaugh
@@ -254,6 +261,7 @@ Authors are sorted alphabetically.
 * Matthieu Guillaumin
 * MatthieuDartiailh
 * Matti Picus
+* Maurice Meyer
 * Max Reeder
 * Maximilian Noethe
 * Maya Gilad

CHANGELOG.md

@@ -1,5 +1,82 @@
 [//]: # (current developments)
 
+## 23.7.0 (2023-07-25)
+
+### Enhancements
+
+* Add `conda.deprecations.DeprecationHandler.action` helper to deprecate `argparse.Action`s. (#12493)
+* Add support for the FreeBSD operating system and register `freebsd-64` as a known subdirectory for FreeBSD on x86-64. (#12647)
+* Do not mock `$CONDA_PREFIX` when `--name` or `--prefix` is provided. (#12696)
+* Add support for `sha256` filters in the MatchSpec syntax (e.g. `*[sha256=f453db4ffe2271ec492a2913af4e61d4a6c118201f07de757df0eff769b65d2e]`). (#12654 via #12707)
+* Add a new health check to `conda doctor` detecting altered packages in an environment by comparing expected and computed `sha256` checksums. (#12757)
+* Add new `pre_commands` and `post_commands` plugin hooks allowing plugins to run code before and after `conda` subcommands. (#12712, #12758, #12864)
+* Stop using `distutils` directly in favor of the vendored version in `setuptools` 60 and later or standard library equivalents. (#11136)
+* Add a `CITATION.cff` file to the root of the repository to make it easier for users to cite conda. (#12781)
+* Add optional `CondaSubcommand.configure_parser` allowing third-party plugins to hook into conda's argument parser. (#12814)
+* Only display third-party subcommands in `conda --help` and not for every other subcommand. (#12814, #12740)
+* Add a new config option, `no_plugins`, a` --no-plugins` command line flag, and a `CONDA_NO_PLUGINS` environment variable that disables external plugins for built-in conda commands. (#12748)
+* Register plugins using their canonical/fully-qualified name instead of the easily spoofable entry point name. (#12869)
+* De-duplicate plugin and legacy subcommands in `conda --help`. (#12893)
+* Implement a 2-phase parser to better handle plugin disabling (via `--no-plugins`). (#12910)
+* Refactor subcommand parsing to use a greedy parser since `argparse.REMAINDER` has [known issues](https://github.com/python/cpython/issues/61252). (#12910)
+
+### Bug fixes
+
+* Use `requests.exceptions.JSONDecodeError` for ensuring compatibility with different `json` implementations used by requests. This fixes a bug that caused only the first of multiple given source URLs to be tried. This also raises the minimum required requests version to 2.27.0. (#12683)
+* Don't export `__osx` virtual package when `CONDA_OVERRIDE_OSX=""`. (#12715)
+* Fix erroneous `conda deactivate` behavior of unsetting preexisting environment variables that are identical to those set during `conda activate`. (#12769)
+* Correct third-party subcommands to receive _remaining_ arguments instead of a blanket `sys.argv[2:]` which broke `conda_cli` testing. (#12814, #12910)
+
+### Deprecations
+
+* Mark `conda.base.context.context.root_dir` as pending deprecation. Use `conda.base.context.context.root_prefix` instead. (#12701)
+* Mark `conda.plugins.subcommands.doctor.cli.get_prefix` as pending deprecation. Use `conda.base.context.context.target_prefix` instead. (#12725)
+* Mark `conda.models.leased_path_entry.LeasedPathEntry` as pending deprecation. (#12735)
+* Mark `conda.models.enums.LeasedPathType` as pending deprecation. (#12735)
+* Mark `conda.common.temporary_content_in_file` as pending deprecation. Use `tempfile` instead. (#12795)
+* Mark `conda.cli.python_api` as pending deprecation. Use `conda.testing.conda_cli` fixture instead. (#12796)
+
+### Docs
+
+* Document how to use the new `pre_commands` and `post_commands` plugin hooks. (#12712, #12758)
+* Add docstrings to all public modules. (#12792)
+* Auto-generate API docs using `sphinx-autoapi`. (#12798)
+* Convert all manual redirects into config using `sphinx-reredirects`. (#12798)
+* Revise the plugins index page to make it easier to understand how to create a conda plugin. (#12802)
+* Add missing `conda env` CLI docs. (#12841)
+
+### Other
+
+* Update `tests/cli/test_main_rename.py` to use latest fixtures. (#12517)
+* Update `tests/test_activate.py` to test the new behavior. (#12769)
+* Re-enable all `conda_env` tests and remove irrelevant tests. (#12813)
+* Convert all `unittest`-style tests to `pytest`-style. (#12819)
+* Convert `tests/test-recipes` into local noarch packages instead of relying on conda-test channel and local builds. (#12879)
+
+### Contributors
+
+* @beeankha
+* @conda-bot
+* @dariocurr
+* @jaimergp
+* @jezdez
+* @johanneskoester made their first contribution in https://github.com/conda/conda/pull/12683
+* @jjhelmus
+* @kalawac made their first contribution in https://github.com/conda/conda/pull/12738
+* @kenodegard
+* @schackartk made their first contribution in https://github.com/conda/conda/pull/12781
+* @lesteve made their first contribution in https://github.com/conda/conda/pull/12715
+* @ForgottenProgramme
+* @marcoesters made their first contribution in https://github.com/conda/conda/pull/12863
+* @mpotane made their first contribution in https://github.com/conda/conda/pull/11740
+* @mattkram made their first contribution in https://github.com/conda/conda/pull/12730
+* @morremeyer made their first contribution in https://github.com/conda/conda/pull/12871
+* @mcg1969
+* @travishathaway
+* @pre-commit-ci[bot]
+
+
+
 ## 23.5.2 (2023-07-13)
 
 ### Bug fixes