Cleanup proj_path fixture

tests/conftest.py

@@ -0,0 +1,36 @@
+"""Collection of common fixtures
+References
+----------
+https://docs.pytest.org/en/6.2.x/fixture.html#scope-sharing-fixtures-across-classes-modules-packages-or-session
+"""
+import os
+import pathlib
+import shutil
+import subprocess
+
+import pytest
+
+
+@pytest.fixture
+def proj_path(tmp_path, request) -> pathlib.Path:
+    """temporary directory for testing DVC calls
+
+    Parameters
+    ----------
+    tmp_path
+    request: https://docs.pytest.org/en/6.2.x/reference.html#std-fixture-request
+
+    Returns
+    -------
+    path to temporary directory
+
+    """
+    shutil.copy(request.module.__file__, tmp_path)
+    os.chdir(tmp_path)
+    subprocess.check_call(["git", "init"])
+    subprocess.check_call(["dvc", "init"])
+
+    subprocess.check_call(["git", "add", "."])
+    subprocess.check_call(["git", "commit", "-m", "init"])
+
+    return tmp_path

tests/integration_tests/examples/test_example_01.py

@@ -1,6 +1,4 @@
 """"""
-import os
-import shutil
 from pathlib import Path
 
 from zntrack import Node, ZnTrackProject, dvc, zn
@@ -53,12 +51,9 @@ def run(self):
         Path(self.outs).write_text(f"{self.n_1} + {self.n_2} = {self.sum}")
 
 
-def test_stage_addition(tmp_path):
+def test_stage_addition(proj_path):
     """Check that the dvc repro works"""
-    shutil.copy(__file__, tmp_path)
-    os.chdir(tmp_path)
     project = ZnTrackProject()
-    project.create_dvc_repository()
 
     StageAddition(5, 10).write_graph()
     project.name = "Test1"
@@ -78,12 +73,9 @@ def test_stage_addition(tmp_path):
     assert finished_stage.sum == 150
 
 
-def test_stage_io(tmp_path):
-    shutil.copy(__file__, tmp_path)
-    os.chdir(tmp_path)
+def test_stage_io(proj_path):
     project = ZnTrackProject()
     project.name = "Test1"
-    project.create_dvc_repository()
 
     deps = Path("test_example_01.py").resolve()
 

tests/integration_tests/examples/test_example_02.py

@@ -1,6 +1,3 @@
-import os
-import shutil
-
 import numpy as np
 
 from zntrack import Node, ZnTrackProject, dvc, zn
@@ -79,13 +76,10 @@ def run(self):
         self.out = self.a.out + self.b.out
 
 
-def test_stage_addition(tmp_path):
+def test_stage_addition(proj_path):
     """Check that the dvc repro works"""
-    shutil.copy(__file__, tmp_path)
-    os.chdir(tmp_path)
     project = ZnTrackProject()
     project.name = "test01"
-    project.create_dvc_repository()
 
     ComputeA(inp=2).write_graph()
     ComputeB(inp=3).write_graph()
@@ -97,13 +91,10 @@ def test_stage_addition(tmp_path):
     assert finished_stage.out == 31
 
 
-def test_stage_addition_named(tmp_path):
+def test_stage_addition_named(proj_path):
     """Check that the dvc repro works with named stages"""
-    shutil.copy(__file__, tmp_path)
-    os.chdir(tmp_path)
     project = ZnTrackProject()
     project.name = "test01"
-    project.create_dvc_repository()
 
     ComputeANamed(inp=2).write_graph()
     ComputeB(inp=3).write_graph()
@@ -114,14 +105,8 @@ def test_stage_addition_named(tmp_path):
     assert finished_stage.out == 31
 
 
-def test_stage_addition_run(tmp_path):
+def test_stage_addition_run(proj_path):
     """Check that the PyTracks run method works"""
-    shutil.copy(__file__, tmp_path)
-    os.chdir(tmp_path)
-    project = ZnTrackProject()
-    project.name = "test01"
-    project.create_dvc_repository()
-
     a = ComputeA(inp=2)
     a.run_and_save()  # I must save here, because of the dependency of the output in AB
     b = ComputeB(inp=3)
