diff --git a/conda_build/post.py b/conda_build/post.py index 6b10af2a78..42bf319753 100644 --- a/conda_build/post.py +++ b/conda_build/post.py @@ -1325,7 +1325,11 @@ def check_overlinking_impl( precs.append(pkg_vendored_dist) ignore_list = utils.ensure_list(ignore_run_exports) if subdir.startswith("linux"): + # libgcc-ng is the defaults & old conda-forge package name ignore_list.append("libgcc-ng") + # conda-forge::libgcc-ng was renamed 08/27/2024 + # see https://github.com/conda-forge/ctng-compilers-feedstock/pull/148 + ignore_list.append("libgcc") package_nature = {prec: library_nature(prec, run_prefix) for prec in precs} lib_packages = { diff --git a/pyproject.toml b/pyproject.toml index 12fe4731f6..69d2622d71 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -107,8 +107,6 @@ addopts = [ # "--store-durations", # not available yet "--strict-markers", "--tb=native", - "--xdoctest-modules", - "--xdoctest-style=google", "-vv", ] doctest_optionflags = [ diff --git a/tests/requirements-ci.txt b/tests/requirements-ci.txt index 23d78bb0b2..0d3b9a1fee 100644 --- a/tests/requirements-ci.txt +++ b/tests/requirements-ci.txt @@ -1,5 +1,4 @@ anaconda-client -conda-forge::xdoctest conda-verify contextlib2 coverage