From d96caf5079b14a238b64692d028503b10f999fcc Mon Sep 17 00:00:00 2001
From: Ayaz Salikhov <mathbunnyru@gmail.com>
Date: Wed, 12 Mar 2025 14:11:08 +0000
Subject: [PATCH 1/2] Add tags for mamba and conda versions

---
 tagging/hierarchy/images_hierarchy.py |  4 ++++
 tagging/taggers/versions.py           | 12 ++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/tagging/hierarchy/images_hierarchy.py b/tagging/hierarchy/images_hierarchy.py
index 2a49790bd8..a59098c426 100644
--- a/tagging/hierarchy/images_hierarchy.py
+++ b/tagging/hierarchy/images_hierarchy.py
@@ -13,11 +13,13 @@
 from tagging.taggers.tagger_interface import TaggerInterface
 from tagging.taggers.ubuntu_version import UbuntuVersionTagger
 from tagging.taggers.versions import (
+    CondaVersionTagger,
     JavaVersionTagger,
     JuliaVersionTagger,
     JupyterHubVersionTagger,
     JupyterLabVersionTagger,
     JupyterNotebookVersionTagger,
+    MambaVersionTagger,
     PythonMajorMinorVersionTagger,
     PythonVersionTagger,
     PytorchVersionTagger,
@@ -43,6 +45,8 @@ class ImageDescription:
             UbuntuVersionTagger(),
             PythonMajorMinorVersionTagger(),
             PythonVersionTagger(),
+            MambaVersionTagger(),
+            CondaVersionTagger(),
         ],
         manifests=[CondaEnvironmentManifest(), AptPackagesManifest()],
     ),
diff --git a/tagging/taggers/versions.py b/tagging/taggers/versions.py
index 094efd3fd2..c919c4f31b 100644
--- a/tagging/taggers/versions.py
+++ b/tagging/taggers/versions.py
@@ -36,6 +36,18 @@ def tag_value(container: Container) -> str:
         return full_version[: full_version.rfind(".")]
 
 
+class MambaVersionTagger(TaggerInterface):
+    @staticmethod
+    def tag_value(container: Container) -> str:
+        return "mamba-" + _get_program_version(container, "mamba")
+
+
+class CondaVersionTagger(TaggerInterface):
+    @staticmethod
+    def tag_value(container: Container) -> str:
+        return "conda-" + _get_program_version(container, "conda").split()[1]
+
+
 class JupyterNotebookVersionTagger(TaggerInterface):
     @staticmethod
     def tag_value(container: Container) -> str:

From 3c6f504b566e25fa5c221d3ce0f1ce5083c3be4e Mon Sep 17 00:00:00 2001
From: Ayaz Salikhov <mathbunnyru@gmail.com>
Date: Wed, 12 Mar 2025 14:13:15 +0000
Subject: [PATCH 2/2] Update changelog

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 330297ef44..c0ffebdf23 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,12 @@
 This changelog only contains breaking and/or significant changes manually introduced to this repository (using Pull Requests).
 All image manifests can be found in [the wiki](https://github.com/jupyter/docker-stacks/wiki).
 
+## 2025-03-12
+
+Affected: all images.
+
+- **Non-breaking:** Add `conda` and `mamba` version taggers ([#2251](https://github.com/jupyter/docker-stacks/pull/2251)).
+
 ## 2025-02-21
 
 Affected: all images.