Revert changes to examples so that integration tests still pass

vizro-core/changelog.d/20231108_230816_antony.milne_fix_assets_pathname.md

@@ -0,0 +1,48 @@
+<!--
+A new scriv changelog fragment.
+
+Uncomment the section that is right (remove the HTML comment wrapper).
+-->
+
+<!--
+### Highlights ✨
+
+- A bullet item for the Highlights ✨ category with a link to the relevant PR at the end of your entry, e.g. Enable feature XXX ([#1](https://github.com/mckinsey/vizro/pull/1))
+
+-->
+<!--
+### Removed
+
+- A bullet item for the Removed category with a link to the relevant PR at the end of your entry, e.g. Enable feature XXX ([#1](https://github.com/mckinsey/vizro/pull/1))
+
+-->
+<!--
+### Added
+
+- A bullet item for the Added category with a link to the relevant PR at the end of your entry, e.g. Enable feature XXX ([#1](https://github.com/mckinsey/vizro/pull/1))
+
+-->
+<!--
+### Changed
+
+- A bullet item for the Changed category with a link to the relevant PR at the end of your entry, e.g. Enable feature XXX ([#1](https://github.com/mckinsey/vizro/pull/1))
+
+-->
+<!--
+### Deprecated
+
+- A bullet item for the Deprecated category with a link to the relevant PR at the end of your entry, e.g. Enable feature XXX ([#1](https://github.com/mckinsey/vizro/pull/1))
+
+-->
+<!--
+### Fixed
+
+- A bullet item for the Fixed category with a link to the relevant PR at the end of your entry, e.g. Enable feature XXX ([#1](https://github.com/mckinsey/vizro/pull/1))
+
+-->
+<!--
+### Security
+
+- A bullet item for the Security category with a link to the relevant PR at the end of your entry, e.g. Enable feature XXX ([#1](https://github.com/mckinsey/vizro/pull/1))
+
+-->

vizro-core/examples/default/app.py

@@ -1,8 +1,5 @@
 """Example to show dashboard configuration."""
-import os
 
-import dash
-import flask
 import pandas as pd
 
 import vizro.models as vm

vizro-core/examples/from_dict/app.py

@@ -1,5 +1,4 @@
 """Example to show dashboard configuration specified as a dictionary."""
-import os
 
 import pandas as pd
 

vizro-core/examples/from_json/app.py

@@ -1,6 +1,5 @@
 """Example to show dashboard configuration specified as a JSON file."""
 import json
-import os
 from pathlib import Path
 
 import pandas as pd

vizro-core/examples/from_yaml/app.py

@@ -1,5 +1,4 @@
 """Example to show dashboard configuration specified as a YAML file."""
-import os
 from pathlib import Path
 
 import pandas as pd

vizro-core/src/vizro/_vizro.py

@@ -1,7 +1,6 @@
 import logging
-import os
-from pathlib import Path, PosixPath
-from typing import Dict, List, Tuple
+from pathlib import Path
+from typing import List
 
 import dash
 import flask
@@ -101,7 +100,8 @@ def _reset():
     @staticmethod
     def _get_external_assets(new_path: str, folder: Path, extension: str) -> List[str]:
         """Returns a list of paths to assets with given extension in folder, prefixed with new_path.
+
         e.g. with new_path="/vizro", extension="css", folder="/path/to/vizro/vizro-core/src/vizro/static",
-        we will get ["/vizro/css/accordion.css", "/vizro/css/button.css", ...]
+        we will get ["/vizro/css/accordion.css", "/vizro/css/button.css", ...].
         """
         return sorted((new_path / path.relative_to(folder)).as_posix() for path in folder.rglob(f"*.{extension}"))

vizro-core/src/vizro/models/_dashboard.py

@@ -8,7 +8,7 @@
 import dash_bootstrap_components as dbc
 import dash_daq as daq
 import plotly.io as pio
-from dash import ClientsideFunction, Input, Output, clientside_callback, html, get_relative_path
+from dash import ClientsideFunction, Input, Output, clientside_callback, get_relative_path, html
 from pydantic import Field, validator
 
 import vizro

vizro-core/tests/integration/test_examples.py

@@ -23,7 +23,6 @@ def setup_integration_test_environment(monkeypatch_session):
     # We only need to install chromedriver outside CI.
     if not os.getenv("CI"):
         chromedriver_autoinstaller_fix.install()
-    print("Done setting up integration test environment.")
 
 
 @pytest.fixture

vizro-core/tests/unit/vizro/models/test_dashboard.py

@@ -142,7 +142,8 @@ def test_dashboard_page_registry(self, dashboard, mock_page_registry):
         # Str conversion required as comparison of OrderedDict values result in False otherwise
         assert str(result.items()) == str(expected.items())
 
-    def test_create_layout_page_404(self, dashboard):
+    def test_create_layout_page_404(self, dashboard, mocker):
+        mocker.patch("vizro.models._dashboard.get_relative_path")
         result = dashboard._make_page_404_layout()
         result_image = result.children[0]
         result_div = result.children[1]