Split tests into unit/integration/functional

mwouts · Nov 9, 2023 · 6a7015c · 6a7015c
1 parent 4ccd3c6
commit 6a7015c
Show file tree

Hide file tree

Showing 94 changed files with 39 additions and 42 deletions.
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -16,7 +16,7 @@
 
 from .utils import formats_with_support_for_cell_metadata
 
-# Pytest's tmpdir is in /tmp (at least for me), so this helps avoiding interferences between
+# Pytest's tmpdir is in /tmp (at least for me), so this helps to avoid interferences between
 # global configuration on HOME and the test collection
 jupytext.config.JUPYTEXT_CEILING_DIRECTORIES = ["/tmp/"]
 

diff --git a/tests/functional/__init__.py b/tests/functional/__init__.py
diff --git a/tests/functional/cli/__init__.py b/tests/functional/cli/__init__.py
diff --git a/tests/test_black.py → tests/functional/cli/test_black.py b/tests/test_black.py → tests/functional/cli/test_black.py
@@ -11,7 +11,7 @@
 from jupytext.compare import compare, compare_cells, compare_notebooks
 from jupytext.header import _DEFAULT_NOTEBOOK_METADATA
 
-from .utils import list_notebooks, requires_autopep8, requires_black, requires_flake8
+from ...utils import list_notebooks, requires_autopep8, requires_black, requires_flake8
 
 
 @requires_black

diff --git a/tests/test_cli.py → tests/functional/cli/test_cli.py b/tests/test_cli.py → tests/functional/cli/test_cli.py
@@ -19,7 +19,7 @@
 from jupytext.formats import JupytextFormatError, long_form_one_format
 from jupytext.paired_paths import InconsistentPath, paired_paths
 
