From 6c53bf799b20af69c845459f0f0ba419d8582b7b Mon Sep 17 00:00:00 2001 From: geisserml Date: Tue, 31 Oct 2023 14:55:07 +0100 Subject: [PATCH] try if dependency is honored w/ local channel --- .github/workflows/conda.yaml | 6 ++---- setupsrc/pypdfium2_setup/craft_packages.py | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/conda.yaml b/.github/workflows/conda.yaml index c374f141d..5d95deaa8 100644 --- a/.github/workflows/conda.yaml +++ b/.github/workflows/conda.yaml @@ -45,7 +45,7 @@ jobs: with: auto-update-conda: true python-version: ${{ inputs.py_version }} - channels: bblanchon,pypdfium2-team + channels: bblanchon,pypdfium2-team,local channel-priority: strict - name: Prepare @@ -90,7 +90,7 @@ jobs: with: auto-update-conda: true python-version: ${{ matrix.py }} - channels: bblanchon,pypdfium2-team + channels: bblanchon,pypdfium2-team,local channel-priority: strict - name: Download packages @@ -99,12 +99,10 @@ jobs: name: conda_package path: conda/transfer/ - # FIXME package pdfium-binaries dependency not honored?? - name: Prepare run: | python -VV ls -l conda/transfer/ - conda install -y bblanchon::pdfium-binaries conda install -y conda/transfer/*.tar.bz2 - name: Test raw package diff --git a/setupsrc/pypdfium2_setup/craft_packages.py b/setupsrc/pypdfium2_setup/craft_packages.py index 5e6153fe9..b567aca7a 100644 --- a/setupsrc/pypdfium2_setup/craft_packages.py +++ b/setupsrc/pypdfium2_setup/craft_packages.py @@ -20,7 +20,7 @@ P_CONDA_RAW = "conda_raw" P_CONDA_HELPERS = "conda_helpers" -CondaChannels = ("-c", "bblanchon", "-c", "pypdfium2-team") +CondaChannels = ("-c", "bblanchon", "-c", "pypdfium2-team", "-c", "local") CondaDir = ProjectDir / "conda"