Combining filters

Author: torosdahl

Diff for: .gitattributes

@@ -1,2 +1 @@
-*.ipynb filter=remove-version
-*.ipynb filter=cached-output
+*.ipynb filter=nb-filters

Diff for: scripts/cache_filter_clean.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 temp_out=$(mktemp)
-cat > $temp_out
-jupyter nbconvert --to notebook --ClearOutputPreprocessor.enabled=True $temp_out --stdout
-rm $temp_out
+mv $temp_out $temp_out.ipynb
+cat > $temp_out.ipynb
+jupyter nbconvert --to notebook --ClearOutputPreprocessor.enabled=True $temp_out.ipynb --output $temp_out.ipynb 1>&2
+jupyter nbconvert --to notebook --config scripts/rmvers_config.py $temp_out.ipynb --stdout
+rm $temp_out.ipynb

Diff for: scripts/cache_filter_smudge.sh

@@ -3,6 +3,7 @@ temp_out=$(mktemp)
 mv $temp_out $temp_out.ipynb
 cat > $temp_out.ipynb
 jupyter nbconvert --to notebook --config scripts/convert_config.py $temp_out.ipynb --output $temp_out.ipynb 1>&2
+jupyter nbconvert --to notebook --config scripts/rmvers_config.py $temp_out.ipynb --output $temp_out.ipynb 1>&2
 jupyter trust $temp_out.ipynb > /dev/null
 cat $temp_out.ipynb
 rm $temp_out.ipynb

Diff for: scripts/removeversion.py

@@ -4,6 +4,6 @@
 class RemoveVersionPreprocessor(Preprocessor):
 
     def preprocess(self, nb, resources):
-        if 'version' in nb.metadata['language_info']:
-            del nb.metadata['language_info']['version']
-        return nb, resources
+    	if 'version' in nb.metadata['language_info']:
+    		del nb.metadata['language_info']['version']
+    	return nb, resources