Update conda to 25.7.0 (#185)

* Update to 25.7.0

* Add news file

* Update hash

* Rebase patch

* Add patch to use default=NULL for --override-frozen

* Update build scripts

Author: Jrice1317

news/185-update-conda-25.7.0

@@ -0,0 +1,19 @@
+### Enhancements
+
+* Bump `conda` to `25.7.0`. (#185)
+
+### Bug fixes
+
+* <news item>
+
+### Deprecations
+
+* <news item>
+
+### Docs
+
+* <news item>
+
+### Other
+
+* <news item>

recipe/bld.bat

@@ -16,6 +16,8 @@ RENAME "%SP_DIR%\conda\cli\main_run.py" main_run.py.bak || goto :error
 COPY conda_src\conda\cli\main_run.py "%SP_DIR%\conda\cli\main_run.py" || goto :error
 RENAME "%SP_DIR%\conda\activate.py" activate.py.bak || goto :error
 COPY conda_src\conda\activate.py "%SP_DIR%\conda\activate.py" || goto :error
+RENAME "%SP_DIR%\conda\cli\helpers.py" helpers.py.bak || goto :error
+COPY conda_src\conda\cli\helpers.py "%SP_DIR%\conda\cli\helpers.py" || goto :error
 
 :: we need these for noarch packages with entry points to work on windows
 COPY "conda_src\conda\shell\cli-%ARCH%.exe" entry_point_base.exe || goto :error

recipe/build.sh

@@ -11,6 +11,7 @@ for fname in \
   "core/path_actions.py" \
   "deprecations.py" \
   "utils.py" \
+  "cli/helpers.py" \
 ; do
   mv "$SP_DIR/conda/${fname}" "$SP_DIR/conda/${fname}.bak"
   cp "conda_src/conda/${fname}" "$SP_DIR/conda/${fname}"

recipe/meta.yaml

@@ -1,4 +1,4 @@
-{% set conda_version = "25.5.1" %}
+{% set conda_version = "25.7.0" %}
 {% set conda_libmamba_solver_version = "25.4.0" %}
 {% set libmambapy_version = "2.0.5" %}
 {% set constructor_lower_bound = "3.12.1" %}
@@ -14,7 +14,7 @@ source:
   - path: ../
 
   - url: https://github.com/conda/conda/archive/{{ conda_version }}.tar.gz
-    sha256: 916ef440fd4344214bea523480e9b20dfb41576d5d6cdbe6eb2282708e498e85
+    sha256: 18ffef053c4f14db42870f36fab8df162dea5cb14a022a24abb1a3822ef3874c
     folder: conda_src
     # NOTE: All files affected by a patch need to be manually copied
     # from src to PREFIX in build.sh and bld.bat
@@ -23,6 +23,7 @@ source:
       - ../src/conda_patches/0002-Manipulate-PATH-directly-instead-of-_call_ing-conda.patch
       - ../src/conda_patches/0003-Restrict-search-paths.patch
       - ../src/conda_patches/0004-Fix-conda-run.patch
+      - ../src/conda_patches/0005-Use-default-NULL-for-override-frozen.patch
 
 build:
   number: 0
@@ -35,8 +36,8 @@ build:
     - '*'
   missing_dso_whitelist:          # [osx and variant == 'onedir']
     - "$RPATH/libswift*.dylib"    # [osx and variant == 'onedir']
-  rpaths:                         # [variant == 'onedir' and linux]
-    - standalone_conda/_internal  # [variant == 'onedir' and linux]
+  rpaths:                         # [linux and variant == 'onedir']
+    - standalone_conda/_internal  # [linux and variant == 'onedir']
   overlinking_ignore_patterns:   # [win and variant == 'onedir']
     - '*'                        # [win and variant == 'onedir']
   script_env:

src/conda_patches/0004-Fix-conda-run.patch

@@ -1,10 +1,19 @@
-diff --git i/conda/__init__.py w/conda/__init__.py
-index a9970a7a3..a4cf9f0ac 100644
---- i/conda/__init__.py
-+++ w/conda/__init__.py
-@@ -61,8 +61,11 @@ if os.getenv("CONDA_ROOT") is None:
+From 16646a6e08867b48d9f98a7aa0082333fbc0f118 Mon Sep 17 00:00:00 2001
+From: jaimergp <jaimergp@users.noreply.github.com>
+Date: Wed, 27 Aug 2025 15:45:55 +0200
+Subject: [PATCH] Fix conda run
+
+Co-authored-by: Jaida Rice <jaidarice@gmail.com>
+
+---
+
+diff --git a/conda/__init__.py b/conda/__init__.py
+index 3abf5c0da7241d6267b6dd2609fa7f28d4813be5..3805975b1afa0afc528b3d628895836f9905534a 100644
+--- a/conda/__init__.py
++++ b/conda/__init__.py
+@@ -59,8 +59,11 @@ if os.getenv("CONDA_ROOT") is None:
      os.environ["CONDA_ROOT"] = sys.prefix
- 
+
  #: The conda package directory.
 -CONDA_PACKAGE_ROOT = abspath(dirname(__file__))
 -#: The path within which to find the conda package.
@@ -16,56 +25,62 @@ index a9970a7a3..a4cf9f0ac 100644
  #:
  #: If `conda` is statically installed this is the site-packages. If `conda` is an editable install
  #: or otherwise uninstalled this is the git repo.
-diff --git i/conda/activate.py w/conda/activate.py
-index f3b658470..c406eed9c 100644
---- i/conda/activate.py
-+++ w/conda/activate.py
-@@ -755,6 +755,8 @@ class _Activator(metaclass=abc.ABCMeta):
+diff --git a/conda/activate.py b/conda/activate.py
+index 8b9f17e06d3b2cef8a8804a1c292d3447a4cbcd1..03656c460ec8002097feba19465729a80593cbb9 100644
+--- a/conda/activate.py
++++ b/conda/activate.py
+@@ -772,6 +772,8 @@ class _Activator(metaclass=abc.ABCMeta):
              return ""
- 
+
      def _get_activate_scripts(self, prefix):
 +        if prefix is None:
 +            return ()
          _script_extension = self.script_extension
          se_len = -len(_script_extension)
          try:
-@@ -769,6 +771,8 @@ class _Activator(metaclass=abc.ABCMeta):
+@@ -786,6 +788,8 @@ class _Activator(metaclass=abc.ABCMeta):
          )
- 
+
      def _get_deactivate_scripts(self, prefix):
 +        if prefix is None:
 +            return ()
          _script_extension = self.script_extension
          se_len = -len(_script_extension)
          try:
-diff --git i/conda/base/context.py w/conda/base/context.py
-index 34a5e6495..9ac146b2b 100644
---- i/conda/base/context.py
-+++ w/conda/base/context.py
-@@ -835,6 +835,8 @@ class Context(Configuration):
+diff --git a/conda/base/context.py b/conda/base/context.py
+index a8f56f30680d79decfb0e85a9e1ae94257c1c02d..4801003fe35e13209f2a4c27c490efb269c8a592 100644
+--- a/conda/base/context.py
++++ b/conda/base/context.py
+@@ -846,6 +846,8 @@ class Context(Configuration):
          addendum="Please use `conda.base.context.context.conda_exe_vars_dict` instead",
      )
      def conda_exe(self) -> PathType:
 +        if getattr(sys, "_MEIPASS", None):
 +            return sys.executable
          exe = "conda.exe" if on_win else "conda"
          return join(self.conda_prefix, BIN_DIRECTORY, exe)
