Merge branch 'main' into fix_warnings_1

.pre-commit-config.yaml

@@ -1,7 +1,7 @@
 exclude: libmamba/tests/data/repodata_json_cache*
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.5.0
+    rev: v5.0.0
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer
@@ -23,16 +23,16 @@ repos:
     - id: rst-directive-colons
     - id: rst-inline-touching-normal
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.3.4
+    rev: v0.7.3
     hooks:
       - id: ruff
         args: [ --fix ]
       - id: ruff-format
   - repo: https://github.com/asottile/blacken-docs
-    rev: 1.16.0
+    rev: 1.19.1
     hooks:
       - id: blacken-docs
-        additional_dependencies: [black==22.3.0]
+        additional_dependencies: [black==24.10.0]
   - repo: https://github.com/pre-commit/mirrors-clang-format
     rev: v18.1.2
     hooks:
@@ -44,7 +44,7 @@ repos:
     hooks:
       - id: cmake-format
   - repo: https://github.com/Quantco/pre-commit-mirrors-typos
-    rev: 1.20.8
+    rev: 1.27.3
     hooks:
       - id: typos-conda
         exclude: (CHANGELOG.md)

docs/environment.yml

@@ -4,7 +4,7 @@ channels:
 dependencies:
   - myst-parser
   - six
-  - sphinx < 7
+  - sphinx=6.*
   - sphinx-book-theme
   - doxygen
   - breathe

docs/source/usage/specs.rst

@@ -141,7 +141,7 @@ Dynamic platforms (as in not known by Mamba) can only be detected with the ``[]`
 Channel
 -------
 The |Channel| are represented by a |CondaURL| and a set of platform filters.
-A display name is also available, but is not considered a stable identifiaction form of the
+A display name is also available, but is not considered a stable identification form of the
 channel, since it depends on the many configuration parameters, such as the channel alias.
 
 We construct a |Channel| by *resolving* a |UnresolvedChannel|.
@@ -156,7 +156,7 @@ All parameters that influence this resolution must be provided explicitly.
    uc = specs.UnresolvedChannel.parse("conda-forge[prius-avx42]")
    chan, *_ = specs.Channel.resolve(
        uc,
-       channel_alias=CondaURL.parse("https://repo.mamba.pm")
+       channel_alias=CondaURL.parse("https://repo.mamba.pm"),
        # ...
    )
 
@@ -174,7 +174,7 @@ There are no hard-coded names:
    uc = specs.UnresolvedChannel.parse("defaults")
    chan, *_ = specs.Channel.resolve(
        uc,
-       channel_alias=CondaURL.parse("https://repo.mamba.pm")
+       channel_alias=CondaURL.parse("https://repo.mamba.pm"),
        # ...
    )
 

libmamba/include/mamba/util/string.hpp

@@ -314,7 +314,7 @@ namespace mamba::util
      * Execute the function @p func on each element of a tuncated join iteration.
      *
      * The join iteration of an iterator pair (@p first, @p last) with a separator @p sep
-     * and a trunction symbol @p etc is define by the join iteration of either all the elements
+     * and a truncation symbol @p etc is define by the join iteration of either all the elements
      * in the iterator pair if they are less than @p threshold, a limited number of elements, with
      * middle elements represented by @p etc.
      * defined by iterating through the ``n`` elements of the iterator pair, interleaving the

libmamba/src/core/singletons.cpp

@@ -152,7 +152,7 @@ namespace mamba
 
     Console& Console::instance()
     {
-        if (!main_console)  // NOTE: this is a temptative check, not a perfect one, it is possible
+        if (!main_console)  // NOTE: this is a tentative check, not a perfect one, it is possible
                             // `main_console` becomes null after the if scope and before returning.
                             // A perfect check would involve locking a mutex, we want to avoid that
                             // here.

micromamba/tests/test_env.py

@@ -374,7 +374,7 @@ def test_env_update_pypi_with_conda_forge(tmp_home, tmp_root_prefix, tmp_path):
     env_file_yml = tmp_path / "test_env_update_pip_pkg_version_with_conda_forge.yaml"
     env_file_yml.write_text(env_yaml_content_to_update_pip_pkg_version_from_conda_forge)
 
-    # Update numpy from conda-forge is not suppposed to be done
+    # Update numpy from conda-forge is not supposed to be done
     res = helpers.run_env("update", "-p", env_prefix, "-f", env_file_yml, "-y", "--json")
     assert res["success"]