@@ -134,14 +119,8 @@ def test_stage_addition_run(tmp_path):
     assert finished_stage.out == 31
 
 
-def test_stage_addition_named_run(tmp_path):
+def test_stage_addition_named_run(proj_path):
     """Check that the PyTracks run method works with named stages"""
-    shutil.copy(__file__, tmp_path)
-    os.chdir(tmp_path)
-    project = ZnTrackProject()
-    project.name = "test01"
-    project.create_dvc_repository()
-
     ComputeANamed(inp=2).save()
     ComputeB(inp=3).save()
     ComputeAB().save()
@@ -155,13 +134,8 @@ def test_stage_addition_named_run(tmp_path):
     assert finished_stage.out == 31
 
 
-def test_named_single_stage(tmp_path):
+def test_named_single_stage(proj_path):
     """Test a single named stage"""
-    shutil.copy(__file__, tmp_path)
-    os.chdir(tmp_path)
-    project = ZnTrackProject()
-    project.create_dvc_repository()
-
     ComputeANamed(inp=2).write_graph(no_exec=False)
 
     assert ComputeANamed.load().out == 4

tests/integration_tests/examples/test_example_03.py

@@ -1,16 +1,3 @@
-"""
-This program and the accompanying materials are made available under the terms of the
-Eclipse Public License v2.0 which accompanies this distribution, and is available at
-https://www.eclipse.org/legal/epl-v20.html
-SPDX-License-Identifier: EPL-2.0
-
-Copyright Contributors to the Zincware Project.
-
-Description:
-"""
-import os
-import shutil
-
 from zntrack import Node, ZnTrackProject, dvc, zn
 
 
@@ -60,13 +47,9 @@ def run(self):
         self.number = self.inp[0].number + self.inp[1].number
 
 
-def test_repro(tmp_path):
+def test_repro(proj_path):
     """Test that a single DVC.deps() can take a list of dependencies"""
-    shutil.copy(__file__, tmp_path)
-    os.chdir(tmp_path)
-
     project = ZnTrackProject()
-    project.create_dvc_repository()
 
     CreateNumbers().write_graph()
     AddOne().write_graph()

tests/integration_tests/examples/test_example_04.py

@@ -1,6 +1,3 @@
-import os
-import shutil
-
 from zntrack import Node, ZnTrackProject, zn
 
 
@@ -19,13 +16,9 @@ def run(self):
         self.output = self.inputs
 
 
-def test_basic_io_assertion(tmp_path):
+def test_basic_io_assertion(proj_path):
     """Make a simple input/output assertion test for the nodes with different names"""
-    shutil.copy(__file__, tmp_path)
-    os.chdir(tmp_path)
-
     project = ZnTrackProject()
-    project.create_dvc_repository()
 
     HelloWorld(inputs=3).write_graph()
     HelloWorld(name="Test01", inputs=17).write_graph()

tests/integration_tests/examples/test_example_05.py

@@ -1,6 +1,3 @@
-import os
-import shutil
-
 import numpy as np
 
 from zntrack import Node, ZnTrackProject, zn
@@ -20,13 +17,9 @@ def run(self):
         self.out = np.power(2, self.inp)
 
 
-def test_stage_addition(tmp_path):
+def test_stage_addition(proj_path):
     """Check that the dvc repro works"""
-    shutil.copy(__file__, tmp_path)
-    os.chdir(tmp_path)
     project = ZnTrackProject()
-    project.name = "test01"
-    project.create_dvc_repository()
 
     ComputeA(inp=np.arange(5)).write_graph()
 
@@ -37,14 +30,8 @@ def test_stage_addition(tmp_path):
     np.testing.assert_array_equal(finished_stage.inp, np.arange(5))
 
 
-def test_stage_addition_run(tmp_path):
+def test_stage_addition_run(proj_path):
     """Check that the PyTracks run method works"""
-    shutil.copy(__file__, tmp_path)
-    os.chdir(tmp_path)
-    project = ZnTrackProject()
-    project.name = "test01"
-    project.create_dvc_repository()
-
     a = ComputeA(inp=np.arange(5))
 
     a.save()  # need to save to access the parameters zn.params

