Skip to content

Commit 1b2acfd

Browse files
committed
Merge tag '26.2.1' into develop
2 parents 17de734 + 581c295 commit 1b2acfd

6 files changed

Lines changed: 32 additions & 3 deletions

File tree

‎CHANGELOG‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22
ChangeLog
33
*********
44

5+
26.2.1 (2026-10-19)
6+
===================
7+
- Update rst renderer to fix incorrect invocation. (thanks @Santoshkumarpuppala for the
8+
report and @ihorsokhanexoft for the fix!)
9+
510
26.2.0 (2026-10-06)
611
===================
712
- Bump newrelic dep to sync with WaterButler.

‎mfr/extensions/rst/render.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ def __init__(self, *args, **kwargs):
2121

2222
def _render(self):
2323
with open(self.file_path) as fp:
24-
body = publish_parts(fp.read(), writer_name='html')['html_body']
24+
body = publish_parts(fp.read(), writer_name='html', settings_overrides={'file_insertion_enabled': False, 'raw_enabled': False})['html_body']
2525
return self.TEMPLATE.render(base=self.assets_url, body=body)
2626

2727
@property

‎mfr/version.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = '26.2.0'
1+
__version__ = '26.2.1'

‎pyproject.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tool.poetry]
22
name = "mfr"
3-
version = "26.2.0"
3+
version = "26.2.1"
44
description = "Modular File Renderer"
55
authors = ["Center for Open Science <contact@cos.io>"]
66
readme = "README.md"
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
=====================================================================
2+
Testing fetching file content inside directory with include directive
3+
=====================================================================
4+
5+
Content of the setup.cfg file:
6+
7+
.. include:: setup.cfg
8+
:literal:

‎tests/extensions/rst/test_renderer.py‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,11 @@ def invalid_file_path():
2121
return os.path.join(os.path.dirname(os.path.abspath(__file__)), 'files', 'invalid.rst')
2222

2323

24+
@pytest.fixture
25+
def include_file_path():
26+
return os.path.join(os.path.dirname(os.path.abspath(__file__)), 'files', 'include.rst')
27+
28+
2429
@pytest.fixture
2530
def url():
2631
return 'http://osf.io/file/test.rst'
@@ -41,6 +46,11 @@ def renderer(metadata, test_file_path, url, assets_url, export_url):
4146
return RstRenderer(metadata, test_file_path, url, assets_url, export_url)
4247

4348

49+
@pytest.fixture
50+
def renderer_include(metadata, include_file_path, url, assets_url, export_url):
51+
return RstRenderer(metadata, include_file_path, url, assets_url, export_url)
52+
53+
4454
class TestRstRenderer:
4555

4656
def test_render_rst(self, renderer):
@@ -62,3 +72,9 @@ def test_render_rst_file_required(self, renderer):
6272

6373
def test_render_rst_cache_result(self, renderer):
6474
assert renderer.cache_result is True
75+
76+
def test_render_rst_disable_include(self, renderer_include, include_file_path):
77+
with open(include_file_path) as fp:
78+
body = renderer_include._render()
79+
assert '.. include:: setup.cfg' in body
80+
assert '# E501: Line too long' not in body

0 commit comments

Comments
 (0)