From be47b29dbd3ebf9ae1eaf2d85cbfb1a78e36e5ee Mon Sep 17 00:00:00 2001 From: Ken Odegard Date: Fri, 30 Aug 2024 11:32:00 -0500 Subject: [PATCH 1/4] Remove xdoctest --- pyproject.toml | 2 -- tests/requirements-ci.txt | 1 - 2 files changed, 3 deletions(-) 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 From fa56df334de4ae32f05e80fe717fe085b56a99f6 Mon Sep 17 00:00:00 2001 From: Ken Odegard Date: Tue, 3 Sep 2024 14:15:11 -0500 Subject: [PATCH 2/4] Ignore `run_exports` from `gcc` --- tests/test-recipes/metadata/_sysroot_detection/meta.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/test-recipes/metadata/_sysroot_detection/meta.yaml b/tests/test-recipes/metadata/_sysroot_detection/meta.yaml index bffaf71b88..0dd35e4c40 100644 --- a/tests/test-recipes/metadata/_sysroot_detection/meta.yaml +++ b/tests/test-recipes/metadata/_sysroot_detection/meta.yaml @@ -9,6 +9,8 @@ source: build: number: 0 + ignore_run_exports_from: + - {{ compiler('c') }} requirements: build: From fb9c86968176b7271be231a547bd0785f59c673f Mon Sep 17 00:00:00 2001 From: Ken Odegard Date: Tue, 3 Sep 2024 16:38:50 -0500 Subject: [PATCH 3/4] Revert "Ignore `run_exports` from `gcc`" This reverts commit fa56df334de4ae32f05e80fe717fe085b56a99f6. --- tests/test-recipes/metadata/_sysroot_detection/meta.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/test-recipes/metadata/_sysroot_detection/meta.yaml b/tests/test-recipes/metadata/_sysroot_detection/meta.yaml index 0dd35e4c40..bffaf71b88 100644 --- a/tests/test-recipes/metadata/_sysroot_detection/meta.yaml +++ b/tests/test-recipes/metadata/_sysroot_detection/meta.yaml @@ -9,8 +9,6 @@ source: build: number: 0 - ignore_run_exports_from: - - {{ compiler('c') }} requirements: build: From 412931f5317040bb1270d31cf028ddf2b589bbf5 Mon Sep 17 00:00:00 2001 From: Ken Odegard Date: Tue, 3 Sep 2024 16:29:09 -0500 Subject: [PATCH 4/4] Include libgcc in ignore_list --- conda_build/post.py | 4 ++++ 1 file changed, 4 insertions(+) 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 = {