-from .utils import (
+from ...utils import (
     list_notebooks,
     requires_jupytext_installed,
     requires_myst,

diff --git a/tests/test_cli_check.py → tests/functional/cli/test_cli_check.py b/tests/test_cli_check.py → tests/functional/cli/test_cli_check.py
@@ -4,7 +4,7 @@
 from jupytext import write
 from jupytext.cli import jupytext
 
-from .utils import requires_black
+from ...utils import requires_black
 
 
 @pytest.fixture

diff --git a/tests/test_cli_config.py → tests/functional/cli/test_cli_config.py b/tests/test_cli_config.py → tests/functional/cli/test_cli_config.py
diff --git a/tests/test_execute.py → tests/functional/cli/test_execute.py b/tests/test_execute.py → tests/functional/cli/test_execute.py
@@ -7,7 +7,7 @@
 from jupytext.cli import jupytext
 from jupytext.version import __version__
 
-from .utils import (
+from ...utils import (
     requires_ir_kernel,
     requires_nbconvert,
     requires_user_kernel_python3,

diff --git a/tests/test_isort.py → tests/functional/cli/test_isort.py b/tests/test_isort.py → tests/functional/cli/test_isort.py
@@ -2,7 +2,7 @@
 from jupytext.cli import pipe_notebook
 from jupytext.compare import compare
 
-from .utils import requires_isort
+from ...utils import requires_isort
 
 
 @requires_isort

diff --git a/tests/functional/contents_manager/__init__.py b/tests/functional/contents_manager/__init__.py
diff --git a/tests/test_cm_config.py → ...tional/contents_manager/test_cm_config.py b/tests/test_cm_config.py → ...tional/contents_manager/test_cm_config.py
@@ -11,8 +11,7 @@
 import jupytext
 from jupytext import TextFileContentsManager
 from jupytext.compare import compare_cells
-
-from .utils import notebook_model
+from tests.utils import notebook_model
 
 SAMPLE_NOTEBOOK = new_notebook(
     cells=[new_markdown_cell("A Markdown cell"), new_code_cell("# A code cell\n1 + 1")]

diff --git a/tests/test_contentsmanager.py → .../contents_manager/test_contentsmanager.py b/tests/test_contentsmanager.py → .../contents_manager/test_contentsmanager.py
@@ -17,7 +17,7 @@
 from jupytext.jupytext import read, write, writes
 from jupytext.kernels import kernelspec_from_language
 
-from .utils import (
+from ...utils import (
     list_notebooks,
     notebook_model,
     requires_pandoc,

diff --git a/tests/test_load_multiple.py → ...al/contents_manager/test_load_multiple.py b/tests/test_load_multiple.py → ...al/contents_manager/test_load_multiple.py
diff --git a/tests/functional/docs/__init__.py b/tests/functional/docs/__init__.py
diff --git a/tests/test_changelog.py → tests/functional/docs/test_changelog.py b/tests/test_changelog.py → tests/functional/docs/test_changelog.py
@@ -34,7 +34,7 @@ def test_replace_issue_numbers_with_links(input, output):
     sys.version_info < (3, 5), reason="'PosixPath' object has no attribute 'read_text'"
 )
 def test_update_changelog():
-    changelog_file = Path(__file__).parent.parent / "CHANGELOG.md"
+    changelog_file = Path(__file__).parent.parent.parent.parent / "CHANGELOG.md"
     cur_text = changelog_file.read_text()
     new_text = replace_issue_number_with_links(cur_text)
     if cur_text != new_text:

diff --git a/tests/test_doc_files_are_notebooks.py → ...onal/docs/test_doc_files_are_notebooks.py b/tests/test_doc_files_are_notebooks.py → ...onal/docs/test_doc_files_are_notebooks.py
@@ -6,7 +6,7 @@
 
 
 def documentation_files():
-    for path in (Path(__file__).parent.parent / "docs").iterdir():
+    for path in (Path(__file__).parent / "../../../docs").iterdir():
         if path.suffix == ".md":
             yield path
 

diff --git a/tests/test_using_cli.py → tests/functional/docs/test_using_cli.py b/tests/test_using_cli.py → tests/functional/docs/test_using_cli.py
@@ -7,9 +7,9 @@
 import jupytext
 from jupytext.cli import jupytext as jupytext_cli
 
-from .utils import requires_black, requires_myst, requires_user_kernel_python3
+from ...utils import requires_black, requires_myst, requires_user_kernel_python3
 
-doc_path = os.path.join(os.path.dirname(os.path.realpath(__file__)), "..", "docs")
+doc_path = os.path.join(os.path.dirname(__file__), "..", "..", "..", "docs")
 
 
 @requires_user_kernel_python3

diff --git a/tests/integration/__init__.py b/tests/integration/__init__.py
diff --git a/tests/integration/config/__init__.py b/tests/integration/config/__init__.py
diff --git a/tests/test_config.py → tests/integration/config/test_config.py b/tests/test_config.py → tests/integration/config/test_config.py
diff --git a/tests/integration/metadata/__init__.py b/tests/integration/metadata/__init__.py
diff --git a/tests/test_metadata_filter.py → ...egration/metadata/test_metadata_filter.py b/tests/test_metadata_filter.py → ...egration/metadata/test_metadata_filter.py
@@ -8,7 +8,7 @@
 from jupytext.compare import compare, compare_notebooks
 from jupytext.metadata_filter import filter_metadata, metadata_filter_as_dict
 
-from .utils import requires_myst
+from ...utils import requires_myst
 
 
 def to_dict(keys):

diff --git a/tests/test_metadata_filters_from_config.py → ...data/test_metadata_filters_from_config.py b/tests/test_metadata_filters_from_config.py → ...data/test_metadata_filters_from_config.py
diff --git a/tests/integration/others/__init__.py b/tests/integration/others/__init__.py
diff --git a/tests/invalid_file_896.md → tests/integration/others/invalid_file_896.md b/tests/invalid_file_896.md → tests/integration/others/invalid_file_896.md
diff --git a/tests/test_active_cells.py → ...s/integration/others/test_active_cells.py b/tests/test_active_cells.py → ...s/integration/others/test_active_cells.py
diff --git a/tests/test_auto_ext.py → tests/integration/others/test_auto_ext.py b/tests/test_auto_ext.py → tests/integration/others/test_auto_ext.py
@@ -3,7 +3,7 @@
 from jupytext import read, reads, writes
 from jupytext.formats import JupytextFormatError, auto_ext_from_metadata
 
-from .utils import list_notebooks
+from ...utils import list_notebooks
 
 
 @pytest.mark.parametrize(

diff --git a/tests/test_cell_markers.py → ...s/integration/others/test_cell_markers.py b/tests/test_cell_markers.py → ...s/integration/others/test_cell_markers.py
diff --git a/tests/test_cell_metadata.py → .../integration/others/test_cell_metadata.py b/tests/test_cell_metadata.py → .../integration/others/test_cell_metadata.py
diff --git a/tests/test_cell_tags_are_preserved.py → ...on/others/test_cell_tags_are_preserved.py b/tests/test_cell_tags_are_preserved.py → ...on/others/test_cell_tags_are_preserved.py
@@ -2,8 +2,7 @@
 from nbformat.v4.nbbase import new_code_cell, new_markdown_cell
 
 from jupytext import reads, writes
-
-from .utils import formats_with_support_for_cell_metadata, is_myst_available
+from tests.utils import formats_with_support_for_cell_metadata, is_myst_available
 
 
 @pytest.fixture()

diff --git a/tests/test_cells.py → tests/integration/others/test_cells.py b/tests/test_cells.py → tests/integration/others/test_cells.py
diff --git a/tests/test_combine.py → tests/integration/others/test_combine.py b/tests/test_combine.py → tests/integration/others/test_combine.py
@@ -6,8 +6,7 @@
 import jupytext
 from jupytext.combine import combine_inputs_with_outputs
 from jupytext.compare import compare, compare_notebooks
-
-from .utils import list_notebooks
+from tests.utils import list_notebooks
 
 
 def test_combine():

diff --git a/tests/test_custom_cell_magics.py → ...gration/others/test_custom_cell_magics.py b/tests/test_custom_cell_magics.py → ...gration/others/test_custom_cell_magics.py
diff --git a/tests/test_doxygen.py → tests/integration/others/test_doxygen.py b/tests/test_doxygen.py → tests/integration/others/test_doxygen.py
diff --git a/...st_hide_remove_input_outputs_rmarkdown.py → ...st_hide_remove_input_outputs_rmarkdown.py b/...st_hide_remove_input_outputs_rmarkdown.py → ...st_hide_remove_input_outputs_rmarkdown.py
diff --git a/tests/test_invalid_file.py → ...s/integration/others/test_invalid_file.py b/tests/test_invalid_file.py → ...s/integration/others/test_invalid_file.py
@@ -8,7 +8,7 @@
 from jupytext import TextFileContentsManager, read
 from jupytext.cli import jupytext as jupytext_cli
 
-from .utils import skip_on_windows
+from ...utils import skip_on_windows
 
 
 @pytest.fixture

diff --git a/tests/test_jupytext_errors.py → ...ntegration/others/test_jupytext_errors.py b/tests/test_jupytext_errors.py → ...ntegration/others/test_jupytext_errors.py
diff --git a/tests/test_jupytext_read.py → .../integration/others/test_jupytext_read.py b/tests/test_jupytext_read.py → .../integration/others/test_jupytext_read.py
diff --git a/tests/test_nbformat_version.py → ...tegration/others/test_nbformat_version.py b/tests/test_nbformat_version.py → ...tegration/others/test_nbformat_version.py
diff --git a/tests/test_preserve_empty_cells.py → ...ation/others/test_preserve_empty_cells.py b/tests/test_preserve_empty_cells.py → ...ation/others/test_preserve_empty_cells.py
diff --git a/tests/test_pytest.py → tests/integration/others/test_pytest.py b/tests/test_pytest.py → tests/integration/others/test_pytest.py
diff --git a/tests/test_raw_strings.py → tests/integration/others/test_raw_strings.py b/tests/test_raw_strings.py → tests/integration/others/test_raw_strings.py
diff --git a/tests/test_read_write_functions.py → ...ation/others/test_read_write_functions.py b/tests/test_read_write_functions.py → ...ation/others/test_read_write_functions.py
diff --git a/tests/test_remove_encoding.py → ...ntegration/others/test_remove_encoding.py b/tests/test_remove_encoding.py → ...ntegration/others/test_remove_encoding.py
diff --git a/...s/test_sample_notebooks_are_normalized.py → ...s/test_sample_notebooks_are_normalized.py b/...s/test_sample_notebooks_are_normalized.py → ...s/test_sample_notebooks_are_normalized.py
@@ -3,7 +3,7 @@
 
 import jupytext
 
-from .utils import list_notebooks
+from ...utils import list_notebooks
 
 
 @pytest.mark.skipif(nbformat.__version__ <= "5.7", reason="normalize is not available")

diff --git a/tests/test_save_multiple.py → .../integration/others/test_save_multiple.py b/tests/test_save_multiple.py → .../integration/others/test_save_multiple.py
@@ -9,7 +9,7 @@
 from jupytext.compare import compare_notebooks
 from jupytext.contentsmanager import TextFileContentsManager
 
-from .utils import list_notebooks, notebook_model
+from ...utils import list_notebooks, notebook_model
 
 
 @pytest.mark.parametrize("nb_file", list_notebooks(skip="66"))

diff --git a/tests/test_trust_notebook.py → ...integration/others/test_trust_notebook.py b/tests/test_trust_notebook.py → ...integration/others/test_trust_notebook.py
@@ -7,7 +7,7 @@
 from jupytext.compare import compare_notebooks
 from jupytext.contentsmanager import TextFileContentsManager
 
-from .utils import list_notebooks, requires_myst
+from ...utils import list_notebooks, requires_myst
 
 
 @pytest.mark.parametrize("nb_file", list_notebooks("python"))

diff --git a/tests/test_unicode.py → tests/integration/others/test_unicode.py b/tests/test_unicode.py → tests/integration/others/test_unicode.py
@@ -4,7 +4,7 @@
 import jupytext
 from jupytext.compare import compare
 
-from .utils import list_notebooks
+from ...utils import list_notebooks
 
 
 @pytest.mark.parametrize("nb_file", list_notebooks() + list_notebooks("Rmd"))

diff --git a/tests/test_write_does_not_modify_notebook.py → ...rs/test_write_does_not_modify_notebook.py b/tests/test_write_does_not_modify_notebook.py → ...rs/test_write_does_not_modify_notebook.py
@@ -7,7 +7,7 @@
 from jupytext.compare import compare
 from jupytext.formats import long_form_one_format
 
-from .utils import list_notebooks
+from ...utils import list_notebooks
 
 
 @pytest.mark.parametrize(

diff --git a/tests/integration/round_trip/__init__.py b/tests/integration/round_trip/__init__.py
diff --git a/tests/test_jupytext_nbconvert_round_trip.py → ...rip/test_jupytext_nbconvert_round_trip.py b/tests/test_jupytext_nbconvert_round_trip.py → ...rip/test_jupytext_nbconvert_round_trip.py
@@ -3,7 +3,7 @@
 import jupytext
 from jupytext.header import header_to_metadata_and_cell
 
-from .utils import list_notebooks, requires_nbconvert
+from ...utils import list_notebooks, requires_nbconvert
 
 
 @requires_nbconvert

diff --git a/tests/test_mirror.py → tests/integration/round_trip/test_mirror.py b/tests/test_mirror.py → tests/integration/round_trip/test_mirror.py
@@ -18,7 +18,7 @@
 from jupytext.languages import _SCRIPT_EXTENSIONS
 from jupytext.paired_paths import full_path
 
-from .utils import (
+from ...utils import (
     list_notebooks,
     requires_myst,
     requires_pandoc,

diff --git a/tests/test_read_all_py.py → ...ntegration/round_trip/test_read_all_py.py b/tests/test_read_all_py.py → ...ntegration/round_trip/test_read_all_py.py
@@ -3,7 +3,7 @@
 import jupytext
 from jupytext.compare import compare
 
-from .utils import list_notebooks
+from ...utils import list_notebooks
 
 
 @pytest.mark.parametrize(

diff --git a/tests/test_rmd_to_ipynb.py → ...tegration/round_trip/test_rmd_to_ipynb.py b/tests/test_rmd_to_ipynb.py → ...tegration/round_trip/test_rmd_to_ipynb.py
@@ -3,7 +3,7 @@
 import jupytext
 from jupytext.compare import compare
 
-from .utils import list_notebooks
+from ...utils import list_notebooks
 
 
 @pytest.mark.parametrize("nb_file", list_notebooks("Rmd"))

diff --git a/tests/integration/simple_notebooks/__init__.py b/tests/integration/simple_notebooks/__init__.py
diff --git a/tests/test_ipynb_to_R.py → ...ation/simple_notebooks/test_ipynb_to_R.py b/tests/test_ipynb_to_R.py → ...ation/simple_notebooks/test_ipynb_to_R.py
@@ -6,7 +6,7 @@
 import jupytext
 from jupytext.compare import compare_notebooks
 
-from .utils import list_notebooks
+from ...utils import list_notebooks
 
 
 @pytest.mark.parametrize(

diff --git a/tests/test_ipynb_to_myst.py → ...on/simple_notebooks/test_ipynb_to_myst.py b/tests/test_ipynb_to_myst.py → ...on/simple_notebooks/test_ipynb_to_myst.py
@@ -22,7 +22,7 @@
     myst_to_notebook,
 )
 
-from .utils import requires_myst, requires_no_myst
+from ...utils import requires_myst, requires_no_myst
 
 
 @requires_myst

diff --git a/tests/test_ipynb_to_py.py → ...tion/simple_notebooks/test_ipynb_to_py.py b/tests/test_ipynb_to_py.py → ...tion/simple_notebooks/test_ipynb_to_py.py
@@ -4,7 +4,7 @@
 import jupytext
 from jupytext.compare import compare_notebooks
 
-from .utils import list_notebooks
+from ...utils import list_notebooks
 
 
 @pytest.mark.parametrize("nb_file", list_notebooks("ipynb_py"))

diff --git a/tests/test_ipynb_to_rmd.py → ...ion/simple_notebooks/test_ipynb_to_rmd.py b/tests/test_ipynb_to_rmd.py → ...ion/simple_notebooks/test_ipynb_to_rmd.py
@@ -4,7 +4,7 @@
 import jupytext
 from jupytext.compare import compare_notebooks
 
-from .utils import list_notebooks
+from ...utils import list_notebooks
 
 
 @pytest.mark.parametrize("nb_file", list_notebooks(skip="66"))

diff --git a/tests/test_knitr_spin.py → ...ation/simple_notebooks/test_knitr_spin.py b/tests/test_knitr_spin.py → ...ation/simple_notebooks/test_knitr_spin.py
@@ -2,7 +2,7 @@
 
 import jupytext
 
-from .utils import list_notebooks
+from ...utils import list_notebooks
 
 
 @pytest.mark.parametrize("r_file", list_notebooks("R_spin"))

diff --git a/tests/test_read_dotnet_try_markdown.py → ...otebooks/test_read_dotnet_try_markdown.py b/tests/test_read_dotnet_try_markdown.py → ...otebooks/test_read_dotnet_try_markdown.py
diff --git a/tests/test_read_empty_text_notebook.py → ...otebooks/test_read_empty_text_notebook.py b/tests/test_read_empty_text_notebook.py → ...otebooks/test_read_empty_text_notebook.py
@@ -5,7 +5,7 @@
 from jupytext.formats import NOTEBOOK_EXTENSIONS
 from jupytext.myst import myst_extensions
 
-from .utils import is_myst_available, is_quarto_available
+from ...utils import is_myst_available, is_quarto_available
 
 
 @pytest.mark.parametrize("ext", sorted(set(NOTEBOOK_EXTENSIONS) - {".ipynb"}))

diff --git a/tests/test_read_folding_markers.py → ...le_notebooks/test_read_folding_markers.py b/tests/test_read_folding_markers.py → ...le_notebooks/test_read_folding_markers.py
diff --git a/tests/test_read_incomplete_rmd.py → ...ple_notebooks/test_read_incomplete_rmd.py b/tests/test_read_incomplete_rmd.py → ...ple_notebooks/test_read_incomplete_rmd.py
diff --git a/tests/test_read_simple_R.py → ...on/simple_notebooks/test_read_simple_R.py b/tests/test_read_simple_R.py → ...on/simple_notebooks/test_read_simple_R.py
diff --git a/tests/test_read_simple_clojure.py → ...ple_notebooks/test_read_simple_clojure.py b/tests/test_read_simple_clojure.py → ...ple_notebooks/test_read_simple_clojure.py
diff --git a/tests/test_read_simple_csharp.py → ...mple_notebooks/test_read_simple_csharp.py b/tests/test_read_simple_csharp.py → ...mple_notebooks/test_read_simple_csharp.py
diff --git a/tests/test_read_simple_groovy.py → ...mple_notebooks/test_read_simple_groovy.py b/tests/test_read_simple_groovy.py → ...mple_notebooks/test_read_simple_groovy.py
diff --git a/tests/test_read_simple_hydrogen.py → ...le_notebooks/test_read_simple_hydrogen.py b/tests/test_read_simple_hydrogen.py → ...le_notebooks/test_read_simple_hydrogen.py
diff --git a/tests/test_read_simple_ipynb.py → ...imple_notebooks/test_read_simple_ipynb.py b/tests/test_read_simple_ipynb.py → ...imple_notebooks/test_read_simple_ipynb.py
diff --git a/tests/test_read_simple_java.py → ...simple_notebooks/test_read_simple_java.py b/tests/test_read_simple_java.py → ...simple_notebooks/test_read_simple_java.py
diff --git a/tests/test_read_simple_julia.py → ...imple_notebooks/test_read_simple_julia.py b/tests/test_read_simple_julia.py → ...imple_notebooks/test_read_simple_julia.py
diff --git a/tests/test_read_simple_markdown.py → ...le_notebooks/test_read_simple_markdown.py b/tests/test_read_simple_markdown.py → ...le_notebooks/test_read_simple_markdown.py
diff --git a/tests/test_read_simple_matlab.py → ...mple_notebooks/test_read_simple_matlab.py b/tests/test_read_simple_matlab.py → ...mple_notebooks/test_read_simple_matlab.py
diff --git a/tests/test_read_simple_nomarker.py → ...le_notebooks/test_read_simple_nomarker.py b/tests/test_read_simple_nomarker.py → ...le_notebooks/test_read_simple_nomarker.py
diff --git a/tests/test_read_simple_ocaml.py → ...imple_notebooks/test_read_simple_ocaml.py b/tests/test_read_simple_ocaml.py → ...imple_notebooks/test_read_simple_ocaml.py
diff --git a/tests/test_read_simple_pandoc.py → ...mple_notebooks/test_read_simple_pandoc.py b/tests/test_read_simple_pandoc.py → ...mple_notebooks/test_read_simple_pandoc.py
@@ -6,7 +6,7 @@
 from jupytext.compare import compare, compare_notebooks
 from jupytext.pandoc import PandocError
 
-from .utils import requires_no_pandoc, requires_pandoc
+from ...utils import requires_no_pandoc, requires_pandoc
 
 
 @requires_pandoc

diff --git a/tests/test_read_simple_percent.py → ...ple_notebooks/test_read_simple_percent.py b/tests/test_read_simple_percent.py → ...ple_notebooks/test_read_simple_percent.py
@@ -11,7 +11,7 @@
 import jupytext
 from jupytext.compare import compare, compare_notebooks
 
-from .utils import notebook_model
+from ...utils import notebook_model
 
 
 def test_read_simple_file(

diff --git a/tests/test_read_simple_python.py → ...mple_notebooks/test_read_simple_python.py b/tests/test_read_simple_python.py → ...mple_notebooks/test_read_simple_python.py
diff --git a/tests/test_read_simple_quarto.py → ...mple_notebooks/test_read_simple_quarto.py b/tests/test_read_simple_quarto.py → ...mple_notebooks/test_read_simple_quarto.py
@@ -3,7 +3,7 @@
 import jupytext
 from jupytext.compare import compare, compare_notebooks
 
-from .utils import requires_quarto
+from ...utils import requires_quarto
 
 
 @requires_quarto

diff --git a/tests/test_read_simple_rmd.py → .../simple_notebooks/test_read_simple_rmd.py b/tests/test_read_simple_rmd.py → .../simple_notebooks/test_read_simple_rmd.py
diff --git a/tests/test_read_simple_rust.py → ...simple_notebooks/test_read_simple_rust.py b/tests/test_read_simple_rust.py → ...simple_notebooks/test_read_simple_rust.py
diff --git a/tests/test_read_simple_scheme.py → ...mple_notebooks/test_read_simple_scheme.py b/tests/test_read_simple_scheme.py → ...mple_notebooks/test_read_simple_scheme.py
diff --git a/tests/test_read_simple_sphinx.py → ...mple_notebooks/test_read_simple_sphinx.py b/tests/test_read_simple_sphinx.py → ...mple_notebooks/test_read_simple_sphinx.py
diff --git a/tests/unit/__init__.py b/tests/unit/__init__.py
diff --git a/tests/test_cell_id.py → tests/unit/test_cell_id.py b/tests/test_cell_id.py → tests/unit/test_cell_id.py
diff --git a/tests/test_compare.py → tests/unit/test_compare.py b/tests/test_compare.py → tests/unit/test_compare.py
diff --git a/tests/test_escape_magics.py → tests/unit/test_escape_magics.py b/tests/test_escape_magics.py → tests/unit/test_escape_magics.py
@@ -11,7 +11,7 @@
     unesc,
 )
 
-from .utils import notebook_model
+from ..utils import notebook_model
 
 
 def test_unesc():

diff --git a/tests/test_formats.py → tests/unit/test_formats.py b/tests/test_formats.py → tests/unit/test_formats.py
@@ -16,7 +16,7 @@
     validate_one_format,
 )
 
-from .utils import list_notebooks, requires_myst, requires_pandoc
+from ..utils import list_notebooks, requires_myst, requires_pandoc
 
 
 @pytest.mark.parametrize("nb_file", list_notebooks("python"))

diff --git a/tests/test_header.py → tests/unit/test_header.py b/tests/test_header.py → tests/unit/test_header.py
diff --git a/tests/test_markdown_in_code_cells.py → tests/unit/test_markdown_in_code_cells.py b/tests/test_markdown_in_code_cells.py → tests/unit/test_markdown_in_code_cells.py
@@ -5,7 +5,7 @@
 from jupytext.cell_to_text import three_backticks_or_more
 from jupytext.compare import compare, compare_notebooks
 
-from .utils import requires_myst
+from ..utils import requires_myst
 
 
 def test_three_backticks_or_more():

diff --git a/tests/test_paired_paths.py → tests/unit/test_paired_paths.py b/tests/test_paired_paths.py → tests/unit/test_paired_paths.py
diff --git a/tests/test_pep8.py → tests/unit/test_pep8.py b/tests/test_pep8.py → tests/unit/test_pep8.py
@@ -11,7 +11,7 @@
     pep8_lines_between_cells,
 )
 
-from .utils import list_notebooks
+from ..utils import list_notebooks
 
 
 def test_next_instruction_is_function_or_class():

diff --git a/tests/test_stringparser.py → tests/unit/test_stringparser.py b/tests/test_stringparser.py → tests/unit/test_stringparser.py
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,7 +11,7 @@ @@
         unesc,
     )
-    from .utils import notebook_model
+    from ..utils import notebook_model
     def test_unesc():
@@ Expand Down @@