Merge pull request #524 from mariusvniekerk/alphabetize-lock

Alphabetize unified lockfiles

conda_lock/conda_lock.py

@@ -56,7 +56,6 @@
     is_micromamba,
 )
 from conda_lock.lockfile import (
-    UnknownLockfileVersion,
     parse_conda_lock_file,
     write_conda_lock_file,
 )

conda_lock/lockfile/__init__.py

@@ -142,11 +142,15 @@ def parse_conda_lock_file(path: pathlib.Path) -> Lockfile:
         content = yaml.safe_load(f)
     version = content.pop("version", None)
     if version == 1:
-        return lockfile_v1_to_v2(LockfileV1.parse_obj(content))
+        lockfile = lockfile_v1_to_v2(LockfileV1.parse_obj(content))
+    elif version == 2:
+        lockfile = Lockfile.parse_obj(content)
     elif version is None:
         raise MissingLockfileVersion(f"{path} is missing a version")
     else:
         raise UnknownLockfileVersion(f"{path} has unknown version {version}")
+    lockfile.toposort_inplace()
+    return lockfile
 
 
 def write_conda_lock_file(
@@ -155,7 +159,7 @@ def write_conda_lock_file(
     metadata_choices: Optional[Collection[MetadataOption]],
     include_help_text: bool = True,
 ) -> None:
-    content.toposort_inplace()
+    content.alphasort_inplace()
     with path.open("w") as f:
         if include_help_text:
             categories = set(p.category for p in content.package)

conda_lock/lockfile/v2prelim/models.py

@@ -73,6 +73,9 @@ def __ror__(self, other: "Optional[Lockfile]") -> "Lockfile":
     def toposort_inplace(self) -> None:
         self.package = self._toposort(self.package)
 
+    def alphasort_inplace(self) -> None:
+        self.package.sort(key=lambda d: d.key())
+
     @staticmethod
     def _toposort(
         package: List[LockedDependency], update: bool = False