5 ms·

Or just use jupytext and only commit the .py files. Works for us. Commits just look like normal python code, with a few comment markers for cells

Iv 7y ago
I guess you write hooks then, you don't convert on every commit?
- kevcampb 7y ago
  Jupytext works as an extension in Jupyter. Your work is saved as py automatically whenever you work on the notebook. So it's not a conversion at commit time, unlike say nbstripout
  - Iv 7y ago
    Oooohhhh! Nice! I'll install it right away!
jdnier 7y ago
Thank you for mentioning jupytext. I had read about it but had forgotten the name. https://github.com/mwouts/jupytext https://github.com/mwouts/jupytext
enriquto 7y ago
Jupytext is great. What the world needs is that it becomes--transparently--the default and we can get rid of the silly un-editable json format.
nabdab 7y ago
I love jupytext, but i feel like it’s a patch on a problem that should have just been solved. Just change jupyter to work directly in the genereres file format and skip the “pair files” hassle.
- leni536 7y ago
  Or it could be solved at the git tooling side by introducing Jupyter specific merge and diff tools.
  - SifJar 7y ago
    adding git tooling for a specific file type seems like a slippery slope, no? (assuming you are saying that git itself should have this tooling built in - if you mean some sort of addon, fair enough but then everyone who uses jupyter & git needs to install that addon)
    - leni536 7y ago
      I am not suggesting that git itself should ship with a bunch of custom merge utilities for specific file types. git ships with a mechanism that allows custom merge drivers. Setting up custom merge drivers might not be ergonomic right now, but it could have some benefits compared to the transformation approach. For example merge conflicts could result in a valid notebook and it could be manually resolved inside the notebook interface, no need to dive into the text file.

Iv 7y ago

I guess you write hooks then, you don't convert on every commit?

kevcampb 7y ago
Jupytext works as an extension in Jupyter. Your work is saved as py automatically whenever you work on the notebook. So it's not a conversion at commit time, unlike say nbstripout
- Iv 7y ago
  Oooohhhh! Nice! I'll install it right away!

jdnier 7y ago

Thank you for mentioning jupytext. I had read about it but had forgotten the name. https://github.com/mwouts/jupytext https://github.com/mwouts/jupytext

enriquto 7y ago

Jupytext is great. What the world needs is that it becomes--transparently--the default and we can get rid of the silly un-editable json format.

nabdab 7y ago

I love jupytext, but i feel like it’s a patch on a problem that should have just been solved. Just change jupyter to work directly in the genereres file format and skip the “pair files” hassle.

leni536 7y ago
Or it could be solved at the git tooling side by introducing Jupyter specific merge and diff tools.
- SifJar 7y ago
  adding git tooling for a specific file type seems like a slippery slope, no? (assuming you are saying that git itself should have this tooling built in - if you mean some sort of addon, fair enough but then everyone who uses jupyter & git needs to install that addon)
  - leni536 7y ago
    I am not suggesting that git itself should ship with a bunch of custom merge utilities for specific file types. git ships with a mechanism that allows custom merge drivers. Setting up custom merge drivers might not be ergonomic right now, but it could have some benefits compared to the transformation approach. For example merge conflicts could result in a valid notebook and it could be manually resolved inside the notebook interface, no need to dive into the text file.