- 
-@@ -870,9 +872,8 @@ class Context(Configuration):
-                 "CONDA_PYTHON_EXE": sys.executable,
+
+@@ -885,14 +887,9 @@ class Context(Configuration):
+                 "_CONDA_ROOT": self.conda_prefix,
              }
          else:
--            exe = "conda.exe" if on_win else "conda"
+-            exe = os.path.join(
+-                self.conda_prefix,
+-                BIN_DIRECTORY,
+-                "conda.exe" if on_win else "conda",
+-            )
              return {
--                "CONDA_EXE": os.path.join(sys.prefix, BIN_DIRECTORY, exe),
+-                "CONDA_EXE": exe,
+-                "_CONDA_EXE": exe,
 +                "CONDA_EXE": sys.executable,
++                "_CONDA_EXE": sys.executable,
                  "_CE_M": None,
                  "_CE_CONDA": None,
                  "CONDA_PYTHON_EXE": sys.executable,
-diff --git i/conda/cli/main_run.py w/conda/cli/main_run.py
-index dc7464662..767fed20d 100644
---- i/conda/cli/main_run.py
-+++ w/conda/cli/main_run.py
+diff --git a/conda/cli/main_run.py b/conda/cli/main_run.py
+index dc74646620234e206519c26b1e798f96a11a6bd7..767fed20d7f6ccd1032a60caca7ee332c1d0a454 100644
+--- a/conda/cli/main_run.py
++++ b/conda/cli/main_run.py
 @@ -88,11 +88,19 @@ def configure_parser(sub_parsers: _SubParsersAction, **kwargs) -> ArgumentParser
  def execute(args: Namespace, parser: ArgumentParser) -> int:
      from ..base.context import context
@@ -76,7 +91,7 @@ index dc7464662..767fed20d 100644
      from ..gateways.disk.delete import rm_rf
      from ..gateways.subprocess import subprocess_call
      from ..utils import wrap_subprocess_call
- 
+
 +    if paths_equal(context.target_prefix, sys.prefix):
 +        raise ArgumentError(
 +            "Cannot use 'conda run' on conda-standalone's base environment; "
@@ -86,14 +101,14 @@ index dc7464662..767fed20d 100644
      prefix_data = PrefixData.from_context()
      prefix_data.assert_environment()
      # create run script
-diff --git i/conda/utils.py w/conda/utils.py
-index b9a3cc5cc..515622286 100644
---- i/conda/utils.py
-+++ w/conda/utils.py
+diff --git a/conda/utils.py b/conda/utils.py
+index b9a3cc5cce027cf38a92efaf6bc81bfaf6d1bd15..515622286f946b4f780da5ecac8812bbb8a87739 100644
+--- a/conda/utils.py
++++ b/conda/utils.py
 @@ -13,7 +13,7 @@ from os.path import abspath, basename, dirname, isfile, join
  from pathlib import Path
  from shutil import which
- 
+
 -from . import CondaError
 +from . import CONDA_PACKAGE_ROOT, CondaError
  from .auxlib.compat import Utf8NamedTemporaryFile, shlex_split_unicode

src/conda_patches/0005-Use-default-NULL-for-override-frozen.patch

@@ -0,0 +1,27 @@
+From 42ed3ab04aca688cb4081aea5db590e40d0852d6 Mon Sep 17 00:00:00 2001
+From: Jaida Rice <jaidarice@gmail.com>
+Date: Thu, 4 Sep 2025 16:40:26 -0700
+Subject: [PATCH] Use default=NULL for --override-frozen
+
+---
+ conda/cli/helpers.py | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/conda/cli/helpers.py b/conda/cli/helpers.py
+index cab249d54..4c4512147 100644
+--- a/conda/cli/helpers.py
++++ b/conda/cli/helpers.py
+@@ -239,9 +239,12 @@ def add_output_and_prompt_options(p: ArgumentParser) -> _ArgumentGroup:
+
+
+ def add_parser_frozen_env(p: ArgumentParser):
++    from ..common.constants import NULL
++
+     p.add_argument(
+         "--override-frozen",
+         action="store_false",
++        default=NULL,
+         help="DANGEROUS. Use at your own risk. Ignore protections if the environment is frozen.",
+         dest="protect_frozen_envs",
+     )
+--