Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion nbformat/validator.py
Original file line number Diff line number Diff line change
Expand Up @@ -313,14 +313,19 @@ def normalize(
version = nbdict_version
if version_minor is None:
version_minor = nbdict_version_minor
return _normalize(
changes, normalized_nb = _normalize(
nbdict,
version,
version_minor,
True,
relax_add_props=relax_add_props,
strip_invalid_metadata=strip_invalid_metadata,
)
if "nbformat" in normalized_nb:
normalized_nb["nbformat"] = version
if "nbformat_minor" in normalized_nb:
normalized_nb["nbformat_minor"] = version_minor
return changes, normalized_nb


def _normalize(
Expand Down
31 changes: 28 additions & 3 deletions tests/test_validator.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
import nbformat
from nbformat import read
from nbformat.json_compat import VALIDATORS
from nbformat.validator import isvalid, iter_validate, validate
from nbformat.validator import isvalid, iter_validate, normalize, validate
from nbformat.warnings import DuplicateCellId, MissingIDFieldWarning

from .base import TestsBase
Expand Down Expand Up @@ -369,8 +369,33 @@ def test_notebook_v3_valid_without_min_version():
validate(nb)


def test_notebook_invalid_without_main_version():
pass
@pytest.mark.filterwarnings("ignore::nbformat.warnings.MissingIDFieldWarning")
def test_normalize_updates_minor_version():
"""Normalizing to v4.5 should update notebook metadata version."""

nb = {
"nbformat": 4,
"nbformat_minor": 0,
"metadata": {},
"cells": [
{
"cell_type": "code",
"metadata": {},
"source": "",
"outputs": [],
"execution_count": None,
}
],
}

changes, new_nb = normalize(nb, version_minor=5)

assert changes == 1
assert "id" in new_nb["cells"][0]

# Expected notebook version metadata
assert new_nb["nbformat"] == 4
assert new_nb["nbformat_minor"] == 5


def test_strip_invalid_metadata():
Expand Down