Skip to content

Commit 6b3e4b2

Browse files
committed
Fix weasyprint patch with --force-reinstall & move warning filter in example notebook
1 parent 71643de commit 6b3e4b2

File tree

2 files changed

+20
-19
lines changed

2 files changed

+20
-19
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ RUN chown -R $NB_USER:root /usr/local/lib/python3.8
143143
# Fix for transparency issue
144144
# Pin in onecodex/onecodex once version w/ fix is released
145145
# https://github.com/Kozea/WeasyPrint/commit/4dfe6079c2d1bd91cccfd9a7d78f8924e2dfabef
146-
RUN pip install 'git+https://github.com/Kozea/WeasyPrint.git@4dfe6079c2d1bd91cccfd9a7d78f8924e2dfabef'
146+
RUN pip install --force-reinstall 'git+https://github.com/Kozea/WeasyPrint.git@4dfe6079c2d1bd91cccfd9a7d78f8924e2dfabef'
147147

148148
# Switch to unprivileged user, jovyan
149149
USER $NB_USER

test/notebooks/example.ipynb

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -39,20 +39,17 @@
3939
"project = ocx.Projects.get(\"d53ad03b010542e3\") # get DIABIMMUNE project by ID\n",
4040
"samples = ocx.Samples.where(project=project.id, public=True, limit=50)\n",
4141
"\n",
42-
"# filter warning because timestamp shows up in diff-pdf\n",
43-
"with warnings.catch_warnings():\n",
44-
" warnings.filterwarnings(\"ignore\", message=\".*SampleCollection contains multiple.*\")\n",
45-
" md_table = samples.metadata[[\n",
46-
" \"gender\",\n",
47-
" \"host_age\",\n",
48-
" \"geo_loc_name\",\n",
49-
" \"totalige\",\n",
50-
" \"eggs\",\n",
51-
" \"vegetables\",\n",
52-
" \"milk\",\n",
53-
" \"wheat\",\n",
54-
" \"rice\",\n",
55-
" ]]\n",
42+
"md_table = samples.metadata[[\n",
43+
" \"gender\",\n",
44+
" \"host_age\",\n",
45+
" \"geo_loc_name\",\n",
46+
" \"totalige\",\n",
47+
" \"eggs\",\n",
48+
" \"vegetables\",\n",
49+
" \"milk\",\n",
50+
" \"wheat\",\n",
51+
" \"rice\",\n",
52+
"]]\n",
5653
" \n",
5754
"display(md_table)"
5855
]
@@ -72,9 +69,13 @@
7269
"metadata": {},
7370
"outputs": [],
7471
"source": [
75-
"observed_taxa = samples.plot_metadata(vaxis=\"observed_taxa\", haxis=\"geo_loc_name\", return_chart=True)\n",
76-
"simpson = samples.plot_metadata(vaxis=\"simpson\", haxis=\"geo_loc_name\", return_chart=True)\n",
77-
"shannon = samples.plot_metadata(vaxis=\"shannon\", haxis=\"geo_loc_name\", return_chart=True)\n",
72+
"# filter warning because timestamp shows up in diff-pdf\n",
73+
"with warnings.catch_warnings():\n",
74+
" warnings.filterwarnings(\"ignore\", message=\".*SampleCollection contains multiple.*\")\n",
75+
" \n",
76+
" observed_taxa = samples.plot_metadata(vaxis=\"observed_taxa\", haxis=\"geo_loc_name\", return_chart=True)\n",
77+
" simpson = samples.plot_metadata(vaxis=\"simpson\", haxis=\"geo_loc_name\", return_chart=True)\n",
78+
" shannon = samples.plot_metadata(vaxis=\"shannon\", haxis=\"geo_loc_name\", return_chart=True)\n",
7879
"\n",
7980
"observed_taxa | simpson | shannon"
8081
]
@@ -259,7 +260,7 @@
259260
"name": "python",
260261
"nbconvert_exporter": "python",
261262
"pygments_lexer": "ipython3",
262-
"version": "3.11.3"
263+
"version": "3.11.4"
263264
},
264265
"onecodex_notebook": true
265266
},

0 commit comments

Comments
 (0)