Skip to content

Commit 3f33aca

Browse files
authored
Merge pull request #1487 from bernt-matthias/defaults
Remove usage of `defaults` conda channel
2 parents a02a0fe + 2cc9b4e commit 3f33aca

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

planemo/conda.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
if TYPE_CHECKING:
4141
from planemo.cli import PlanemoCliContext
4242

43-
BEST_PRACTICE_CHANNELS = ["conda-forge", "bioconda", "defaults"]
43+
BEST_PRACTICE_CHANNELS = ["conda-forge", "bioconda"]
4444

4545

4646
def build_conda_context(ctx: "PlanemoCliContext", **kwds) -> CondaContext:

planemo/options.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -617,7 +617,7 @@ def conda_ensure_channels_option():
617617
use_global_config=True,
618618
use_env_var=True,
619619
help=("Ensure conda is configured with specified comma separated " "list of channels."),
620-
default="conda-forge,bioconda,defaults",
620+
default="conda-forge,bioconda",
621621
)
622622

623623

@@ -637,7 +637,7 @@ def conda_auto_init_option():
637637
default=True,
638638
help=(
639639
"Conda dependency resolution for Galaxy will auto install "
640-
"conda itself using miniconda if not availabe on conda_prefix."
640+
"conda itself using miniforge if not availabe on conda_prefix."
641641
),
642642
)
643643

@@ -2061,7 +2061,7 @@ def mulled_conda_option():
20612061
default=None,
20622062
help=(
20632063
"Install a specific version of Conda before running the command, by "
2064-
"default the version that comes with the continuumio miniconda3 image "
2064+
"default the version that comes with the continuumio miniforge image "
20652065
"will be used under Linux and under Mac OS X Conda will be upgraded to "
20662066
"to work around a bug in 4.2."
20672067
),

0 commit comments

Comments
 (0)