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.

Sign up for GitHub

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

Jump to bottom

Fixes for new nbconvert versions (v6.22) #603

Merged
merged 2 commits into from
Sep 30, 2020
Merged

Fixes for new nbconvert versions (v6.22) #603

merged 2 commits into from
Sep 30, 2020

Conversation

eguiraud
Copy link
Member

No description provided.

@etejedor @eguiraud
[JupyROOT][6356] Filter out metadata of code cells before comparing n…
26ff80a 
…otebooks

An update of nbconvert to v6.X caused a new field "execution" to appear
in the metadata section of code cells, seen in the conda nightly builds:
https://lcgapp-services.cern.ch/root-jenkins/view/conda/job/conda-nightlies/136/testReport/junit/projectroot.python/JupyROOT/roottest_python_JupyROOT_importROOT_notebook/

Such "execution" field contains timestamps that make the notebook
comparison fail. This commit filters out the metadata section
of the notebooks, not relevant for the comparison, so that the
timestamps don't interfere.
@etejedor @eguiraud
[JupyROOT][6356] Filter out execution_count field of cell outputs
b84d8ef 
After an update of nbconvert to v6.X, it was observed that the
"execution_count" field of the cell "outputs" section of an ipynb
file is no longer equivalent to the "execution_count" field that
appears one level up, which corresponds to the sequence order in
which cells were executed. Seen in the conda builds:

https://lcgapp-services.cern.ch/root-jenkins/view/conda/job/conda-nightlies/136/testReport/junit/projectroot.python/JupyROOT/roottest_python_JupyROOT_simpleCppMagic_notebook/

Since this makes the notebook comparison fail and the aforementioned
field is not relevant for the comparison, this commit filters it out.
etejedor
etejedor approved these changes Sep 30, 2020
View reviewed changes
Copy link
Contributor

@etejedor etejedor left a comment

Choose a reason for hiding this comment

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

Thanks @eguiraud !

@etejedor
Copy link
Contributor

@phsft-bot build

@phsft-bot
Copy link

Starting build on ROOT-debian10-i386/cxx14, ROOT-performance-centos7-multicore/default, ROOT-fedora30/cxx14, ROOT-fedora31/noimt, ROOT-ubuntu16/nortcxxmod, mac1014/python3, mac1015/cxx17, windows10/cxx14
How to customize builds

@phsft-bot
Copy link

Build failed on windows10/cxx14.
Running on null:C:\build\workspace\roottest-pullrequests-build
See console output.

Errors:

  • [2020-09-30T10:50:48.139Z] C:\build\workspace\roottest-pullrequests-build\root\bindings\pyroot\pythonizations\src\PyROOTStrings.h(16,10): fatal error C1083: Cannot open include file: 'DllImport.h': No such file or directory [C:\build\workspace\roottest-pullrequests-build\build\bindings\pyroot\pythonizations\ROOTPythonizations3_8.vcxproj]
  • [2020-09-30T10:50:49.143Z] C:\build\workspace\roottest-pullrequests-build\root\bindings\pyroot\pythonizations\src\PyROOTStrings.cxx(13,10): fatal error C1083: Cannot open include file: 'CPyCppyy.h': No such file or directory [C:\build\workspace\roottest-pullrequests-build\build\bindings\pyroot\pythonizations\ROOTPythonizations3_8.vcxproj]
  • [2020-09-30T10:50:50.213Z] C:\build\workspace\roottest-pullrequests-build\root\bindings\pyroot\pythonizations\src\TMemoryRegulator.h(37,10): fatal error C1083: Cannot open include file: 'CPyCppyy.h': No such file or directory [C:\build\workspace\roottest-pullrequests-build\build\bindings\pyroot\pythonizations\ROOTPythonizations3_8.vcxproj]
  • [2020-09-30T10:50:51.493Z] C:\build\workspace\roottest-pullrequests-build\root\bindings\pyroot\pythonizations\src\RPyROOTApplication.cxx(14,10): fatal error C1083: Cannot open include file: 'CPyCppyy.h': No such file or directory [C:\build\workspace\roottest-pullrequests-build\build\bindings\pyroot\pythonizations\ROOTPythonizations3_8.vcxproj]
  • [2020-09-30T10:50:51.493Z] C:\build\workspace\roottest-pullrequests-build\root\bindings\pyroot\pythonizations\src\GenericPyz.cxx(14,10): fatal error C1083: Cannot open include file: 'CPyCppyy.h': No such file or directory [C:\build\workspace\roottest-pullrequests-build\build\bindings\pyroot\pythonizations\ROOTPythonizations3_8.vcxproj]
  • [2020-09-30T10:50:51.884Z] C:\build\workspace\roottest-pullrequests-build\root\bindings\pyroot\pythonizations\src\RVecPyz.cxx(12,10): fatal error C1083: Cannot open include file: 'CPyCppyy.h': No such file or directory [C:\build\workspace\roottest-pullrequests-build\build\bindings\pyroot\pythonizations\ROOTPythonizations3_8.vcxproj]
  • [2020-09-30T10:50:52.242Z] C:\build\workspace\roottest-pullrequests-build\root\bindings\pyroot\pythonizations\src\TClassPyz.cxx(13,10): fatal error C1083: Cannot open include file: 'CPyCppyy.h': No such file or directory [C:\build\workspace\roottest-pullrequests-build\build\bindings\pyroot\pythonizations\ROOTPythonizations3_8.vcxproj]
  • [2020-09-30T10:50:52.546Z] C:\build\workspace\roottest-pullrequests-build\root\bindings\pyroot\pythonizations\src\TClonesArrayPyz.cxx(13,10): fatal error C1083: Cannot open include file: 'CPyCppyy.h': No such file or directory [C:\build\workspace\roottest-pullrequests-build\build\bindings\pyroot\pythonizations\ROOTPythonizations3_8.vcxproj]
  • [2020-09-30T10:50:52.848Z] C:\build\workspace\roottest-pullrequests-build\root\bindings\pyroot\pythonizations\src\TDirectoryFilePyz.cxx(12,10): fatal error C1083: Cannot open include file: 'CPyCppyy.h': No such file or directory [C:\build\workspace\roottest-pullrequests-build\build\bindings\pyroot\pythonizations\ROOTPythonizations3_8.vcxproj]
  • [2020-09-30T10:50:53.167Z] C:\build\workspace\roottest-pullrequests-build\root\bindings\pyroot\pythonizations\src\TDirectoryPyz.cxx(12,10): fatal error C1083: Cannot open include file: 'CPyCppyy.h': No such file or directory [C:\build\workspace\roottest-pullrequests-build\build\bindings\pyroot\pythonizations\ROOTPythonizations3_8.vcxproj]

And 11 more

@eguiraud eguiraud merged commit 1dc471b into root-project:v6-22-00-patches Sep 30, 2020
@eguiraud eguiraud deleted the fix_nbdiff_622 branch September 30, 2020 12:22
@etejedor etejedor mentioned this pull request Oct 12, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@etejedor etejedor etejedor approved these changes

Assignees
No one assigned
Labels
backport
Projects
None yet
Milestone
No milestone
3 participants
@eguiraud @etejedor @phsft-bot