Unverified Commit 2cedc9a4 authored by Nicola Soranzo's avatar Nicola Soranzo Committed by GitHub
Browse files

Merge pull request #18859 from bernt-matthias/topic/conda-defaults-24.1 

[24.1] Remove defaults channel for conda usage
parents 1a6b7fef 56fae9bc

.github/workflows/osx_startup.yaml

+2 −1
Original line number Diff line number Diff line
@@ -49,9 +49,10 @@ jobs: 
        with:

          path: .tox

          key: tox-cache-${{ runner.os }}-${{ steps.full-python-version.outputs.version }}-${{ hashFiles('galaxy root/requirements.txt') }}-osx

      - name: Install miniconda  # use this job to test using Python from a conda environment

      - name: Install miniforge  # use this job to test using Python from a conda environment

        uses: conda-incubator/setup-miniconda@v3

        with:

          miniforge-version: latest

          activate-environment: ''

      - name: Restore client cache

        uses: actions/cache@v4

doc/source/admin/dependency_resolvers.rst

+1 −1
Original line number Diff line number Diff line
@@ -207,7 +207,7 @@ debug 
ensure_channels

    Conda channels to enable by default. See https://conda.io/docs/user-guide/tasks/manage-channels.html for more

    information about channels. This defaults to the value of the global ``conda_ensure_channels`` option or

    ``iuc,conda-forge,bioconda,defaults`` otherwise.  This order should be consistent with the `Bioconda prescribed

    ``conda-forge,bioconda`` otherwise.  This order should be consistent with the `Bioconda prescribed

    order <https://github.com/bioconda/bioconda-recipes/blob/master/config.yml>`__ if it includes ``bioconda``.



auto_install

doc/source/admin/galaxy_options.rst

+1 −1
Original line number Diff line number Diff line
@@ -477,7 +477,7 @@ 
:Description:

    conda channels to enable by default

    (https://conda.io/docs/user-guide/tasks/manage-channels.html)

:Default: ``conda-forge,bioconda,defaults``

:Default: ``conda-forge,bioconda``

:Type: str

lib/galaxy/config/sample/galaxy.yml.sample

+1 −1
Original line number Diff line number Diff line
@@ -578,7 +578,7 @@ galaxy: 


  # conda channels to enable by default

  # (https://conda.io/docs/user-guide/tasks/manage-channels.html)

  #conda_ensure_channels: conda-forge,bioconda,defaults

  #conda_ensure_channels: conda-forge,bioconda



  # Use locally-built conda packages.

  #conda_use_local: false

lib/galaxy/config/schemas/config_schema.yml

+1 −1
Original line number Diff line number Diff line
@@ -359,7 +359,7 @@ mapping: 


      conda_ensure_channels:

        type: str

        default: conda-forge,bioconda,defaults

        default: conda-forge,bioconda

        required: false

        desc: |

          conda channels to enable by default