merged main

kedro-org · Nov 19, 2024 · 9a17a2e · 9a17a2e
1 parent be26fe6
commit 9a17a2e
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 9 deletions.
diff --git a/package/kedro_viz/__init__.py b/package/kedro_viz/__init__.py
@@ -10,11 +10,7 @@ class KedroVizPythonVersionWarning(UserWarning):
     """Custom class for warnings about incompatibilities with Python versions."""
 
 
-<<<<<<< HEAD
 if sys.version_info >= (3, 14):
-=======
-if sys.version_info >= (3, 13):
->>>>>>> e91d156e6b37bd6f38aa4ce2bfd08095a4134239
     warnings.warn(
         """Please be advised that Kedro Viz is not yet fully
         compatible with the Python version you are currently using.""",

diff --git a/package/tests/test_import.py b/package/tests/test_import.py
@@ -4,13 +4,8 @@
 
 
 def test_import_kedro_viz_with_no_official_support_emits_warning(mocker):
-<<<<<<< HEAD
     """Test importing kedro Viz with python>=3.14 and controlled warnings should work"""
     mocker.patch("kedro_viz.sys.version_info", (3, 14))
-=======
-    """Test importing kedro Viz with python>=3.13 and controlled warnings should work"""
-    mocker.patch("kedro_viz.sys.version_info", (3, 13))
->>>>>>> e91d156e6b37bd6f38aa4ce2bfd08095a4134239
 
     # We use the parent class to avoid issues with `exec_module`
     with pytest.warns(UserWarning) as record: