Remove deprecated functions

Author: kenodegard

conda_build/build.py

@@ -3501,7 +3501,7 @@ def test(
         AssertionError,
     ) as exc:
         log.warn(
-            "failed to get install actions, retrying.  exception was: %s", str(exc)
+            "failed to get package records, retrying.  exception was: %s", str(exc)
         )
         tests_failed(
             metadata,

conda_build/environ.py

@@ -67,8 +67,8 @@
 
 log = getLogger(__name__)
 
-PREFIX_ACTION = "PREFIX"
-LINK_ACTION = "LINK"
+deprecated.constant("24.3", "24.5", "PREFIX_ACTION", _PREFIX_ACTION := "PREFIX")
+deprecated.constant("24.3", "24.5", "LINK_ACTION", _LINK_ACTION := "LINK")
 
 # these are things that we provide env vars for more explicitly.  This list disables the
 #    pass-through of variant values to env vars for these keys.
@@ -852,7 +852,8 @@ def package_specs(self):
         return specs
 
 
-cached_actions = {}
+cached_precs = {}
+deprecated.constant("24.3", "24.5", "cached_actions", cached_precs)
 last_index_ts = 0
 
 
@@ -872,9 +873,9 @@ def get_package_records(
     output_folder=None,
     channel_urls=None,
 ):
-    global cached_actions
+    global cached_precs
     global last_index_ts
-    actions = {}
+    precs = {}
     log = utils.get_logger(__name__)
     conda_log_level = logging.WARN
     specs = list(specs)
@@ -912,18 +913,16 @@ def get_package_records(
         subdir,
         channel_urls,
         disable_pip,
-    ) in cached_actions and last_index_ts >= index_ts:
-        actions = cached_actions[(specs, env, subdir, channel_urls, disable_pip)].copy()
-        if PREFIX_ACTION in actions:
-            actions[PREFIX_ACTION] = prefix
+    ) in cached_precs and last_index_ts >= index_ts:
+        precs = cached_precs[(specs, env, subdir, channel_urls, disable_pip)].copy()
     elif specs:
         # this is hiding output like:
         #    Fetching package metadata ...........
         #    Solving package specifications: ..........
         with utils.LoggingContext(conda_log_level):
             with capture():
                 try:
