Merge 25.1.x back into main

.authors.yml

@@ -1202,7 +1202,7 @@
   alternate_emails:
   - [email protected]
 - name: Ken Odegard
-  num_commits: 229
+  num_commits: 232
   email: [email protected]
   first_commit: 2020-09-08 19:53:41
   github: kenodegard
@@ -1225,7 +1225,7 @@
   first_commit: 2020-11-19 10:46:41
 - name: Jannis Leidel
   email: [email protected]
-  num_commits: 34
+  num_commits: 35
   github: jezdez
   first_commit: 2020-11-19 10:46:41
 - name: Christof Kaufmann
@@ -1489,5 +1489,7 @@
 - name: Mahe Iram Khan
   email: [email protected]
   github: ForgottenProgramme
-  num_commits: 6
+  num_commits: 1
   first_commit: 2025-01-13 18:15:05
+  alternate_emails:
+  - [email protected]

.mailmap

@@ -159,7 +159,7 @@ Lennart Fricke <[email protected]>
 Levi Naden <[email protected]>
 Lori Burns <[email protected]>
 Lukas Schrangl <[email protected]>
-Mahe Iram Khan <[email protected]>
+Mahe Iram Khan <[email protected]> Mahe Iram Khan <[email protected]>
 Mandeep Bhutani <[email protected]> mandeep <[email protected]>
 Mandeep Bhutani <[email protected]> mandeep <[email protected]>
 Mandeep Bhutani <[email protected]> Mandeep Bhutani <[email protected]>

CHANGELOG.md

@@ -1,5 +1,19 @@
 [//]: # (current developments)
 
+## 25.1.1 (2025-01-14)
+
+### Deprecations
+
+* Remove `conda_build.exceptions.UnableToParseMissingJinja2`. (#5587)
+* Remove `conda_build.index.get_build_index(locking)`. (#5587)
+* Remove `conda_build.index.get_build_index(timeout)`. (#5587)
+
+### Contributors
+
+* @kenodegard
+
+
+
 ## 25.1.0 (2025-01-13)
 
 ### Enhancements

conda_build/exceptions.py

@@ -4,8 +4,6 @@
 
 from conda import CondaError
 
-from .deprecations import deprecated
-
 SEPARATOR = "-" * 70
 
 indent = lambda s: textwrap.fill(textwrap.dedent(s))
@@ -46,22 +44,6 @@ def indented_exception(self):
         return f"Error Message:\n--> {indent(orig)}\n\n"
 
 
-@deprecated("24.11", "25.1")
-class UnableToParseMissingJinja2(UnableToParse):
-    def error_body(self):
-        return "\n".join(
-            [
-                super().error_body(),
-                indent(
-                    """\
-                It appears you are missing jinja2.  Please install that
-                package, then attempt to build.
-            """
-                ),
-            ]
-        )
-
-
 class MissingDependency(CondaBuildException):
     pass
 

conda_build/index.py

@@ -14,7 +14,6 @@
 from conda_index.index import update_index as _update_index
 
 from . import utils
-from .deprecations import deprecated
 from .utils import (
     get_logger,
 )
@@ -45,8 +44,6 @@ def Index(channels: tuple[str | Channel, ...] = (), *args, **kwargs) -> dict:  #
 # os.environ['CONDA_ADD_ANACONDA_TOKEN'] = "false"
 
 
-@deprecated.argument("24.11", "25.1", "locking")
-@deprecated.argument("24.11", "25.1", "timeout")
 def get_build_index(
     subdir,
     bldpkgs_dir,