Skip to content

[CVE Remediation] Upgrade m2r2 to 2.1.0 to address mistune vulnerabilities #396

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

Closed
mjohanse-emr wants to merge 2 commits into from
Closed

[CVE Remediation] Upgrade m2r2 to 2.1.0 to address mistune vulnerabilities #396

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
90d1d99
Update all pyproject.tomls to depend on minimum m2r2 2.1.0.
mjohanse-emr Oct 5, 2026
da22291
Run poetry lock and fix a docs build error in ni.panel.v1.
mjohanse-emr Oct 8, 2026
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
32 changes: 19 additions & 13 deletions packages/ni-grpc-extensions/poetry.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/ni-grpc-extensions/pyproject.toml
View file
Open in desktop

@bkeryan bkeryan Oct 9, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

As with urllib3, our distribution packages do not depend on m2r2 and changing pyproject.toml is not necessary. It's sufficient for Renovate to update poetry.lock:

Image

@bkeryan bkeryan Oct 9, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

After upgrading to m2r2 2.1.0, I started getting warnings in the docs build for ni.panel.v1.proto related to poorly formatted field lists:

WARNING: Field list ends without a blank line; unexpected unindent. [docutils]

This warning is being returned because some :returns: fields were being corrupted by the m2r2 convert method. I updated the process_docstring method in that package to skip m2r2 formatting in cases where a docstring has already been processed by Napoleon into RST field lists.

If your fix for this works with the old m2r2 as well then it can be merged separately from the version update. Alternately, you can add your commit to Renovate's PR.

@mjohanse-emr mjohanse-emr Oct 12, 2026

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

I'm going to close this PR. The m2r2 upgrade is handled in #398

Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ Sphinx = [
]
sphinx-rtd-theme = ">=1.0.0"
sphinx-autoapi = ">=1.8.4"
m2r2 = ">=0.3.2"
m2r2 = ">=2.1.0"
toml = ">=0.10.2"

[build-system]
Expand Down
32 changes: 19 additions & 13 deletions packages/ni.datamonikers.v1.client/poetry.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/ni.datamonikers.v1.client/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ Sphinx = [
]
sphinx-rtd-theme = ">=1.0.0"
sphinx-autoapi = ">=1.8.4"
m2r2 = ">=0.3.2"
m2r2 = ">=2.1.0"
toml = ">=0.10.2"

[build-system]
Expand Down
30 changes: 18 additions & 12 deletions packages/ni.datamonikers.v1.proto/poetry.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/ni.datamonikers.v1.proto/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ Sphinx = [
]
sphinx-rtd-theme = ">=1.0.0"
sphinx-autoapi = ">=1.8.4"
m2r2 = ">=0.3.2"
m2r2 = ">=2.1.0"
toml = ">=0.10.2"

[build-system]
Expand Down
30 changes: 18 additions & 12 deletions packages/ni.grpcdevice.v1.proto/poetry.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/ni.grpcdevice.v1.proto/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ Sphinx = [
]
sphinx-rtd-theme = ">=1.0.0"
sphinx-autoapi = ">=1.8.4"
m2r2 = ">=0.3.2"
m2r2 = ">=2.1.0"
toml = ">=0.10.2"

[build-system]
Expand Down
30 changes: 18 additions & 12 deletions packages/ni.measurementlink.discovery.v1.client/poetry.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/ni.measurementlink.discovery.v1.client/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ Sphinx = [
]
sphinx-rtd-theme = ">=1.0.0"
sphinx-autoapi = ">=1.8.4"
m2r2 = ">=0.3.2"
m2r2 = ">=2.1.0"
toml = ">=0.10.2"

[build-system]
Expand Down
Loading
Loading