From 3092f60b8cd8b5be17a33b5c5e9da9998f97a6fa Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Thu, 4 Jun 2026 10:21:12 -0400 Subject: Hook CondaCapabilities up to the delivery context --- src/lib/delivery/include/delivery.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/lib/delivery/include/delivery.h') diff --git a/src/lib/delivery/include/delivery.h b/src/lib/delivery/include/delivery.h index 3103a86..60255fe 100644 --- a/src/lib/delivery/include/delivery.h +++ b/src/lib/delivery/include/delivery.h @@ -10,6 +10,7 @@ #include "environment.h" #include "ini.h" #include "multiprocessing.h" +#include "conda.h" #define DELIVERY_PLATFORM_MAX 4 #define DELIVERY_PLATFORM_MAXLEN 65 @@ -157,6 +158,7 @@ struct Delivery { struct StrList *pip_packages_defer; ///< Python packages to be built for delivery struct StrList *pip_packages_purge; ///< Python packages to remove from a delivery (for: based_on) struct StrList *wheels_packages; ///< Wheel packages built for delivery + struct CondaCapabilities capabilities; ///< Capability information } conda; /*! \struct Runtime -- cgit From b95f5a2fed749f7fe5154927620457385b0292f8 Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Tue, 16 Jun 2026 11:40:41 -0400 Subject: Passing the conda installation directory to delivery_conda_enable isn't necessary * The delivery context already provides this path --- src/lib/delivery/include/delivery.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/lib/delivery/include/delivery.h') diff --git a/src/lib/delivery/include/delivery.h b/src/lib/delivery/include/delivery.h index 60255fe..7d846ab 100644 --- a/src/lib/delivery/include/delivery.h +++ b/src/lib/delivery/include/delivery.h @@ -356,9 +356,8 @@ void delivery_defer_packages(struct Delivery *ctx, int type); /** * Configure and activate a Conda installation based on Delivery context * @param ctx pointer to Delivery context - * @param conda_install_dir path to Conda installation */ -void delivery_conda_enable(struct Delivery *ctx, char *conda_install_dir); +void delivery_conda_enable(struct Delivery *ctx); /** * Install Conda -- cgit