Skip to content

Commit 2641e9f

Browse files
committed
Bump onecodex to v0.17.0; remove node, npm packages, and WeasyPrint pins
Bumped `onecodex` to v0.17.0. Removed node, vega npm packages, and WeasyPrint & traitlets pinned fixes. Due to removing node, the Dockerfile can now be built on ARM machines.
1 parent 40a538e commit 2641e9f

File tree

5 files changed

+6
-20
lines changed

5 files changed

+6
-20
lines changed

.github/workflows/test.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,9 @@ jobs:
5050
5151
- name: Upload Report PDFs
5252
if: always()
53-
uses: actions/upload-artifact@v2
53+
uses: actions/upload-artifact@v4
5454
with:
5555
name: example reports
56-
path: diff.pdf
56+
path: |
57+
test/notebooks/diff.pdf
58+
test/notebooks/example.pdf

Dockerfile

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,6 @@ RUN apt-get update && apt-get install -yq --no-install-recommends \
3838
&& apt-get clean \
3939
&& rm -rf /var/lib/apt/lists/*
4040

41-
# Install Node and vega-cli for server-side image rendering
42-
RUN curl -sL https://deb.nodesource.com/setup_14.x | bash -
43-
RUN apt-get -y install nodejs
44-
RUN npm install -g --unsafe-perm vega-cli@5.13.0 vega-lite@4.13.0 canvas@2.6.1
45-
4641
RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && \
4742
locale-gen
4843

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

65-
# Disable npm package update notifications (DEV-4202)
66-
ENV NO_UPDATE_NOTIFIER=1
67-
6860
# Create jovyan user with UID=1000 and in the root group
6961
# See https://github.com/jupyter/docker-stacks/issues/188
7062
RUN useradd -m -s /bin/bash -N -u $NB_UID -g 0 $NB_USER
@@ -140,12 +132,5 @@ ENV PYTHONPATH "/home/jovyan/.local/lib/python3.9"
140132
# Provide full access to the Python directory to allow for pip installs
141133
RUN chown -R $NB_USER:root /usr/local/lib/python3.9
142134

143-
# Fix for transparency issue
144-
# Pin in onecodex/onecodex once version w/ fix is released
145-
# https://github.com/Kozea/WeasyPrint/commit/4dfe6079c2d1bd91cccfd9a7d78f8924e2dfabef
146-
RUN pip install --force-reinstall 'git+https://github.com/Kozea/WeasyPrint.git@4dfe6079c2d1bd91cccfd9a7d78f8924e2dfabef'
147-
148-
RUN pip install --force-reinstall 'git+https://github.com/CourtBouillon/pydyf.git@f340fcc949382e183118b4807491b9f5cab4a89b'
149-
150135
# Switch to unprivileged user, jovyan
151136
USER $NB_USER

requirements.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ nbconvert==6.5.0
88
openpyxl==3.0.3
99
xlrd==1.2.0
1010
statsmodels==0.13.2
11-
onecodex[all,reports]==0.16.0
12-
traitlets==5.9.0
11+
onecodex[all,reports]==0.17.0
1312
taxonomy==0.10.0
1413
widgetsnbextension

test/notebooks/example_expected.pdf

70.4 KB
Binary file not shown.

test/test_render_notebook.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ def test_render_notebook():
6161
subprocess.check_output(
6262
[
6363
"diff-pdf",
64-
*("--output-diff", "diff.pdf"),
64+
*("--output-diff", "test/notebooks/diff.pdf"),
6565
"test/notebooks/example.pdf",
6666
expected_path,
6767
]

0 commit comments

Comments
 (0)