From 999697191e3208c7fc7a0e31892abf00de373766 Mon Sep 17 00:00:00 2001 From: Ken Odegard Date: Tue, 14 Jan 2025 22:58:49 +0100 Subject: [PATCH 1/2] Remove 25.1 deprecations (#5588) --- conda_build/exceptions.py | 18 ------------------ conda_build/index.py | 3 --- news/5587-deprecations | 21 +++++++++++++++++++++ tests/test_exceptions.py | 21 --------------------- 4 files changed, 21 insertions(+), 42 deletions(-) create mode 100644 news/5587-deprecations delete mode 100644 tests/test_exceptions.py diff --git a/conda_build/exceptions.py b/conda_build/exceptions.py index e8f51137e8..fe39ae2205 100644 --- a/conda_build/exceptions.py +++ b/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 diff --git a/conda_build/index.py b/conda_build/index.py index 88d9f4740b..b5cbe2ab8d 100644 --- a/conda_build/index.py +++ b/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, diff --git a/news/5587-deprecations b/news/5587-deprecations new file mode 100644 index 0000000000..5119a9e1a7 --- /dev/null +++ b/news/5587-deprecations @@ -0,0 +1,21 @@ +### Enhancements + +* + +### Bug fixes + +* + +### 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) + +### Docs + +* + +### Other + +* diff --git a/tests/test_exceptions.py b/tests/test_exceptions.py deleted file mode 100644 index c8ec13356d..0000000000 --- a/tests/test_exceptions.py +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright (C) 2014 Anaconda, Inc -# SPDX-License-Identifier: BSD-3-Clause -from __future__ import annotations - -from contextlib import nullcontext - -import pytest - -from conda_build import exceptions - - -@pytest.mark.parametrize( - "function,raises", - [ - ("UnableToParseMissingJinja2", TypeError), - ], -) -def test_deprecations(function: str, raises: type[Exception] | None) -> None: - raises_context = pytest.raises(raises) if raises else nullcontext() - with pytest.deprecated_call(), raises_context: - getattr(exceptions, function)() From 6873259726d571cbc37c73e287bd0662e0f2766d Mon Sep 17 00:00:00 2001 From: Ken Odegard Date: Wed, 15 Jan 2025 09:27:47 +0100 Subject: [PATCH 2/2] Changelog 25.1.1 (#5589) * Update .authors.yml * Update .mailmap * Updated authorship for 25.1.1 * Updated CHANGELOG for 25.1.1 --- .authors.yml | 8 +++++--- .mailmap | 2 +- CHANGELOG.md | 14 ++++++++++++++ news/5587-deprecations | 21 --------------------- 4 files changed, 20 insertions(+), 25 deletions(-) delete mode 100644 news/5587-deprecations diff --git a/.authors.yml b/.authors.yml index 3d651814ea..4fa8b8586f 100644 --- a/.authors.yml +++ b/.authors.yml @@ -1202,7 +1202,7 @@ alternate_emails: - clee@anaconda.com - name: Ken Odegard - num_commits: 229 + num_commits: 232 email: kodegard@anaconda.com 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: jannis@leidel.info - 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: forgotten.programme@gmail.com github: ForgottenProgramme - num_commits: 6 + num_commits: 1 first_commit: 2025-01-13 18:15:05 + alternate_emails: + - 65779580+ForgottenProgramme@users.noreply.github.com diff --git a/.mailmap b/.mailmap index c7e01b4368..671594146d 100644 --- a/.mailmap +++ b/.mailmap @@ -159,7 +159,7 @@ Lennart Fricke Levi Naden Lori Burns Lukas Schrangl -Mahe Iram Khan +Mahe Iram Khan Mahe Iram Khan <65779580+ForgottenProgramme@users.noreply.github.com> Mandeep Bhutani mandeep Mandeep Bhutani mandeep Mandeep Bhutani Mandeep Bhutani diff --git a/CHANGELOG.md b/CHANGELOG.md index 130d0b19a5..9335c2b015 100644 --- a/CHANGELOG.md +++ b/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 diff --git a/news/5587-deprecations b/news/5587-deprecations deleted file mode 100644 index 5119a9e1a7..0000000000 --- a/news/5587-deprecations +++ /dev/null @@ -1,21 +0,0 @@ -### Enhancements - -* - -### Bug fixes - -* - -### 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) - -### Docs - -* - -### Other - -*