Skip to content
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

Add nbconvert version check #1333

Merged
merged 3 commits into from
Jun 23, 2023
Merged

Conversation

trungleduc
Copy link
Member

@trungleduc trungleduc commented Jun 22, 2023

References

Due to the non-backward compatible change in nbconvert 7.6.0 on markdown rendering, VoilaMarkdownRenderer class needs to be aware of the nbconvert version.

Code changes

User-facing changes

Backwards-incompatible changes

@github-actions
Copy link
Contributor

Binder 👈 Launch a Binder on branch trungleduc/voila/fix-ci

@trungleduc trungleduc added the bug Something isn't working label Jun 22, 2023
@@ -20,7 +21,11 @@
from nbconvert.exporters.html import HTMLExporter
from nbconvert.exporters.templateexporter import TemplateExporter
from nbconvert.filters.highlight import Highlight2HTML
from nbconvert.filters.markdown_mistune import IPythonRenderer, MarkdownWithMath
from nbconvert.filters.markdown_mistune import (
MISTUNE_V3,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How does it work? Doesn't this fail with an import error with prior versions?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

indeed, my error. Updated to check for the nbconvert version

@trungleduc trungleduc changed the title Add mistune version check Add nbconvert version check Jun 22, 2023
@trungleduc
Copy link
Member Author

Added a test for nbconvert< 7.6.0

@trungleduc trungleduc force-pushed the fix-ci branch 2 times, most recently from 7e38d87 to 72c206c Compare June 23, 2023 08:48
@SylvainCorlay
Copy link
Member

Should this be backported?

@trungleduc trungleduc closed this Jun 23, 2023
@trungleduc trungleduc reopened this Jun 23, 2023
@github-actions
Copy link
Contributor

github-actions bot commented Jun 23, 2023

Benchmark report

The execution time (in milliseconds) are grouped by test file, test type and browser.
For each case, the following values are computed: min <- [1st quartile - median - 3rd quartile] -> max.

Results table
Test file voila-tree-classic.ipynb voila-tree-light.ipynb voila-tree-dark.ipynb voila-tree-miami.ipynb basics.ipynb bqplot.ipynb dashboard.ipynb gridspecLayout.ipynb interactive.ipynb ipympl.ipynb mimerenderers.ipynb bokeh.ipynb multiple_widgets.ipynb query-strings.ipynb reveal.ipynb
Render
chromium
actual 105 <- [112 - 126 - 147] -> 194 79 <- [83 - 84 - 96] -> 115 86 <- [92 - 100 - 119] -> 162 95 <- [101 - 110 - 121] -> 163 3187 <- [3336 - 3435 - 3617] -> 4866 2876 <- [2903 - 2976 - 3143] -> 3529 3246 <- [3334 - 3369 - 3426] -> 3629 3265 <- [3268 - 3279 - 3408] -> 3831 2460 <- [2464 - 2492 - 2604] -> 2885 4139 <- [4324 - 4506 - 4551] -> 5261 9253 <- [9394 - 9445 - 9608] -> 9721 4539 <- [4561 - 4599 - 4695] -> 5314 4948 <- [4961 - 5008 - 5174] -> 5505 2134 <- [2193 - 2222 - 2438] -> 2664 3413 <- [3419 - 3512 - 3639] -> 3823
expected 3379 <- [3442 - 3517 - 3701] -> 3876 2976 <- [3227 - 3321 - 3421] -> 3604 3608 <- [3623 - 3709 - 3793] -> 3825 4453 <- [4453 - 4523 - 4661] -> 4748 2559 <- [2655 - 2656 - 2660] -> 2674 3982 <- [4079 - 4213 - 4356] -> 4743 12183 <- [18509 - 19553 - 20811] -> 21515 15319 <- [15660 - 15796 - 15912] -> 16056 1517 <- [1920 - 1997 - 2103] -> 2113

❗ Test metadata have changed
--- /dev/fd/63	2023-06-23 10:50:31.397103774 +0000
+++ /dev/fd/62	2023-06-23 10:50:31.401103923 +0000
@@ -4,51 +4,49 @@
     "BENCHMARK_REFERENCE": "actual"
   },
   "browsers": {
-    "chromium": "112.0.5615.29"
+    "chromium": "94.0.4595.0"
   },
   "systemInformation": {
     "cpu": {
-      "brand": "Xeon® Platinum 8171M",
+      "brand": "Xeon® E5-2673 v3",
       "cache": {
         "l1d": 65536,
         "l1i": 65536,
-        "l2": 2097152,
-        "l3": 36700160
+        "l2": 524288,
+        "l3": 31457280
       },
       "cores": 2,
-      "efficiencyCores": 0,
       "family": "6",
-      "flags": "fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ss ht syscall nx pdpe1gb rdtscp lm constant_tsc rep_good nopl xtopology cpuid pni pclmulqdq ssse3 fma cx16 pcid sse4_1 sse4_2 movbe popcnt aes xsave avx f16c rdrand hypervisor lahf_lm abm 3dnowprefetch invpcid_single pti fsgsbase bmi1 hle avx2 smep bmi2 erms invpcid rtm avx512f avx512dq rdseed adx smap clflushopt avx512cd avx512bw avx512vl xsaveopt xsavec xsaves md_clear",
+      "flags": "fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ss ht syscall nx pdpe1gb rdtscp lm constant_tsc rep_good nopl xtopology cpuid pni pclmulqdq ssse3 fma cx16 pcid sse4_1 sse4_2 movbe popcnt aes xsave avx f16c rdrand hypervisor lahf_lm abm invpcid_single pti fsgsbase bmi1 avx2 smep bmi2 erms invpcid xsaveopt md_clear",
       "governor": "",
-      "manufacturer": "Intel",
-      "model": "85",
-      "performanceCores": 2,
+      "manufacturer": "Intel®",
+      "model": "63",
       "physicalCores": 2,
       "processors": 1,
       "revision": "",
       "socket": "",
-      "speed": 2.6,
+      "speed": 2.4,
       "speedMax": null,
       "speedMin": null,
-      "stepping": "4",
-      "vendor": "Intel",
+      "stepping": "2",
+      "vendor": "GenuineIntel",
       "virtualization": false,
       "voltage": ""
     },
     "mem": {
-      "total": 7268679680
+      "total": 7291699200
     },
     "osInfo": {
       "arch": "x64",
       "build": "",
-      "codename": "Jammy Jellyfish",
+      "codename": "Focal Fossa",
       "codepage": "UTF-8",
       "distro": "Ubuntu",
-      "kernel": "5.15.0-1040-azure",
+      "kernel": "5.8.0-1040-azure",
       "logofile": "ubuntu",
       "platform": "linux",
-      "release": "22.04.2 LTS",
-      "serial": "b53da094229547778a51a873666147e4",
+      "release": "20.04.3 LTS",
+      "serial": "cfc067bfcb844f35865e279a1b0e66c5",
       "servicepack": "",
       "uefi": false
     }

@trungleduc
Copy link
Member Author

It looks like GitHub is running out of osx runner

@trungleduc
Copy link
Member Author

Should this be backported?

Yes, only to 0.4.x since 0.3.x works with nbconvert <7

Copy link
Member

@martinRenou martinRenou left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! Let's not wait for the OSX build

@martinRenou martinRenou merged commit f416ab5 into voila-dashboards:main Jun 23, 2023
17 of 20 checks passed
@trungleduc
Copy link
Member Author

@meeseeksdev please backport to 0.4.x

@lumberbot-app
Copy link

lumberbot-app bot commented Jun 23, 2023

Owee, I'm MrMeeseeks, Look at me.

There seem to be a conflict, please backport manually. Here are approximate instructions:

  1. Checkout backport branch and update it.
git checkout 0.4.x
git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
git cherry-pick -x -m1 f416ab5134cee990920d157f333103d6873dcc34
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am 'Backport PR #1333: Add nbconvert version check'
  1. Push to a named branch:
git push YOURFORK 0.4.x:auto-backport-of-pr-1333-on-0.4.x
  1. Create a PR against branch 0.4.x, I would have named this PR:

"Backport PR #1333 on branch 0.4.x (Add nbconvert version check)"

And apply the correct labels and milestones.

Congratulations — you did some good work! Hopefully your backport PR will be tested by the continuous integration and merged soon!

Remember to remove the Still Needs Manual Backport label once the PR gets merged.

If these instructions are inaccurate, feel free to suggest an improvement.

trungleduc added a commit to trungleduc/voila that referenced this pull request Jun 27, 2023
* Add mistune version check

* check nbconvert version

* Update test

(cherry picked from commit f416ab5)
martinRenou pushed a commit that referenced this pull request Jul 28, 2023
* Add mistune version check

* check nbconvert version

* Update test

(cherry picked from commit f416ab5)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working Still Needs Manual Backport
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants