From 29f08671ec54bc9407c205845108db88e890fcf1 Mon Sep 17 00:00:00 2001 From: Ben Haller Date: Mon, 6 May 2024 07:18:25 +0200 Subject: [PATCH 1/5] add stdlibc jinja for next release --- recipe/meta.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index c6b3ba1..adb305a 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -21,6 +21,8 @@ requirements: - {{ compiler('cxx') }} # [not win] - {{ compiler('m2w64_c') }} # [win] - {{ compiler('m2w64_cxx') }} # [win] + # Uses stdlibc; see https://conda-forge.org/news/2024/03/24/stdlib-migration/ + - {{ stdlib("c") }} # Full posix environment. - m2-base # [win] From fb905b7c7d051ed3e3859566d087127523a3ec4d Mon Sep 17 00:00:00 2001 From: Ben Haller Date: Tue, 17 Sep 2024 09:37:47 -0400 Subject: [PATCH 2/5] Update meta.yaml for SLiM 4.3 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index adb305a..a9c712c 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,5 @@ {% set name = "SLiM" %} -{% set version = "4.2.2" %} +{% set version = "4.3" %} package: name: {{ name|lower }} @@ -7,7 +7,7 @@ package: source: url: https://github.com/MesserLab/SLiM/archive/v{{ version }}.tar.gz - sha256: bb63b73e878fb6c15a49f33c3bf1a67047ebb6a11e3d17f930780461dd450400 + sha256: b390a6638a915d6f955608610bca6e94fc0f4d62f5ad07376b2aa98756e8c81d build: number: 0 From 827ae8a4a56857196c9f87a73ac017a3eae2f1b4 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Tue, 17 Sep 2024 13:42:16 +0000 Subject: [PATCH 3/5] MNT: Re-rendered with conda-build 24.7.1, conda-smithy 3.39.1, and conda-forge-pinning 2024.09.17.12.57.55 --- .azure-pipelines/azure-pipelines-win.yml | 2 +- .ci_support/linux_64_.yaml | 12 +++++++++--- .ci_support/osx_64_.yaml | 12 +++++++++--- .ci_support/osx_arm64_.yaml | 10 ++++++++-- .ci_support/win_64_.yaml | 2 ++ .gitattributes | 4 ++-- .scripts/build_steps.sh | 6 ++++++ .scripts/run_osx_build.sh | 9 ++++++++- .scripts/run_win_build.bat | 5 +++++ build-locally.py | 9 ++++++--- 10 files changed, 56 insertions(+), 15 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index d609fcd..204327b 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -24,7 +24,7 @@ jobs: scriptSource: inline script: | import urllib.request - url = 'https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-Windows-x86_64.exe' + url = 'https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Windows-x86_64.exe' path = r"$(Build.ArtifactStagingDirectory)/Miniforge.exe" urllib.request.urlretrieve(url, path) diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index d0283c3..fd1b3b6 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -1,9 +1,13 @@ c_compiler: - gcc c_compiler_version: -- '12' +- '13' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: -- cos6 +- cos7 channel_sources: - conda-forge channel_targets: @@ -11,7 +15,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 target_platform: @@ -19,3 +23,5 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index cd507ed..ebeac92 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -1,9 +1,15 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' +- '10.13' +MACOSX_SDK_VERSION: +- '10.13' c_compiler: - clang c_compiler_version: -- '16' +- '17' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' channel_sources: - conda-forge channel_targets: @@ -11,7 +17,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' macos_machine: - x86_64-apple-darwin13.4.0 target_platform: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index 12945c4..0a445c6 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -1,9 +1,15 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' c_compiler: - clang c_compiler_version: -- '16' +- '17' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' channel_sources: - conda-forge channel_targets: @@ -11,7 +17,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' macos_machine: - arm64-apple-darwin20.0.0 target_platform: diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml index db5b017..68366be 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_.yaml @@ -1,3 +1,5 @@ +c_stdlib: +- vs channel_sources: - conda-forge channel_targets: diff --git a/.gitattributes b/.gitattributes index 7f32763..18f114a 100644 --- a/.gitattributes +++ b/.gitattributes @@ -20,8 +20,8 @@ bld.bat text eol=crlf .travis.yml linguist-generated=true .scripts/* linguist-generated=true .woodpecker.yml linguist-generated=true -LICENSE.txt linguist-generated=true -README.md linguist-generated=true +/LICENSE.txt linguist-generated=true +/README.md linguist-generated=true azure-pipelines.yml linguist-generated=true build-locally.py linguist-generated=true shippable.yml linguist-generated=true diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 899ba03..ba4b251 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -72,6 +72,12 @@ else --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" \ --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" + ( startgroup "Inspecting artifacts" ) 2> /dev/null + + # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" + + ( endgroup "Inspecting artifacts" ) 2> /dev/null ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 07dff21..420f051 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -11,7 +11,7 @@ MINIFORGE_HOME=${MINIFORGE_HOME:-${HOME}/miniforge3} ( startgroup "Installing a fresh version of Miniforge" ) 2> /dev/null MINIFORGE_URL="https://github.com/conda-forge/miniforge/releases/latest/download" -MINIFORGE_FILE="Mambaforge-MacOSX-$(uname -m).sh" +MINIFORGE_FILE="Miniforge3-MacOSX-$(uname -m).sh" curl -L -O "${MINIFORGE_URL}/${MINIFORGE_FILE}" rm -rf ${MINIFORGE_HOME} bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} @@ -85,6 +85,13 @@ else --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file ./.ci_support/clobber_${CONFIG}.yaml \ --extra-meta flow_run_id="$flow_run_id" remote_url="$remote_url" sha="$sha" + + ( startgroup "Inspecting artifacts" ) 2> /dev/null + + # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" + + ( endgroup "Inspecting artifacts" ) 2> /dev/null ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat index 6d54697..65650bf 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -58,6 +58,11 @@ echo Building recipe conda-build.exe "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% if !errorlevel! neq 0 exit /b !errorlevel! +call :start_group "Inspecting artifacts" +:: inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 +WHERE inspect_artifacts >nul 2>nul && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" +call :end_group + :: Prepare some environment variables for the upload step if /i "%CI%" == "github_actions" ( set "FEEDSTOCK_NAME=%GITHUB_REPOSITORY:*/=%" diff --git a/build-locally.py b/build-locally.py index e0d408d..8ac9b84 100755 --- a/build-locally.py +++ b/build-locally.py @@ -1,13 +1,16 @@ -#!/usr/bin/env python3 +#!/bin/sh +"""exec' "python3" "$0" "$@" #""" # fmt: off # fmt: on # # This file has been generated by conda-smithy in order to build the recipe # locally. # -import os +# The line above this comment is a bash / sh / zsh guard +# to stop people from running it with the wrong interpreter import glob +import os +import platform import subprocess from argparse import ArgumentParser -import platform def setup_environment(ns): From c29207c5d4bd43a18aa711648c01ed73a8ca374b Mon Sep 17 00:00:00 2001 From: Ben Haller Date: Tue, 17 Sep 2024 13:30:21 -0400 Subject: [PATCH 4/5] hand-merge of changes from @zklaus @zklaus very helpfully provided fixes for some build problems on Windows, in https://github.com/conda-forge/slim-feedstock/pull/25/files, but it's a draft PR and can't be merged, and he has gone offline, and I need to get this release out today, so I am making his changes here. --- recipe/bld.bat | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index b30fa27..9b3d6c9 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -1,19 +1,22 @@ +@echo on + setlocal EnableDelayedExpansion mkdir build cd build -:: Work around bug in mingw (we're stuck at gcc 5.3.0). -:: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=52991 -set EXTRA_FLAGS="-mno-ms-bitfields" +set "HOST=x86_64-w64-mingw32" +set "CC=%HOST%-gcc.exe" +set "CXX=%HOST%-g++.exe" +set "AR=%HOST%-gcc-ar.exe" +set "RANLIB=%HOST%-gcc-ranlib.exe" cmake -G "MSYS Makefiles" ^ + %CMAKE_ARGS% ^ -DCMAKE_INSTALL_PREFIX:PATH="%LIBRARY_PREFIX%" ^ -DCMAKE_PREFIX_PATH:PATH="%LIBRARY_PREFIX%" ^ -DCMAKE_BUILD_TYPE:STRING=Release ^ -DCMAKE_CXX_STANDARD_LIBRARIES:STRING="-lpsapi" ^ - -DCMAKE_C_FLAGS="%EXTRA_FLAGS%" ^ - -DCMAKE_CXX_FLAGS="%EXTRA_FLAGS%" ^ .. if errorlevel 1 exit 1 From 565a2f615daa5d073ee6a210b9ebf67485a964d8 Mon Sep 17 00:00:00 2001 From: Ben Haller Date: Tue, 17 Sep 2024 13:32:17 -0400 Subject: [PATCH 5/5] Update meta.yaml --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index d871d43..a7872f6 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -10,7 +10,7 @@ source: sha256: b390a6638a915d6f955608610bca6e94fc0f4d62f5ad07376b2aa98756e8c81d build: - number: 1 + number: 2 requirements: build: