Skip to content

Commit 6fc6163

Browse files
Removing 25.7.x deprecations (#5755)
1 parent 4e3c66e commit 6fc6163

File tree

2 files changed

+23
-31
lines changed

2 files changed

+23
-31
lines changed

conda_build/render.py

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434

3535
from . import environ, exceptions, source, utils
3636
from .config import CondaPkgFormat
37-
from .deprecations import deprecated
3837
from .exceptions import CondaBuildUserError, DependencyNeedsBuildingError
3938
from .index import get_build_index
4039
from .metadata import MetaData, MetaDataTuple, combine_top_level_metadata_with_output
@@ -1152,27 +1151,6 @@ def render_metadata_tuples(
11521151
]
11531152

11541153

1155-
# Next bit of stuff is to support YAML output in the order we expect.
1156-
# http://stackoverflow.com/a/17310199/1170370
1157-
@deprecated("25.5", "25.7")
1158-
class _MetaYaml(dict):
1159-
fields = FIELDS
1160-
1161-
def to_omap(self):
1162-
return [(field, self[field]) for field in _MetaYaml.fields if field in self]
1163-
1164-
1165-
@deprecated("25.5", "25.7")
1166-
def _represent_omap(dumper, data):
1167-
return dumper.represent_mapping("tag:yaml.org,2002:map", data.to_omap())
1168-
1169-
1170-
@deprecated("25.5", "25.7")
1171-
def _unicode_representer(dumper, uni):
1172-
node = yaml.ScalarNode(tag="tag:yaml.org,2002:str", value=uni)
1173-
return node
1174-
1175-
11761154
class CustomDumper(yaml.Dumper):
11771155
def increase_indent(self, flow: bool = False, indentless: bool = False) -> None:
11781156
"""Control indentation.
@@ -1226,15 +1204,6 @@ def ignore_aliases(self, data: Any) -> bool:
12261204
return True
12271205

12281206

1229-
deprecated.constant(
1230-
"25.5",
1231-
"25.7",
1232-
"_IndentDumper",
1233-
CustomDumper,
1234-
addendum="Use `conda_build.render.CustomDumper` instead.",
1235-
)
1236-
1237-
12381207
def output_yaml(
12391208
metadata: MetaData,
12401209
filename: str | os.PathLike | Path | None = None,

news/5755-removing-deprecations

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
### Enhancements
2+
3+
* <news item>
4+
5+
### Bug fixes
6+
7+
* <news item>
8+
9+
### Deprecations
10+
11+
* Remove `conda_build.render._MetaYaml`. (#5755)
12+
* Remove `conda_build.render._represent_omap`. (#5755)
13+
* Remove `conda_build.render._unicode_representer`. (#5755)
14+
* Remove `conda_build.render._IndentDumper` according to deprecation policy. Use `conda_build.render.CustomDumper` instead. (#5755)
15+
16+
17+
### Docs
18+
19+
* <news item>
20+
21+
### Other
22+
23+
* <news item>

0 commit comments

Comments
 (0)