diff --git a/.github/workflows/conda.yaml b/.github/workflows/conda.yaml index f785c5a68..160abfd26 100644 --- a/.github/workflows/conda.yaml +++ b/.github/workflows/conda.yaml @@ -27,6 +27,8 @@ defaults: run: shell: bash -el {0} +# TODO it would be nice to also support building both packages in one run and testing the helpers package with the newly-built raw package, but this may be failry complicated + jobs: build: @@ -90,8 +92,6 @@ jobs: with: auto-update-conda: true python-version: ${{ matrix.py }} - channels: bblanchon,pypdfium2-team - channel-priority: strict - name: Download artifact uses: actions/download-artifact@v3 @@ -99,20 +99,23 @@ jobs: name: conda_package path: conda_dist/ - - name: Install + - name: Show debug info run: | python -VV ls -l conda_dist/ - conda install -y pypdfium2_${{ inputs.package }} -c ./conda_dist/ - - name: Test raw package + # according to the docs, --override-channels disables searching config file channels, and -c options priority decreases from left to right + - name: Install/Test raw package if: inputs.package == 'raw' - run: python conda/raw/minitest.py + run: | + conda install -y pypdfium2_${{ inputs.package }} --override-channels -c ./conda_dist/ -c bblanchon + python conda/raw/minitest.py - - name: Test helpers package + - name: Install/Test helpers package if: inputs.package == 'helpers' run: | conda install -y pytest pillow numpy + conda install -y pypdfium2_${{ inputs.package }} --override-channels -c ./conda_dist/ -c pypdfium2-team -c bblanchon pytest tests/ tests_old/ publish: diff --git a/README.md b/README.md index 5bec74e97..137801016 100644 --- a/README.md +++ b/README.md @@ -40,9 +40,9 @@ pypdfium2 includes helpers to simplify common use cases, while the raw PDFium/ct Alternatively, with temporary channel config (discouraged): ```bash - conda install pypdfium2-team::pypdfium2_helpers -c bblanchon -c pypdfium2-team + conda install pypdfium2-team::pypdfium2_helpers --override-channels -c pypdfium2-team -c bblanchon ``` - + Adding the channels permanently and tightening priority is encouraged to include pypdfium2 in `conda update` by default, and to avoid accidentally replacing the install with a different channel. (If desired, you may limit the channel config to the current environment by adding `--env`.) Otherwise, you should be cautious when making changes to the environment.