From 01727fc78d2fd76c650afd9faa0d580421c43e7e Mon Sep 17 00:00:00 2001 From: geisserml Date: Wed, 22 Nov 2023 15:33:29 +0100 Subject: [PATCH] setup-miniconda: correct channel prio pypdfium2-team should be prioritized over bblanchon (not that it currently matters, though) See https://github.com/conda-incubator/setup-miniconda#example-4-conda-options for how this option is applied. Top means highest priority. --- .github/workflows/conda.yaml | 5 +++-- README.md | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/conda.yaml b/.github/workflows/conda.yaml index 160abfd26..75dff8233 100644 --- a/.github/workflows/conda.yaml +++ b/.github/workflows/conda.yaml @@ -47,7 +47,7 @@ jobs: with: auto-update-conda: true python-version: ${{ inputs.py_version }} - channels: bblanchon,pypdfium2-team + channels: pypdfium2-team,bblanchon channel-priority: strict - name: Prepare @@ -128,12 +128,13 @@ jobs: steps: + # FIXME custom channels probably not necessary here - name: Miniconda setup uses: conda-incubator/setup-miniconda@v2 with: auto-update-conda: true python-version: ${{ matrix.py }} - channels: bblanchon,pypdfium2-team + channels: pypdfium2-team,bblanchon channel-priority: strict - name: Install deps diff --git a/README.md b/README.md index 4d228611c..9ab8f3676 100644 --- a/README.md +++ b/README.md @@ -60,7 +60,7 @@ pypdfium2 includes helpers to simplify common use cases, while the raw PDFium/ct uses: conda-incubator/setup-miniconda@v2 with: # ... your options - channels: bblanchon,pypdfium2-team + channels: pypdfium2-team,bblanchon channel-priority: strict ``` This is just a suggestion, you can also call `conda config` manually, or pass channels on command basis using `-c`, as discussed above.