Skip to content

Commit

Permalink
Merge pull request #137 from bollwyvl/restore-webpdf
Browse files Browse the repository at this point in the history
Restore webpdf
  • Loading branch information
blink1073 authored Jun 11, 2024
2 parents d4f3225 + 2935b3c commit 1b0de78
Show file tree
Hide file tree
Showing 8 changed files with 59 additions and 43 deletions.
2 changes: 1 addition & 1 deletion .azure-pipelines/azure-pipelines-linux.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 1 addition & 8 deletions .ci_support/linux_64_.yaml
Original file line number Diff line number Diff line change
@@ -1,15 +1,8 @@
c_stdlib:
- sysroot
c_stdlib_version:
- '2.12'
cdt_name:
- cos6
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
zip_keys:
- - c_stdlib_version
- cdt_name
- quay.io/condaforge/linux-anvil-alma-x86_64:8
4 changes: 2 additions & 2 deletions .gitattributes

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .scripts/build_steps.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 13 additions & 3 deletions README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions recipe/conda_build_config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
docker_image: # [linux and x86_64]
- quay.io/condaforge/linux-anvil-alma-x86_64:8 # [linux and x86_64]

c_stdlib_version:
- '2.18' # [linux]
57 changes: 29 additions & 28 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
{% set min_pandoc = "2.9.2" %}
{% set max_pandoc = "4.0.0" %}

{% set build = 0 %}
{% set build = 1 %}

{% set pytest_args = "-k \"not (convert_full_qualified_name or post_processor)\"" %}
{% set cov_fail_under = "71" %}
Expand Down Expand Up @@ -88,11 +88,8 @@ outputs:
run_constrained:
# other packages carry the full `run` dependency
- pandoc >={{ min_pandoc }},<{{ max_pandoc }}
# TODO: restore after https://github.com/conda-forge/staged-recipes/issues/23382
# - playwright-python >=???,<???
# avoid mixing nbconvert-core and pre-split nbconvert
# should be {{ pin_subpackage("nbconvert", exact=True) }}
# but seems to produce the wrong thing here
# can't mix noarch:generic and noarch:python with exact=True
- nbconvert ={{ version }}=*_{{ build }}

test:
Expand All @@ -111,27 +108,6 @@ outputs:
- jupyter nbconvert --help
- jupyter dejavu --help

# TODO: restore after https://github.com/conda-forge/staged-recipes/issues/23382
# - name: nbconvert-webpdf
# build:
# noarch: generic
# requirements:
# run:
# - {{ pin_subpackage("nbconvert-core", exact=True) }}
# # the pin is handled by the `run_constrained` in nbconvert-core
# - playwright-python
# test:
# requires:
# - pip
# commands:
# - pip check
# - jupyter nbconvert --version
# - jupyter dejavu --version
# - jupyter nbconvert --help
# - jupyter dejavu --help
# about:
# description: nbconvert with extra packages for browser-based PDF generation

- name: nbconvert-qtpdf
build:
noarch: generic
Expand Down Expand Up @@ -190,14 +166,39 @@ outputs:
doc_url: https://nbconvert.readthedocs.org/
dev_url: https://github.com/jupyter/nbconvert

- name: nbconvert-webpdf
build:
noarch: generic
requirements:
run:
- {{ pin_subpackage("nbconvert-core", exact=True) }}
- playwright-python
test:
source_files:
- tests/files/notebook1.ipynb
requires:
- pip
script_env:
- DISPLAY=localhost:1.0 # [linux]
commands:
- pip check
- jupyter nbconvert --version
- jupyter dejavu --version
- jupyter nbconvert --help
- jupyter dejavu --help
- playwright install chromium
- jupyter nbconvert tests/files/notebook1.ipynb --to webpdf
about:
description: nbconvert with extra packages for browser-based PDF generation

- name: nbconvert-all
build:
noarch: generic
requirements:
run:
# TODO: restore after https://github.com/conda-forge/staged-recipes/issues/23382
# - {{ pin_subpackage("nbconvert-webpdf", exact=True) }}
- {{ pin_subpackage("nbconvert-core", exact=True) }}
- {{ pin_subpackage("nbconvert-qtpdf", exact=True) }}
- {{ pin_subpackage("nbconvert-webpdf", exact=True) }}
- {{ pin_subpackage("nbconvert", exact=True) }}
test:
source_files:
Expand Down
7 changes: 7 additions & 0 deletions recipe/yum_requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,9 @@
# qtpdf
mesa-libGL
xorg-x11-server-Xvfb
# webpdf
alsa-lib
gtk3
mesa-libgbm
nspr
nss

0 comments on commit 1b0de78

Please sign in to comment.