tests/integration_tests/function_wrapper/test_func_func_deps.py

@@ -1,23 +1,9 @@
-import os
 import pathlib
-import shutil
 import subprocess
 
-import pytest
-
 from zntrack.core.functions.decorator import NodeConfig, nodify
 
 
-@pytest.fixture
-def proj_path(tmp_path):
-    shutil.copy(__file__, tmp_path)
-    os.chdir(tmp_path)
-    subprocess.check_call(["git", "init"])
-    subprocess.check_call(["dvc", "init"])
-
-    return tmp_path
-
-
 @nodify(outs=pathlib.Path("test.txt"), params={"text": "Lorem Ipsum"})
 def func_1(cfg: NodeConfig):
     cfg.outs.write_text(cfg.params.text)

tests/integration_tests/function_wrapper/test_func_node_deps.py

@@ -1,25 +1,11 @@
-import os
 import pathlib
-import shutil
 import subprocess
 
-import pytest
-
 from zntrack import dvc, zn
 from zntrack.core.base import Node
 from zntrack.core.functions.decorator import NodeConfig, nodify
 
 
-@pytest.fixture
-def proj_path(tmp_path):
-    shutil.copy(__file__, tmp_path)
-    os.chdir(tmp_path)
-    subprocess.check_call(["git", "init"])
-    subprocess.check_call(["dvc", "init"])
-
-    return tmp_path
-
-
 @nodify(outs=pathlib.Path("text.txt"), params={"text": "Lorem Ipsum"})
 def write_text(cfg: NodeConfig):
     cfg.outs.write_text(cfg.params.text)

tests/integration_tests/function_wrapper/test_single_function.py

@@ -1,24 +1,11 @@
-import os
 import pathlib
-import shutil
-import subprocess
 
 import pytest
 
 from zntrack import utils
 from zntrack.core.functions.decorator import NodeConfig, nodify
 
 
-@pytest.fixture
-def proj_path(tmp_path):
-    shutil.copy(__file__, tmp_path)
-    os.chdir(tmp_path)
-    subprocess.check_call(["git", "init"])
-    subprocess.check_call(["dvc", "init"])
-
-    return tmp_path
-
-
 @nodify(outs="test.txt", params={"text": "Lorem Ipsum"})
 def example_func(cfg: NodeConfig) -> NodeConfig:
     out_file = pathlib.Path(cfg.outs)

tests/integration_tests/interface/test_base_interface.py

@@ -1,16 +1,4 @@
-"""
-This program and the accompanying materials are made available under the terms of the
-Eclipse Public License v2.0 which accompanies this distribution, and is available at
-https://www.eclipse.org/legal/epl-v20.html
-SPDX-License-Identifier: EPL-2.0
-
-Copyright Contributors to the Zincware Project.
-
-Description:
-"""
-import os
 import pathlib
-import shutil
 import subprocess
 
 import pytest
@@ -31,14 +19,6 @@ def run(self):
         self.outputs = self.inputs
 
 
-@pytest.fixture
-def proj_path(tmp_path):
-    shutil.copy(__file__, tmp_path)
-    os.chdir(tmp_path)
-    subprocess.run(["git", "init"])
-    subprocess.run(["dvc", "init"])
-
-
 @pytest.fixture()
 def single_experiment_path(proj_path):
     HelloWorld(inputs=1).write_graph()

tests/integration_tests/test_dvc_checkpoints.py

@@ -1,26 +1,12 @@
-import os
 import pathlib
-import shutil
-import subprocess
 import typing
 
-import pytest
 import yaml
 
 from zntrack import dvc
 from zntrack.core.base import Node
 
 
-@pytest.fixture
-def proj_path(tmp_path):
-    shutil.copy(__file__, tmp_path)
-    os.chdir(tmp_path)
-    subprocess.check_call(["git", "init"])
-    subprocess.check_call(["dvc", "init"])
-
-    return tmp_path
-
-
 class SingleNode(Node):
     path1: pathlib.Path = dvc.checkpoints()