diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index bff88ef..b7efa74 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -5,25 +5,29 @@ jobs: - job: osx pool: - vmImage: macOS-15 + vmImage: $(VMIMAGE) strategy: matrix: osx_64_draftsOFF: CONFIG: osx_64_draftsOFF UPLOAD_PACKAGES: 'True' SHORT_CONFIG: osx_64_draftsOFF + VMIMAGE: macOS-15 osx_64_draftsON: CONFIG: osx_64_draftsON UPLOAD_PACKAGES: 'True' SHORT_CONFIG: osx_64_draftsON + VMIMAGE: macOS-15 osx_arm64_draftsOFF: CONFIG: osx_arm64_draftsOFF UPLOAD_PACKAGES: 'True' SHORT_CONFIG: osx_arm64_draftsOFF + VMIMAGE: macOS-15 osx_arm64_draftsON: CONFIG: osx_arm64_draftsON UPLOAD_PACKAGES: 'True' SHORT_CONFIG: osx_arm64_draftsON + VMIMAGE: macOS-15 timeoutInMinutes: 360 variables: {} diff --git a/.ci_support/linux_64_draftsOFF.yaml b/.ci_support/linux_64_draftsOFF.yaml index a6aa1f9..e73d58c 100644 --- a/.ci_support/linux_64_draftsOFF.yaml +++ b/.ci_support/linux_64_draftsOFF.yaml @@ -6,8 +6,6 @@ c_stdlib: - sysroot c_stdlib_version: - '2.17' -cdt_name: -- conda channel_sources: - conda-forge channel_targets: @@ -21,7 +19,9 @@ docker_image: drafts: - 'OFF' krb5: -- '1.21' +- '1.22' +libsodium: +- 1.0.21 target_platform: - linux-64 zip_keys: diff --git a/.ci_support/linux_64_draftsON.yaml b/.ci_support/linux_64_draftsON.yaml index b768626..6adfc06 100644 --- a/.ci_support/linux_64_draftsON.yaml +++ b/.ci_support/linux_64_draftsON.yaml @@ -6,8 +6,6 @@ c_stdlib: - sysroot c_stdlib_version: - '2.17' -cdt_name: -- conda channel_sources: - conda-forge channel_targets: @@ -21,7 +19,9 @@ docker_image: drafts: - 'ON' krb5: -- '1.21' +- '1.22' +libsodium: +- 1.0.21 target_platform: - linux-64 zip_keys: diff --git a/.ci_support/linux_aarch64_draftsOFF.yaml b/.ci_support/linux_aarch64_draftsOFF.yaml index efca9b1..0343894 100644 --- a/.ci_support/linux_aarch64_draftsOFF.yaml +++ b/.ci_support/linux_aarch64_draftsOFF.yaml @@ -6,8 +6,6 @@ c_stdlib: - sysroot c_stdlib_version: - '2.17' -cdt_name: -- conda channel_sources: - conda-forge channel_targets: @@ -21,7 +19,9 @@ docker_image: drafts: - 'OFF' krb5: -- '1.21' +- '1.22' +libsodium: +- 1.0.21 target_platform: - linux-aarch64 zip_keys: diff --git a/.ci_support/linux_aarch64_draftsON.yaml b/.ci_support/linux_aarch64_draftsON.yaml index 81f4fd6..45a1a25 100644 --- a/.ci_support/linux_aarch64_draftsON.yaml +++ b/.ci_support/linux_aarch64_draftsON.yaml @@ -6,8 +6,6 @@ c_stdlib: - sysroot c_stdlib_version: - '2.17' -cdt_name: -- conda channel_sources: - conda-forge channel_targets: @@ -21,7 +19,9 @@ docker_image: drafts: - 'ON' krb5: -- '1.21' +- '1.22' +libsodium: +- 1.0.21 target_platform: - linux-aarch64 zip_keys: diff --git a/.ci_support/linux_ppc64le_draftsOFF.yaml b/.ci_support/linux_ppc64le_draftsOFF.yaml index cc93c2b..8671868 100644 --- a/.ci_support/linux_ppc64le_draftsOFF.yaml +++ b/.ci_support/linux_ppc64le_draftsOFF.yaml @@ -6,8 +6,6 @@ c_stdlib: - sysroot c_stdlib_version: - '2.17' -cdt_name: -- conda channel_sources: - conda-forge channel_targets: @@ -21,7 +19,9 @@ docker_image: drafts: - 'OFF' krb5: -- '1.21' +- '1.22' +libsodium: +- 1.0.21 target_platform: - linux-ppc64le zip_keys: diff --git a/.ci_support/linux_ppc64le_draftsON.yaml b/.ci_support/linux_ppc64le_draftsON.yaml index 0946921..976224b 100644 --- a/.ci_support/linux_ppc64le_draftsON.yaml +++ b/.ci_support/linux_ppc64le_draftsON.yaml @@ -6,8 +6,6 @@ c_stdlib: - sysroot c_stdlib_version: - '2.17' -cdt_name: -- conda channel_sources: - conda-forge channel_targets: @@ -21,7 +19,9 @@ docker_image: drafts: - 'ON' krb5: -- '1.21' +- '1.22' +libsodium: +- 1.0.21 target_platform: - linux-ppc64le zip_keys: diff --git a/.ci_support/migrations/libsodium1021.yaml b/.ci_support/migrations/libsodium1021.yaml new file mode 100644 index 0000000..2c8bdba --- /dev/null +++ b/.ci_support/migrations/libsodium1021.yaml @@ -0,0 +1,8 @@ +__migrator: + build_number: 1 + commit_message: Rebuild for libsodium 1.0.21 + kind: version + migration_number: 1 +migrator_ts: 1772115589.3913555 +libsodium: +- '1.0.21' diff --git a/.ci_support/osx_64_draftsOFF.yaml b/.ci_support/osx_64_draftsOFF.yaml index 72c3231..5e4397b 100644 --- a/.ci_support/osx_64_draftsOFF.yaml +++ b/.ci_support/osx_64_draftsOFF.yaml @@ -1,7 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.13' +- '11.0' MACOSX_SDK_VERSION: -- '10.13' +- '11.0' c_compiler: - clang c_compiler_version: @@ -9,7 +9,7 @@ c_compiler_version: c_stdlib: - macosx_deployment_target c_stdlib_version: -- '10.13' +- '11.0' channel_sources: - conda-forge channel_targets: @@ -21,7 +21,9 @@ cxx_compiler_version: drafts: - 'OFF' krb5: -- '1.21' +- '1.22' +libsodium: +- 1.0.21 macos_machine: - x86_64-apple-darwin13.4.0 target_platform: diff --git a/.ci_support/osx_64_draftsON.yaml b/.ci_support/osx_64_draftsON.yaml index 9afec18..03839bb 100644 --- a/.ci_support/osx_64_draftsON.yaml +++ b/.ci_support/osx_64_draftsON.yaml @@ -1,7 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.13' +- '11.0' MACOSX_SDK_VERSION: -- '10.13' +- '11.0' c_compiler: - clang c_compiler_version: @@ -9,7 +9,7 @@ c_compiler_version: c_stdlib: - macosx_deployment_target c_stdlib_version: -- '10.13' +- '11.0' channel_sources: - conda-forge channel_targets: @@ -21,7 +21,9 @@ cxx_compiler_version: drafts: - 'ON' krb5: -- '1.21' +- '1.22' +libsodium: +- 1.0.21 macos_machine: - x86_64-apple-darwin13.4.0 target_platform: diff --git a/.ci_support/osx_arm64_draftsOFF.yaml b/.ci_support/osx_arm64_draftsOFF.yaml index d844545..3036da7 100644 --- a/.ci_support/osx_arm64_draftsOFF.yaml +++ b/.ci_support/osx_arm64_draftsOFF.yaml @@ -21,7 +21,9 @@ cxx_compiler_version: drafts: - 'OFF' krb5: -- '1.21' +- '1.22' +libsodium: +- 1.0.21 macos_machine: - arm64-apple-darwin20.0.0 target_platform: diff --git a/.ci_support/osx_arm64_draftsON.yaml b/.ci_support/osx_arm64_draftsON.yaml index 2c55e83..db6620d 100644 --- a/.ci_support/osx_arm64_draftsON.yaml +++ b/.ci_support/osx_arm64_draftsON.yaml @@ -21,7 +21,9 @@ cxx_compiler_version: drafts: - 'ON' krb5: -- '1.21' +- '1.22' +libsodium: +- 1.0.21 macos_machine: - arm64-apple-darwin20.0.0 target_platform: diff --git a/.ci_support/win_64_draftsOFF.yaml b/.ci_support/win_64_draftsOFF.yaml index 7ae9785..286424a 100644 --- a/.ci_support/win_64_draftsOFF.yaml +++ b/.ci_support/win_64_draftsOFF.yaml @@ -11,6 +11,8 @@ cxx_compiler: drafts: - 'OFF' krb5: -- '1.21' +- '1.22' +libsodium: +- 1.0.21 target_platform: - win-64 diff --git a/.ci_support/win_64_draftsON.yaml b/.ci_support/win_64_draftsON.yaml index f26e2fd..c552cfd 100644 --- a/.ci_support/win_64_draftsON.yaml +++ b/.ci_support/win_64_draftsON.yaml @@ -11,6 +11,8 @@ cxx_compiler: drafts: - 'ON' krb5: -- '1.21' +- '1.22' +libsodium: +- 1.0.21 target_platform: - win-64 diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index dc47cdf..6a9653c 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -63,6 +63,25 @@ if [[ "${sha:-}" == "" ]]; then sha=$(git rev-parse HEAD) fi +if [[ "${OSX_SDK_DIR:-}" == "" ]]; then + if [[ "${CI:-}" == "" ]]; then + echo "Please set OSX_SDK_DIR to a directory where SDKs can be downloaded to. Aborting" + exit 1 + else + export OSX_SDK_DIR=/opt/conda-sdks + /usr/bin/sudo mkdir -p "${OSX_SDK_DIR}" + /usr/bin/sudo chown "${USER}" "${OSX_SDK_DIR}" + fi +else + if tmpf=$(mktemp -p "$OSX_SDK_DIR" tmp.XXXXXXXX 2>/dev/null); then + rm -f "$tmpf" + echo "OSX_SDK_DIR is writeable without sudo, continuing" + else + echo "User-provided OSX_SDK_DIR is not writeable for current user! Aborting" + exit 1 + fi +fi + echo -e "\n\nRunning the build setup script." source run_conda_forge_build_setup diff --git a/LICENSE.txt b/LICENSE.txt index 2ec51d7..c5aa738 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,6 +1,5 @@ BSD-3-Clause license -Copyright (c) 2015-2022, conda-forge contributors -All rights reserved. +Copyright (c) 2015-2026, conda-forge contributors Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/README.md b/README.md index 1515085..a844a33 100644 --- a/README.md +++ b/README.md @@ -194,12 +194,12 @@ it is possible to build and upload installable packages to the [conda-forge](https://anaconda.org/conda-forge) [anaconda.org](https://anaconda.org/) channel for Linux, Windows and OSX respectively. -To manage the continuous integration and simplify feedstock maintenance +To manage the continuous integration and simplify feedstock maintenance, [conda-smithy](https://github.com/conda-forge/conda-smithy) has been developed. Using the ``conda-forge.yml`` within this repository, it is possible to re-render all of this feedstock's supporting files (e.g. the CI configuration files) with ``conda smithy rerender``. -For more information please check the [conda-forge documentation](https://conda-forge.org/docs/). +For more information, please check the [conda-forge documentation](https://conda-forge.org/docs/). Terminology =========== @@ -226,7 +226,7 @@ merged, the recipe will be re-built and uploaded automatically to the everybody to install and use from the `conda-forge` channel. Note that all branches in the conda-forge/zeromq-feedstock are immediately built and any created packages are uploaded, so PRs should be based -on branches in forks and branches in the main repository should only be used to +on branches in forks, and branches in the main repository should only be used to build distinct package versions. In order to produce a uniquely identifiable distribution: diff --git a/azure-pipelines.yml b/azure-pipelines.yml index eff4ad6..438c19b 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -7,7 +7,7 @@ stages: jobs: - job: Skip pool: - vmImage: 'ubuntu-22.04' + vmImage: 'ubuntu-latest' variables: DECODE_PERCENTS: 'false' RET: 'true' diff --git a/build-locally.py b/build-locally.py index 9dfe440..825a4af 100755 --- a/build-locally.py +++ b/build-locally.py @@ -1,5 +1,6 @@ #!/bin/sh """exec" "python3" "$0" "$@" #""" # fmt: off # fmt: on + # # This file has been generated by conda-smithy in order to build the recipe # locally. diff --git a/conda-forge.yml b/conda-forge.yml index 44b7c88..31cc134 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -1,9 +1,9 @@ azure: store_build_artifacts: true build_platform: - osx_arm64: osx_64 linux_aarch64: linux_64 linux_ppc64le: linux_64 + osx_arm64: osx_64 conda_build: pkg_format: '2' conda_build_tool: rattler-build diff --git a/recipe/recipe.yaml b/recipe/recipe.yaml index 7a99047..f7f8f81 100644 --- a/recipe/recipe.yaml +++ b/recipe/recipe.yaml @@ -3,7 +3,7 @@ schema_version: 1 context: name: zeromq version: 4.3.5 - build: 9 + build: 10 build_drafts: ${{ drafts == "ON" }} build_prefix: "${{ 'drafts_' if build_drafts else '' }}"