Skip to content

Commit

Permalink
Remove 25.1 deprecations (#5588)
Browse files Browse the repository at this point in the history
  • Loading branch information
kenodegard authored Jan 14, 2025
1 parent b713677 commit 9996971
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 42 deletions.
18 changes: 0 additions & 18 deletions conda_build/exceptions.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@

from conda import CondaError

from .deprecations import deprecated

SEPARATOR = "-" * 70

indent = lambda s: textwrap.fill(textwrap.dedent(s))
Expand Down Expand Up @@ -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

Expand Down
3 changes: 0 additions & 3 deletions conda_build/index.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
)
Expand Down Expand Up @@ -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,
Expand Down
21 changes: 21 additions & 0 deletions news/5587-deprecations
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
### Enhancements

* <news item>

### Bug fixes

* <news item>

### 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

* <news item>

### Other

* <news item>
21 changes: 0 additions & 21 deletions tests/test_exceptions.py

This file was deleted.

0 comments on commit 9996971

Please sign in to comment.