From 9a44ce62358a4aed781733ff60858708c41a2080 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 29 May 2017 10:13:53 +1200 Subject: [PATCH 1/4] Update sphinx from 1.6.1 to 1.6.2 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 1251f000..b22f2f5a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,5 +5,5 @@ python-slugify==1.2.4 setuptools==35.0.2 # Required dependencies for building documentation -sphinx==1.6.1 +sphinx==1.6.2 sphinx_rtd_theme==0.2.4 From 6f2e15b8fa1d333f9b1e49a83622e47c31a2731f Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 2 Jun 2017 01:45:56 +1200 Subject: [PATCH 2/4] Update setuptools from 35.0.2 to 36.0.1 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 1251f000..4f2ae6b7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ markdown==2.6.8 Jinja2==2.9.6 python-slugify==1.2.4 -setuptools==35.0.2 +setuptools==36.0.1 # Required dependencies for building documentation sphinx==1.6.1 From 1750f8c41eafffe92eca754d7a76137100dcbd9b Mon Sep 17 00:00:00 2001 From: Hayley van Waas Date: Thu, 15 Jun 2017 12:46:59 +1200 Subject: [PATCH 3/4] Now adds all interactives to required files Also fixed typo in the docs. --- docs/source/processors/interactive.rst | 2 +- verto/processors/InteractiveBlockProcessor.py | 5 +++-- verto/tests/InteractiveTest.py | 11 ++++++----- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/docs/source/processors/interactive.rst b/docs/source/processors/interactive.rst index 7382d7e3..a029332d 100644 --- a/docs/source/processors/interactive.rst +++ b/docs/source/processors/interactive.rst @@ -74,7 +74,7 @@ Optional Tag Parameters The set of filepaths can be accessed after conversion, see :ref:`accessing_verto_data`. -The default HTML for button links is: +The default HTML for an interactive is: .. literalinclude:: ../../../verto/html-templates/interactive.html :language: css+jinja diff --git a/verto/processors/InteractiveBlockProcessor.py b/verto/processors/InteractiveBlockProcessor.py index 71ec87b3..37a295fa 100644 --- a/verto/processors/InteractiveBlockProcessor.py +++ b/verto/processors/InteractiveBlockProcessor.py @@ -62,10 +62,11 @@ def run(self, parent, blocks): text = argument_values.get('text', None) parameters = argument_values.get('parameters', None) + # add to list of interactives + self.required.add(name) + if interactive_type == 'in-page': self.scripts.add('interactive/{}/scripts.html'.format(name)) - if interactive_type != 'whole-page': - self.required.add(name) context = dict() context['type'] = interactive_type diff --git a/verto/tests/InteractiveTest.py b/verto/tests/InteractiveTest.py index 77f464ad..375e56b4 100644 --- a/verto/tests/InteractiveTest.py +++ b/verto/tests/InteractiveTest.py @@ -6,6 +6,7 @@ from verto.processors.InteractiveBlockProcessor import InteractiveBlockProcessor from verto.tests.ProcessorTest import ProcessorTest + class InteractiveTest(ProcessorTest): '''The interactive processor is a simple tag with a complex output that relies on external systems. @@ -37,7 +38,7 @@ def test_doc_example_in_page(self): expected_string = self.read_test_file(self.processor_name, 'doc_example_in_page_usage_expected.html', strip=True) self.assertEqual(expected_string, converted_test_string) - required_files={ + required_files = { 'interactives': { 'binary-cards' }, @@ -50,7 +51,7 @@ def test_doc_example_in_page(self): self.assertEqual(self.verto_extension.required_files, required_files) def test_doc_example_whole_page(self): - '''Example of an whole-page interactive. + '''Example of a whole-page interactive. ''' test_string = self.read_test_file(self.processor_name, 'doc_example_whole_page_usage.md') blocks = self.to_blocks(test_string) @@ -61,8 +62,8 @@ def test_doc_example_whole_page(self): expected_string = self.read_test_file(self.processor_name, 'doc_example_whole_page_usage_expected.html', strip=True) self.assertEqual(expected_string, converted_test_string) - required_files={ - 'interactives': set(), + required_files = { + 'interactives': {"binary-cards"}, 'images': { 'binary-cards/thumbnail.png' }, @@ -83,7 +84,7 @@ def test_doc_example_iframe(self): expected_string = self.read_test_file(self.processor_name, 'doc_example_iframe_usage_expected.html', strip=True) self.assertEqual(expected_string, converted_test_string) - required_files={ + required_files = { 'interactives': { 'binary-cards' }, From de0bd293f0534448ca72c137146f1e21ae50b607 Mon Sep 17 00:00:00 2001 From: Hayley van Waas Date: Thu, 15 Jun 2017 13:05:04 +1200 Subject: [PATCH 4/4] Bump to version 0.6.1 --- docs/source/changelog.rst | 8 ++++++++ verto/__init__.py | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/docs/source/changelog.rst b/docs/source/changelog.rst index c3a8d5d9..285f5598 100644 --- a/docs/source/changelog.rst +++ b/docs/source/changelog.rst @@ -1,6 +1,14 @@ Changelog ####################################### +0.6.1 +======================================= + +Fixes: + + - Adds all interactives to required files. + - Typo in Interactive documentation. + 0.6.0 ======================================= diff --git a/verto/__init__.py b/verto/__init__.py index 7e3917ef..f08b4bf9 100644 --- a/verto/__init__.py +++ b/verto/__init__.py @@ -1,4 +1,4 @@ # flake8: noqa from .Verto import Verto -__version__ = '0.6.0' +__version__ = '0.6.1'