Merge pull request #181 from mariusvniekerk/consistent-ordering

conda_lock/src_parser/__init__.py

@@ -170,6 +170,17 @@ def __ror__(self, other: "Optional[Lockfile]") -> "Lockfile":
             else:
                 package.append(ours[key])
 
+        # Resort the conda packages topologically
+        final_package = self._toposort(package)
+        return Lockfile(package=final_package, metadata=other.metadata | self.metadata)
+
+    def toposort_inplace(self) -> None:
+        self.package = self._toposort(self.package)
+
+    @staticmethod
+    def _toposort(
+        package: List[LockedDependency], update: bool = False
+    ) -> List[LockedDependency]:
         platforms = {d.platform for d in package}
 
         # Resort the conda packages topologically
@@ -209,7 +220,7 @@ def __ror__(self, other: "Optional[Lockfile]") -> "Lockfile":
 
                     final_package.append(dep)
 
-        return Lockfile(package=final_package, metadata=other.metadata | self.metadata)
+        return final_package
 
 
 class LockSpecification(BaseModel):

conda_lock/src_parser/lockfile.py

@@ -26,6 +26,7 @@ def parse_conda_lock_file(
 def write_conda_lock_file(
     content: Lockfile, path: pathlib.Path, include_help_text: bool = True
 ) -> None:
+    content.toposort_inplace()
     with path.open("w") as f:
         if include_help_text:
             categories = set(p.category for p in content.package)