Skip to content

Bump onecodex to v0.17.0; remove node, npm packages, and WeasyPrint pins #46

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,9 @@ jobs:

- name: Upload Report PDFs
if: always()
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: example reports
path: diff.pdf
path: |
test/notebooks/diff.pdf
test/notebooks/example.pdf
15 changes: 0 additions & 15 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,6 @@ RUN apt-get update && apt-get install -yq --no-install-recommends \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*

# Install Node and vega-cli for server-side image rendering
RUN curl -sL https://deb.nodesource.com/setup_14.x | bash -
RUN apt-get -y install nodejs
RUN npm install -g --unsafe-perm vega-cli@5.13.0 vega-lite@4.13.0 canvas@2.6.1

RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && \
locale-gen

Expand All @@ -62,9 +57,6 @@ ENV LANG en_US.UTF-8
ENV LANGUAGE en_US.UTF-8
ENV PATH $HOME/.local/bin:$PATH

# Disable npm package update notifications (DEV-4202)
ENV NO_UPDATE_NOTIFIER=1

# Create jovyan user with UID=1000 and in the root group
# See https://github.com/jupyter/docker-stacks/issues/188
RUN useradd -m -s /bin/bash -N -u $NB_UID -g 0 $NB_USER
Expand Down Expand Up @@ -140,12 +132,5 @@ ENV PYTHONPATH "/home/jovyan/.local/lib/python3.9"
# Provide full access to the Python directory to allow for pip installs
RUN chown -R $NB_USER:root /usr/local/lib/python3.9

# Fix for transparency issue
# Pin in onecodex/onecodex once version w/ fix is released
# https://github.com/Kozea/WeasyPrint/commit/4dfe6079c2d1bd91cccfd9a7d78f8924e2dfabef
RUN pip install --force-reinstall 'git+https://github.com/Kozea/WeasyPrint.git@4dfe6079c2d1bd91cccfd9a7d78f8924e2dfabef'

RUN pip install --force-reinstall 'git+https://github.com/CourtBouillon/pydyf.git@f340fcc949382e183118b4807491b9f5cab4a89b'

# Switch to unprivileged user, jovyan
USER $NB_USER
3 changes: 1 addition & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ nbconvert==6.5.0
openpyxl==3.0.3
xlrd==1.2.0
statsmodels==0.13.2
onecodex[all,reports]==0.16.0
traitlets==5.9.0
onecodex[all,reports]==0.17.0
taxonomy==0.10.0
widgetsnbextension
Binary file modified test/notebooks/example_expected.pdf
Binary file not shown.
2 changes: 1 addition & 1 deletion test/test_render_notebook.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ def test_render_notebook():
subprocess.check_output(
[
"diff-pdf",
*("--output-diff", "diff.pdf"),
*("--output-diff", "test/notebooks/diff.pdf"),
"test/notebooks/example.pdf",
expected_path,
]
Expand Down
Loading