From 6eedf7b7ef79e4e2d1427427672516823e03cf80 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Tue, 26 Nov 2024 15:38:12 +0100 Subject: [PATCH 1/2] Unpin Python in tests --- recipe/meta.yaml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 1f88f0b..0b02252 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -12,7 +12,7 @@ source: - patches/0021-Add-d1trimfile-SRC_DIR-to-make-pdbs-more-relocatable.patch build: - number: 0 + number: 1 noarch: python requirements: @@ -23,7 +23,11 @@ requirements: test: requires: - - python {{ python_min }} + # The linter will complain about the missing python_min, but we need + # this unpinned to allow setuptools to be used in the downstream tests + # of the python-feedstock. + # See also https://github.com/conda-forge/conda-forge.github.io/pull/2387 + - python imports: - setuptools - pkg_resources From 1f67e6663574d21b40e7ab54c321e33c19788a4b Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Tue, 26 Nov 2024 15:42:08 +0100 Subject: [PATCH 2/2] MNT: Re-rendered with conda-build 24.11.1, conda-smithy 3.44.8, and conda-forge-pinning 2024.11.26.07.33.56 --- .azure-pipelines/azure-pipelines-linux.yml | 2 +- .ci_support/linux_64_.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 875d996..1741648 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -11,7 +11,7 @@ jobs: linux_64_: CONFIG: linux_64_ UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 timeoutInMinutes: 360 variables: {} diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index b4ff262..493b486 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -5,7 +5,7 @@ channel_sources: channel_targets: - conda-forge main docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-x86_64:alma9 pin_run_as_build: python: min_pin: x.x