-                    actions = _install_actions(prefix, index, specs)
+                    precs = _install_actions(prefix, index, specs)[_LINK_ACTION]
                 except (NoPackagesFoundError, UnsatisfiableError) as exc:
                     raise DependencyNeedsBuildingError(exc, subdir=subdir)
                 except (
@@ -937,7 +936,7 @@ def get_package_records(
                 ) as exc:
                     if "lock" in str(exc):
                         log.warn(
-                            "failed to get install actions, retrying.  exception was: %s",
+                            "failed to get package records, retrying.  exception was: %s",
                             str(exc),
                         )
                     elif (
@@ -966,10 +965,10 @@ def get_package_records(
                                 utils.rm_rf(pkg_dir)
                     if retries < max_env_retry:
                         log.warn(
-                            "failed to get install actions, retrying.  exception was: %s",
+                            "failed to get package records, retrying.  exception was: %s",
                             str(exc),
                         )
-                        actions = get_install_actions(
+                        precs = get_package_records(
                             prefix,
                             tuple(specs),
                             env,
@@ -987,7 +986,7 @@ def get_package_records(
                         )
                     else:
                         log.error(
-                            "Failed to get install actions, max retries exceeded."
+                            "Failed to get package records, max retries exceeded."
                         )
                         raise
         if disable_pip:
@@ -997,49 +996,10 @@ def get_package_records(
                 if not any(
                     re.match(r"^%s(?:$|[\s=].*)" % pkg, str(dep)) for dep in specs
                 ):
-                    actions[LINK_ACTION] = [
-                        prec for prec in actions[LINK_ACTION] if prec.name != pkg
-                    ]
-        utils.trim_empty_keys(actions)
-        cached_actions[(specs, env, subdir, channel_urls, disable_pip)] = actions.copy()
+                    precs = [prec for prec in precs if prec.name != pkg]
+        cached_precs[(specs, env, subdir, channel_urls, disable_pip)] = precs.copy()
         last_index_ts = index_ts
-    return actions.get(LINK_ACTION, [])
-
-
-@deprecated("24.1.0", "24.3.0", addendum="Use `get_package_records` instead.")
-def get_install_actions(
-    prefix,
-    specs,
-    env,
-    retries=0,
-    subdir=None,
-    verbose=True,
-    debug=False,
-    locking=True,
-    bldpkgs_dirs=None,
-    timeout=900,
-    disable_pip=False,
-    max_env_retry=3,
-    output_folder=None,
-    channel_urls=None,
-):
-    precs = get_package_records(
-        prefix=prefix,
-        specs=specs,
-        env=env,
-        retries=retries,
-        subdir=subdir,
-        verbose=verbose,
-        debug=debug,
-        locking=locking,
-        bldpkgs_dirs=bldpkgs_dirs,
-        timeout=timeout,
-        disable_pip=disable_pip,
-        max_env_retry=max_env_retry,
-        output_folder=output_folder,
-        channel_urls=channel_urls,
-    )
-    return {PREFIX_ACTION: prefix, LINK_ACTION: precs}
+    return precs
 
 
 def create_env(
@@ -1081,12 +1041,9 @@ def create_env(
             try:
                 with utils.try_acquire_locks(locks, timeout=config.timeout):
                     # input is a list of specs in MatchSpec format
-                    if not (
-                        hasattr(specs_or_precs, "keys")
-                        or isinstance(specs_or_precs[0], PackageRecord)
-                    ):
+                    if not isinstance(specs_or_precs[0], PackageRecord):
                         specs = list(set(specs_or_precs))
-                        actions = get_install_actions(
+                        precs = get_package_records(
                             prefix,
                             tuple(specs),
                             env,
@@ -1102,10 +1059,7 @@ def create_env(
                             channel_urls=tuple(config.channel_urls),
                         )
                     else:
-                        if not hasattr(specs_or_precs, "keys"):
-                            actions = {LINK_ACTION: specs_or_precs}
-                        else:
-                            actions = specs_or_precs
+                        precs = specs_or_precs
                     index, _, _ = get_build_index(
                         subdir=subdir,
                         bldpkgs_dir=config.bldpkgs_dir,
@@ -1116,14 +1070,13 @@ def create_env(
                         locking=config.locking,
                         timeout=config.timeout,
                     )
-                    utils.trim_empty_keys(actions)
-                    _display_actions(prefix, actions)
+                    _display_actions(prefix, precs)
                     if utils.on_win:
                         for k, v in os.environ.items():
                             os.environ[k] = str(v)
                     with env_var("CONDA_QUIET", not config.verbose, reset_context):
                         with env_var("CONDA_JSON", not config.verbose, reset_context):
-                            _execute_actions(prefix, actions)
+                            _execute_actions(prefix, precs)
             except (
                 SystemExit,
                 PaddingError,
@@ -1158,15 +1111,13 @@ def create_env(
                         )
                         config.prefix_length = 80
 
-                        host = "_h_env" in prefix
-                        # Set this here and use to create environ
-                        #   Setting this here is important because we use it below (symlink)
-                        prefix = config.host_prefix if host else config.build_prefix
-                        actions[PREFIX_ACTION] = prefix
-
                         create_env(
-                            prefix,
-                            actions,
+                            (
+                                config.host_prefix
+                                if "_h_env" in prefix
+                                else config.build_prefix
+                            ),
+                            specs_or_precs,
                             config=config,
                             subdir=subdir,
                             env=env,
@@ -1307,7 +1258,7 @@ def remove_existing_packages(dirs, fns, config):
 
 def get_pinned_deps(m, section):
     with TemporaryDirectory(prefix="_") as tmpdir:
-        actions = get_install_actions(
+        precs = get_package_records(
             tmpdir,
             tuple(m.ms_depends(section)),
             section,
@@ -1322,10 +1273,7 @@ def get_pinned_deps(m, section):
             output_folder=m.config.output_folder,
             channel_urls=tuple(m.config.channel_urls),
         )
-    runtime_deps = [
-        package_record_to_requirement(prec) for prec in actions.get(LINK_ACTION, [])
-    ]
-    return runtime_deps
+    return [package_record_to_requirement(prec) for prec in precs]
 
 
 # NOTE: The function has to retain the "install_actions" name for now since
@@ -1374,8 +1322,8 @@ def install_actions(prefix, index, specs):
         txn = solver.solve_for_transaction(prune=False, ignore_pinned=False)
         prefix_setup = txn.prefix_setups[prefix]
         actions = {
-            PREFIX_ACTION: prefix,
-            LINK_ACTION: [prec for prec in prefix_setup.link_precs],
+            _PREFIX_ACTION: prefix,
+            _LINK_ACTION: [prec for prec in prefix_setup.link_precs],
         }
         return actions
 
@@ -1384,31 +1332,23 @@ def install_actions(prefix, index, specs):
 del install_actions
 
 
-def _execute_actions(prefix, actions):
+@deprecated.argument("24.3", "24.5", "actions", rename="precs")
+def _execute_actions(prefix, precs):
     # This is copied over from https://github.com/conda/conda/blob/23.11.0/conda/plan.py#L575
     # but reduced to only the functionality actually used within conda-build.
-
     assert prefix
 
-    if LINK_ACTION not in actions:
-        log.debug(f"action {LINK_ACTION} not in actions")
-        return
-
-    link_precs = actions[LINK_ACTION]
-    if not link_precs:
-        log.debug(f"action {LINK_ACTION} has None value")
-        return
-
     # Always link menuinst first/last on windows in case a subsequent
     # package tries to import it to create/remove a shortcut
-    link_precs = [p for p in link_precs if p.name == "menuinst"] + [
-        p for p in link_precs if p.name != "menuinst"
+    precs = [
+        *(prec for prec in precs if prec.name == "menuinst"),
+        *(prec for prec in precs if prec.name != "menuinst"),
     ]
 
-    progressive_fetch_extract = ProgressiveFetchExtract(link_precs)
+    progressive_fetch_extract = ProgressiveFetchExtract(precs)
     progressive_fetch_extract.prepare()
 
-    stp = PrefixSetup(prefix, (), link_precs, (), [], ())
+    stp = PrefixSetup(prefix, (), precs, (), [], ())
     unlink_link_transaction = UnlinkLinkTransaction(stp)
 
     log.debug(" %s(%r)", "PROGRESSIVEFETCHEXTRACT", progressive_fetch_extract)
@@ -1417,7 +1357,8 @@ def _execute_actions(prefix, actions):
     unlink_link_transaction.execute()
 
 
-def _display_actions(prefix, actions):
+@deprecated.argument("24.3", "24.5", "actions", rename="precs")
+def _display_actions(prefix, precs):
     # This is copied over from https://github.com/conda/conda/blob/23.11.0/conda/plan.py#L58
     # but reduced to only the functionality actually used within conda-build.
 
@@ -1449,7 +1390,7 @@ def channel_filt(s):
     features = defaultdict(lambda: "")
     channels = defaultdict(lambda: "")
 
-    for prec in actions.get(LINK_ACTION, []):
+    for prec in precs:
         assert isinstance(prec, PackageRecord)
         pkg = prec["name"]
         channels[pkg] = channel_filt(channel_str(prec))

conda_build/noarch_python.py

@@ -6,23 +6,11 @@
 import os
 import shutil
 import sys
-from os.path import basename, dirname, isdir, isfile, join
+from os.path import basename, dirname, isfile, join
 
-from .deprecations import deprecated
 from .utils import on_win
 
 
-@deprecated("24.1", "24.3", addendum="Use `os.makedirs(exist_ok=True)` instead.")
-def _force_dir(dirname):
-    if not isdir(dirname):
-        os.makedirs(dirname)
-
-
-@deprecated("24.1", "24.3")
-def _error_exit(exit_message):
-    sys.exit("[noarch_python] %s" % exit_message)
-
-
 def rewrite_script(fn, prefix):
     """Take a file from the bin directory and rewrite it into the python-scripts
     directory with the same permissions after it passes some sanity checks for