Merge branch 'main' into setuptools-scm

Author: tobiasraabe

docs/changes.rst

@@ -15,6 +15,8 @@ all releases are available on `PyPI <https://pypi.org/project/pytask>`_ and
   system. This facilitates cross-platform builds of projects. Deactivate the check by
   setting ``check_casing_of_paths = false`` in the configuration file.
 - :gh:`83` replaces ``versioneer`` with ``setuptools_scm``.
+- :gh:`84` fixes an error in the path normalization introduced by :gh:`81`.
+- :gh:`85` sorts collected tasks, dependencies, and products by name.
 
 
 0.0.14 - 2021-03-23

src/_pytask/collect.py

@@ -183,9 +183,11 @@ def pytask_collect_node(session, path, node):
         node = Path(node)
     if isinstance(node, Path):
         if not node.is_absolute():
-            # ``normpath`` removes ``../`` from the path which is necessary for the
-            # casing check which will fail since ``.resolves()`` also normalizes a path.
-            node = Path(os.path.normpath(path.parent.joinpath(node)))
+            node = path.parent.joinpath(node)
+
+        # ``normpath`` removes ``../`` from the path which is necessary for the casing
+        # check which will fail since ``.resolves()`` also normalizes a path.
+        node = Path(os.path.normpath(node))
 
         if (
             not IS_FILE_SYSTEM_CASE_SENSITIVE

src/_pytask/collect_command.py

@@ -109,19 +109,25 @@ def _organize_tasks(tasks, common_ancestor):
 
         task_dict = {
             reduced_task_name: {
-                "depends_on": [
-                    relative_to(node.path, common_ancestor)
-                    for node in task.depends_on.values()
-                ],
-                "produces": [
-                    relative_to(node.path, common_ancestor)
-                    for node in task.produces.values()
-                ],
+                "depends_on": sorted(
+                    [
+                        relative_to(node.path, common_ancestor)
+                        for node in task.depends_on.values()
+                    ]
+                ),
+                "produces": sorted(
+                    [
+                        relative_to(node.path, common_ancestor)
+                        for node in task.produces.values()
+                    ]
+                ),
             }
         }
 
         dictionary[reduced_task_path].update(task_dict)
 
+    dictionary = {key: dictionary[key] for key in sorted(dictionary)}
+
     return dictionary
 
 

tests/test_collect.py

@@ -155,11 +155,17 @@ def test_pytask_collect_node_raises_error_if_path_is_not_correctly_cased(tmp_pat
 
 
 @pytest.mark.unit
-def test_pytask_collect_node_does_not_raise_error_if_path_is_not_normalized(tmp_path):
+@pytest.mark.parametrize("is_absolute", [True, False])
+def test_pytask_collect_node_does_not_raise_error_if_path_is_not_normalized(
+    tmp_path, is_absolute
+):
     session = Session({"check_casing_of_paths": True}, None)
     task_path = tmp_path / "task_example.py"
     real_node = tmp_path / "text.txt"
+
     collected_node = f"../{tmp_path.name}/text.txt"
+    if is_absolute:
+        collected_node = tmp_path / collected_node
 
     with pytest.warns(None) as record:
         result = pytask_collect_node(session, task_path, collected_node)