From b89dd8cae6173d34afc49707a68129356ad53aa6 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Sat, 12 Mar 2022 09:02:22 +0000 Subject: [PATCH 1/3] Rebuild for openssl3 --- .ci_support/migrations/openssl3.yaml | 8 ++++++++ recipe/meta.yaml | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 .ci_support/migrations/openssl3.yaml diff --git a/.ci_support/migrations/openssl3.yaml b/.ci_support/migrations/openssl3.yaml new file mode 100644 index 0000000..ae551c1 --- /dev/null +++ b/.ci_support/migrations/openssl3.yaml @@ -0,0 +1,8 @@ +__migrator: + build_number: 1 + kind: version + migration_number: 1 +migrator_ts: 1631932209.13688 +openssl: +- 1.1.1 +- '3' diff --git a/recipe/meta.yaml b/recipe/meta.yaml index a59fedf..8247e33 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -21,7 +21,7 @@ source: - disable-backtrace-with-lines.patch build: - number: 3 + number: 4 skip: True # [win] track_features: - rb{{ major_minor | replace(".", "") }} From 214f795924e2c64a77b3cf0945850909aea606a1 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Sat, 12 Mar 2022 09:02:53 +0000 Subject: [PATCH 2/3] MNT: Re-rendered with conda-build 3.21.8, conda-smithy 3.18.0, and conda-forge-pinning 2022.03.10.18.35.59 --- .azure-pipelines/azure-pipelines-linux.yml | 16 +++++-- .azure-pipelines/azure-pipelines-osx.yml | 7 ++- .ci_support/README | 7 ++- ...ux_64_.yaml => linux_64_openssl1.1.1.yaml} | 8 ++-- .ci_support/linux_64_openssl3.yaml | 42 +++++++++++++++++ ..._.yaml => linux_aarch64_openssl1.1.1.yaml} | 8 ++-- .ci_support/linux_aarch64_openssl3.yaml | 46 +++++++++++++++++++ ..._.yaml => linux_ppc64le_openssl1.1.1.yaml} | 8 ++-- .ci_support/linux_ppc64le_openssl3.yaml | 42 +++++++++++++++++ ...{osx_64_.yaml => osx_64_openssl1.1.1.yaml} | 8 ++-- .ci_support/osx_64_openssl3.yaml | 42 +++++++++++++++++ .gitattributes | 1 + .scripts/build_steps.sh | 6 ++- .scripts/run_docker_build.sh | 2 +- .scripts/run_osx_build.sh | 42 +++++++++++------ .travis.yml | 25 +++++----- LICENSE.txt | 2 +- README.md | 44 ++++++++++++++---- build-locally.py | 11 ++--- 19 files changed, 297 insertions(+), 70 deletions(-) rename .ci_support/{linux_64_.yaml => linux_64_openssl1.1.1.yaml} (91%) create mode 100644 .ci_support/linux_64_openssl3.yaml rename .ci_support/{linux_aarch64_.yaml => linux_aarch64_openssl1.1.1.yaml} (92%) create mode 100644 .ci_support/linux_aarch64_openssl3.yaml rename .ci_support/{linux_ppc64le_.yaml => linux_ppc64le_openssl1.1.1.yaml} (91%) create mode 100644 .ci_support/linux_ppc64le_openssl3.yaml rename .ci_support/{osx_64_.yaml => osx_64_openssl1.1.1.yaml} (91%) create mode 100644 .ci_support/osx_64_openssl3.yaml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 93cd877..2a218bc 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,12 +8,20 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_: - CONFIG: linux_64_ + linux_64_openssl1.1.1: + CONFIG: linux_64_openssl1.1.1 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_: - CONFIG: linux_aarch64_ + linux_64_openssl3: + CONFIG: linux_64_openssl3 + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_aarch64_openssl1.1.1: + CONFIG: linux_aarch64_openssl1.1.1 + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64 + linux_aarch64_openssl3: + CONFIG: linux_aarch64_openssl3 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64 timeoutInMinutes: 360 diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index d7c37d2..dc5a047 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -8,8 +8,11 @@ jobs: vmImage: macOS-10.15 strategy: matrix: - osx_64_: - CONFIG: osx_64_ + osx_64_openssl1.1.1: + CONFIG: osx_64_openssl1.1.1 + UPLOAD_PACKAGES: 'True' + osx_64_openssl3: + CONFIG: osx_64_openssl3 UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 diff --git a/.ci_support/README b/.ci_support/README index e4e2dce..a47316b 100644 --- a/.ci_support/README +++ b/.ci_support/README @@ -1 +1,6 @@ -This file is automatically generated by conda-smithy. To change any matrix elements, you should change conda-smithy's input conda_build_config.yaml and re-render the recipe, rather than editing these files directly. \ No newline at end of file +This file is automatically generated by conda-smithy. If any +particular build configuration is expected, but it is not found, +please make sure all dependencies are satisfiable. To add/modify any +matrix elements, you should create/change conda-smithy's input +recipe/conda_build_config.yaml and re-render the recipe, rather than +editing these files directly. diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_openssl1.1.1.yaml similarity index 91% rename from .ci_support/linux_64_.yaml rename to .ci_support/linux_64_openssl1.1.1.yaml index a7d714b..141c81a 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_openssl1.1.1.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '9' +- '10' cdt_name: - cos6 channel_sources: @@ -11,7 +11,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '9' +- '10' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 gmp: @@ -19,7 +19,7 @@ gmp: libffi: - '3.4' ncurses: -- '6.2' +- '6' openssl: - 1.1.1 pin_run_as_build: @@ -27,8 +27,6 @@ pin_run_as_build: max_pin: x libffi: max_pin: x.x - ncurses: - max_pin: x.x readline: max_pin: x zlib: diff --git a/.ci_support/linux_64_openssl3.yaml b/.ci_support/linux_64_openssl3.yaml new file mode 100644 index 0000000..2a40072 --- /dev/null +++ b/.ci_support/linux_64_openssl3.yaml @@ -0,0 +1,42 @@ +c_compiler: +- gcc +c_compiler_version: +- '10' +cdt_name: +- cos6 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '10' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +gmp: +- '6' +libffi: +- '3.4' +ncurses: +- '6' +openssl: +- '3' +pin_run_as_build: + gmp: + max_pin: x + libffi: + max_pin: x.x + readline: + max_pin: x + zlib: + max_pin: x.x +readline: +- '8' +target_platform: +- linux-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +zlib: +- '1.2' diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_openssl1.1.1.yaml similarity index 92% rename from .ci_support/linux_aarch64_.yaml rename to .ci_support/linux_aarch64_openssl1.1.1.yaml index 4be540f..a92ef66 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_openssl1.1.1.yaml @@ -3,7 +3,7 @@ BUILD: c_compiler: - gcc c_compiler_version: -- '9' +- '10' cdt_arch: - aarch64 cdt_name: @@ -15,7 +15,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '9' +- '10' docker_image: - quay.io/condaforge/linux-anvil-aarch64 gmp: @@ -23,7 +23,7 @@ gmp: libffi: - '3.4' ncurses: -- '6.2' +- '6' openssl: - 1.1.1 pin_run_as_build: @@ -31,8 +31,6 @@ pin_run_as_build: max_pin: x libffi: max_pin: x.x - ncurses: - max_pin: x.x readline: max_pin: x zlib: diff --git a/.ci_support/linux_aarch64_openssl3.yaml b/.ci_support/linux_aarch64_openssl3.yaml new file mode 100644 index 0000000..3d91689 --- /dev/null +++ b/.ci_support/linux_aarch64_openssl3.yaml @@ -0,0 +1,46 @@ +BUILD: +- aarch64-conda_cos7-linux-gnu +c_compiler: +- gcc +c_compiler_version: +- '10' +cdt_arch: +- aarch64 +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '10' +docker_image: +- quay.io/condaforge/linux-anvil-aarch64 +gmp: +- '6' +libffi: +- '3.4' +ncurses: +- '6' +openssl: +- '3' +pin_run_as_build: + gmp: + max_pin: x + libffi: + max_pin: x.x + readline: + max_pin: x + zlib: + max_pin: x.x +readline: +- '8' +target_platform: +- linux-aarch64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +zlib: +- '1.2' diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_openssl1.1.1.yaml similarity index 91% rename from .ci_support/linux_ppc64le_.yaml rename to .ci_support/linux_ppc64le_openssl1.1.1.yaml index 7ba0abf..ad5b528 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.ci_support/linux_ppc64le_openssl1.1.1.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '9' +- '10' cdt_name: - cos7 channel_sources: @@ -11,7 +11,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '9' +- '10' docker_image: - quay.io/condaforge/linux-anvil-ppc64le gmp: @@ -19,7 +19,7 @@ gmp: libffi: - '3.4' ncurses: -- '6.2' +- '6' openssl: - 1.1.1 pin_run_as_build: @@ -27,8 +27,6 @@ pin_run_as_build: max_pin: x libffi: max_pin: x.x - ncurses: - max_pin: x.x readline: max_pin: x zlib: diff --git a/.ci_support/linux_ppc64le_openssl3.yaml b/.ci_support/linux_ppc64le_openssl3.yaml new file mode 100644 index 0000000..6eca12f --- /dev/null +++ b/.ci_support/linux_ppc64le_openssl3.yaml @@ -0,0 +1,42 @@ +c_compiler: +- gcc +c_compiler_version: +- '10' +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '10' +docker_image: +- quay.io/condaforge/linux-anvil-ppc64le +gmp: +- '6' +libffi: +- '3.4' +ncurses: +- '6' +openssl: +- '3' +pin_run_as_build: + gmp: + max_pin: x + libffi: + max_pin: x.x + readline: + max_pin: x + zlib: + max_pin: x.x +readline: +- '8' +target_platform: +- linux-ppc64le +zip_keys: +- - c_compiler_version + - cxx_compiler_version +zlib: +- '1.2' diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_openssl1.1.1.yaml similarity index 91% rename from .ci_support/osx_64_.yaml rename to .ci_support/osx_64_openssl1.1.1.yaml index 2accc56..40d73ac 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_openssl1.1.1.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '11' +- '12' channel_sources: - conda-forge channel_targets: @@ -11,7 +11,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '11' +- '12' gmp: - '6' libffi: @@ -19,7 +19,7 @@ libffi: macos_machine: - x86_64-apple-darwin13.4.0 ncurses: -- '6.2' +- '6' openssl: - 1.1.1 pin_run_as_build: @@ -27,8 +27,6 @@ pin_run_as_build: max_pin: x libffi: max_pin: x.x - ncurses: - max_pin: x.x readline: max_pin: x zlib: diff --git a/.ci_support/osx_64_openssl3.yaml b/.ci_support/osx_64_openssl3.yaml new file mode 100644 index 0000000..c6e8933 --- /dev/null +++ b/.ci_support/osx_64_openssl3.yaml @@ -0,0 +1,42 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.9' +c_compiler: +- clang +c_compiler_version: +- '12' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '12' +gmp: +- '6' +libffi: +- '3.4' +macos_machine: +- x86_64-apple-darwin13.4.0 +ncurses: +- '6' +openssl: +- '3' +pin_run_as_build: + gmp: + max_pin: x + libffi: + max_pin: x.x + readline: + max_pin: x + zlib: + max_pin: x.x +readline: +- '8' +target_platform: +- osx-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +zlib: +- '1.2' diff --git a/.gitattributes b/.gitattributes index ce52713..7f32763 100644 --- a/.gitattributes +++ b/.gitattributes @@ -9,6 +9,7 @@ bld.bat text eol=crlf # github helper pieces to make some files not show up in diffs automatically .azure-pipelines/* linguist-generated=true .circleci/* linguist-generated=true +.ci_support/README linguist-generated=true .drone/* linguist-generated=true .drone.yml linguist-generated=true .github/* linguist-generated=true diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index ff01283..d71d6ae 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -29,8 +29,10 @@ conda-build: CONDARC -mamba install --update-specs --yes --quiet "conda-forge-ci-setup=3" conda-build pip boa -c conda-forge -mamba update --update-specs --yes --quiet "conda-forge-ci-setup=3" conda-build pip boa -c conda-forge +mamba install --update-specs --yes --quiet --channel conda-forge \ + conda-build pip boa conda-forge-ci-setup=3 +mamba update --update-specs --yes --quiet --channel conda-forge \ + conda-build pip boa conda-forge-ci-setup=3 # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh index 0c6515f..9236239 100755 --- a/.scripts/run_docker_build.sh +++ b/.scripts/run_docker_build.sh @@ -14,7 +14,7 @@ set -xeo pipefail THISDIR="$( cd "$( dirname "$0" )" >/dev/null && pwd )" PROVIDER_DIR="$(basename $THISDIR)" -FEEDSTOCK_ROOT=$(cd "$(dirname "$0")/.."; pwd;) +FEEDSTOCK_ROOT="$( cd "$( dirname "$0" )/.." >/dev/null && pwd )" RECIPE_ROOT="${FEEDSTOCK_ROOT}/recipe" if [ -z ${FEEDSTOCK_NAME} ]; then diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index d10e0c2..19843e0 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -23,9 +23,11 @@ bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} source ${MINIFORGE_HOME}/etc/profile.d/conda.sh conda activate base -echo -e "\n\nInstalling conda-forge-ci-setup=3 and conda-build." -mamba install -n base --update-specs --quiet --yes "conda-forge-ci-setup=3" conda-build pip boa -mamba update -n base --update-specs --quiet --yes "conda-forge-ci-setup=3" conda-build pip boa +echo -e "\n\nInstalling ['conda-forge-ci-setup=3'] and conda-build." +mamba install --update-specs --quiet --yes --channel conda-forge \ + conda-build pip boa conda-forge-ci-setup=3 +mamba update --update-specs --yes --quiet --channel conda-forge \ + conda-build pip boa conda-forge-ci-setup=3 @@ -51,21 +53,35 @@ source run_conda_forge_build_setup ( endgroup "Configuring conda" ) 2> /dev/null - echo -e "\n\nMaking the build clobber file" make_build_number ./ ./recipe ./.ci_support/${CONFIG}.yaml -conda mambabuild ./recipe -m ./.ci_support/${CONFIG}.yaml --suppress-variables --clobber-file ./.ci_support/clobber_${CONFIG}.yaml ${EXTRA_CB_OPTIONS:-} -( startgroup "Validating outputs" ) 2> /dev/null -validate_recipe_outputs "${FEEDSTOCK_NAME}" +if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then + if [[ "x${BUILD_OUTPUT_ID:-}" != "x" ]]; then + EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --output-id ${BUILD_OUTPUT_ID}" + fi + conda debug ./recipe -m ./.ci_support/${CONFIG}.yaml \ + ${EXTRA_CB_OPTIONS:-} \ + --clobber-file ./.ci_support/clobber_${CONFIG}.yaml -( endgroup "Validating outputs" ) 2> /dev/null + # Drop into an interactive shell + /bin/bash +else + conda mambabuild ./recipe -m ./.ci_support/${CONFIG}.yaml \ + --suppress-variables ${EXTRA_CB_OPTIONS:-} \ + --clobber-file ./.ci_support/clobber_${CONFIG}.yaml + ( startgroup "Validating outputs" ) 2> /dev/null -( startgroup "Uploading packages" ) 2> /dev/null + validate_recipe_outputs "${FEEDSTOCK_NAME}" -if [[ "${UPLOAD_PACKAGES}" != "False" ]] && [[ "${IS_PR_BUILD}" == "False" ]]; then - upload_package --validate --feedstock-name="${FEEDSTOCK_NAME}" ./ ./recipe ./.ci_support/${CONFIG}.yaml -fi + ( endgroup "Validating outputs" ) 2> /dev/null + + ( startgroup "Uploading packages" ) 2> /dev/null + + if [[ "${UPLOAD_PACKAGES}" != "False" ]] && [[ "${IS_PR_BUILD}" == "False" ]]; then + upload_package --validate --feedstock-name="${FEEDSTOCK_NAME}" ./ ./recipe ./.ci_support/${CONFIG}.yaml + fi -( endgroup "Uploading packages" ) 2> /dev/null \ No newline at end of file + ( endgroup "Uploading packages" ) 2> /dev/null +fi \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 0c14da2..dc34005 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,18 +7,21 @@ language: generic matrix: include: - - env: CONFIG=linux_ppc64le_ UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le - os: linux - arch: ppc64le - dist: focal + - env: CONFIG=linux_ppc64le_openssl1.1.1 UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le + os: linux + arch: ppc64le + dist: focal + + - env: CONFIG=linux_ppc64le_openssl3 UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le + os: linux + arch: ppc64le + dist: focal script: -- export CI=travis -- export GIT_BRANCH="$TRAVIS_BRANCH" -- export FEEDSTOCK_NAME=$(basename ${TRAVIS_REPO_SLUG}) -- if [[ "${TRAVIS_PULL_REQUEST:-}" == "false" ]]; then export IS_PR_BUILD="False"; - else export IS_PR_BUILD="True"; fi + - export CI=travis + - export GIT_BRANCH="$TRAVIS_BRANCH" + - export FEEDSTOCK_NAME=$(basename ${TRAVIS_REPO_SLUG}) + - if [[ "${TRAVIS_PULL_REQUEST:-}" == "false" ]]; then export IS_PR_BUILD="False"; else export IS_PR_BUILD="True"; fi -- if [[ ${PLATFORM} =~ .*linux.* ]]; then CONDA_FORGE_DOCKER_RUN_ARGS=--network=host - ./.scripts/run_docker_build.sh; fi + - if [[ ${PLATFORM} =~ .*linux.* ]]; then CONDA_FORGE_DOCKER_RUN_ARGS=--network=host ./.scripts/run_docker_build.sh; fi \ No newline at end of file diff --git a/LICENSE.txt b/LICENSE.txt index ed3f451..6ec1401 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,5 +1,5 @@ BSD 3-clause license -Copyright (c) 2015-2021, conda-forge contributors +Copyright (c) 2015-2022, conda-forge contributors All rights reserved. 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 b1b53fb..e512977 100644 --- a/README.md +++ b/README.md @@ -42,31 +42,59 @@ Current build status - + - + - + - + + + + + + + + + + + + + diff --git a/build-locally.py b/build-locally.py index 8b74348..eec38a0 100755 --- a/build-locally.py +++ b/build-locally.py @@ -22,10 +22,6 @@ def setup_environment(ns): os.environ["MINIFORGE_HOME"] = os.path.join( os.path.dirname(__file__), "miniforge3" ) - if "OSX_SDK_DIR" not in os.environ: - os.environ["OSX_SDK_DIR"] = os.path.join( - os.path.dirname(__file__), "SDKs" - ) def run_docker_build(ns): @@ -65,11 +61,12 @@ def verify_config(ns): raise ValueError( f"only Linux/macOS configs currently supported, got {ns.config}" ) - elif ns.config.startswith("osx") and platform.system() == "Darwin": + elif ns.config.startswith("osx"): if "OSX_SDK_DIR" not in os.environ: raise RuntimeError( - "Need OSX_SDK_DIR env variable set. Run 'export OSX_SDK_DIR=/opt'" - "to download the SDK automatically to '/opt/MacOSX.sdk'" + "Need OSX_SDK_DIR env variable set. Run 'export OSX_SDK_DIR=SDKs' " + "to download the SDK automatically to 'SDKs/MacOSX.sdk'. " + "Setting this variable implies agreement to the licensing terms of the SDK by Apple." ) From 23a86c794d3a1388543fea745d3da9a93bedcea1 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Mon, 24 Oct 2022 00:49:09 +0000 Subject: [PATCH 3/3] MNT: Re-rendered with conda-build 3.22.0, conda-smithy 3.21.2, and conda-forge-pinning 2022.10.23.10.16.33 --- .azure-pipelines/azure-pipelines-osx.yml | 2 +- .ci_support/linux_64_openssl1.1.1.yaml | 9 ----- .ci_support/linux_64_openssl3.yaml | 9 ----- .ci_support/linux_aarch64_openssl1.1.1.yaml | 9 ----- .ci_support/linux_aarch64_openssl3.yaml | 9 ----- .ci_support/linux_ppc64le_openssl1.1.1.yaml | 9 ----- .ci_support/linux_ppc64le_openssl3.yaml | 9 ----- .ci_support/osx_64_openssl1.1.1.yaml | 13 +------ .ci_support/osx_64_openssl3.yaml | 13 +------ .circleci/config.yml | 3 +- .scripts/build_steps.sh | 9 ++++- .scripts/run_osx_build.sh | 4 ++ .travis.yml | 2 +- LICENSE.txt | 30 ++++++++++---- README.md | 43 +++++++++++++++++---- build-locally.py | 19 ++++++--- 16 files changed, 90 insertions(+), 102 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index dc5a047..eda1104 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -5,7 +5,7 @@ jobs: - job: osx pool: - vmImage: macOS-10.15 + vmImage: macOS-11 strategy: matrix: osx_64_openssl1.1.1: diff --git a/.ci_support/linux_64_openssl1.1.1.yaml b/.ci_support/linux_64_openssl1.1.1.yaml index 141c81a..53a0728 100644 --- a/.ci_support/linux_64_openssl1.1.1.yaml +++ b/.ci_support/linux_64_openssl1.1.1.yaml @@ -22,15 +22,6 @@ ncurses: - '6' openssl: - 1.1.1 -pin_run_as_build: - gmp: - max_pin: x - libffi: - max_pin: x.x - readline: - max_pin: x - zlib: - max_pin: x.x readline: - '8' target_platform: diff --git a/.ci_support/linux_64_openssl3.yaml b/.ci_support/linux_64_openssl3.yaml index 2a40072..879a4a9 100644 --- a/.ci_support/linux_64_openssl3.yaml +++ b/.ci_support/linux_64_openssl3.yaml @@ -22,15 +22,6 @@ ncurses: - '6' openssl: - '3' -pin_run_as_build: - gmp: - max_pin: x - libffi: - max_pin: x.x - readline: - max_pin: x - zlib: - max_pin: x.x readline: - '8' target_platform: diff --git a/.ci_support/linux_aarch64_openssl1.1.1.yaml b/.ci_support/linux_aarch64_openssl1.1.1.yaml index a92ef66..b2bb602 100644 --- a/.ci_support/linux_aarch64_openssl1.1.1.yaml +++ b/.ci_support/linux_aarch64_openssl1.1.1.yaml @@ -26,15 +26,6 @@ ncurses: - '6' openssl: - 1.1.1 -pin_run_as_build: - gmp: - max_pin: x - libffi: - max_pin: x.x - readline: - max_pin: x - zlib: - max_pin: x.x readline: - '8' target_platform: diff --git a/.ci_support/linux_aarch64_openssl3.yaml b/.ci_support/linux_aarch64_openssl3.yaml index 3d91689..af72cc4 100644 --- a/.ci_support/linux_aarch64_openssl3.yaml +++ b/.ci_support/linux_aarch64_openssl3.yaml @@ -26,15 +26,6 @@ ncurses: - '6' openssl: - '3' -pin_run_as_build: - gmp: - max_pin: x - libffi: - max_pin: x.x - readline: - max_pin: x - zlib: - max_pin: x.x readline: - '8' target_platform: diff --git a/.ci_support/linux_ppc64le_openssl1.1.1.yaml b/.ci_support/linux_ppc64le_openssl1.1.1.yaml index ad5b528..f5ffad2 100644 --- a/.ci_support/linux_ppc64le_openssl1.1.1.yaml +++ b/.ci_support/linux_ppc64le_openssl1.1.1.yaml @@ -22,15 +22,6 @@ ncurses: - '6' openssl: - 1.1.1 -pin_run_as_build: - gmp: - max_pin: x - libffi: - max_pin: x.x - readline: - max_pin: x - zlib: - max_pin: x.x readline: - '8' target_platform: diff --git a/.ci_support/linux_ppc64le_openssl3.yaml b/.ci_support/linux_ppc64le_openssl3.yaml index 6eca12f..3771ae6 100644 --- a/.ci_support/linux_ppc64le_openssl3.yaml +++ b/.ci_support/linux_ppc64le_openssl3.yaml @@ -22,15 +22,6 @@ ncurses: - '6' openssl: - '3' -pin_run_as_build: - gmp: - max_pin: x - libffi: - max_pin: x.x - readline: - max_pin: x - zlib: - max_pin: x.x readline: - '8' target_platform: diff --git a/.ci_support/osx_64_openssl1.1.1.yaml b/.ci_support/osx_64_openssl1.1.1.yaml index 40d73ac..b52f7e9 100644 --- a/.ci_support/osx_64_openssl1.1.1.yaml +++ b/.ci_support/osx_64_openssl1.1.1.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '12' +- '14' channel_sources: - conda-forge channel_targets: @@ -11,7 +11,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '12' +- '14' gmp: - '6' libffi: @@ -22,15 +22,6 @@ ncurses: - '6' openssl: - 1.1.1 -pin_run_as_build: - gmp: - max_pin: x - libffi: - max_pin: x.x - readline: - max_pin: x - zlib: - max_pin: x.x readline: - '8' target_platform: diff --git a/.ci_support/osx_64_openssl3.yaml b/.ci_support/osx_64_openssl3.yaml index c6e8933..c39bc4d 100644 --- a/.ci_support/osx_64_openssl3.yaml +++ b/.ci_support/osx_64_openssl3.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '12' +- '14' channel_sources: - conda-forge channel_targets: @@ -11,7 +11,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '12' +- '14' gmp: - '6' libffi: @@ -22,15 +22,6 @@ ncurses: - '6' openssl: - '3' -pin_run_as_build: - gmp: - max_pin: x - libffi: - max_pin: x.x - readline: - max_pin: x - zlib: - max_pin: x.x readline: - '8' target_platform: diff --git a/.circleci/config.yml b/.circleci/config.yml index 6ad461b..3e61aa2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -7,7 +7,8 @@ version: 2 jobs: build: working_directory: ~/test - machine: true + machine: + image: ubuntu-2004:current steps: - run: # The Circle-CI build should not be active, but if this is not true for some reason, do a fast finish. diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index d71d6ae..595f8b5 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -24,7 +24,10 @@ export CONFIG_FILE="${CI_SUPPORT}/${CONFIG}.yaml" cat >~/.condarc < /dev/null +if [[ -f "${FEEDSTOCK_ROOT}/LICENSE.txt" ]]; then + cp "${FEEDSTOCK_ROOT}/LICENSE.txt" "${RECIPE_ROOT}/recipe-scripts-license.txt" +fi + if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then if [[ "x${BUILD_OUTPUT_ID:-}" != "x" ]]; then EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --output-id ${BUILD_OUTPUT_ID}" diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 19843e0..07de621 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -57,6 +57,10 @@ echo -e "\n\nMaking the build clobber file" make_build_number ./ ./recipe ./.ci_support/${CONFIG}.yaml +if [[ -f LICENSE.txt ]]; then + cp LICENSE.txt "recipe/recipe-scripts-license.txt" +fi + if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then if [[ "x${BUILD_OUTPUT_ID:-}" != "x" ]]; then EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --output-id ${BUILD_OUTPUT_ID}" diff --git a/.travis.yml b/.travis.yml index dc34005..fb9806a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,4 +24,4 @@ script: - if [[ "${TRAVIS_PULL_REQUEST:-}" == "false" ]]; then export IS_PR_BUILD="False"; else export IS_PR_BUILD="True"; fi - - if [[ ${PLATFORM} =~ .*linux.* ]]; then CONDA_FORGE_DOCKER_RUN_ARGS=--network=host ./.scripts/run_docker_build.sh; fi \ No newline at end of file + - if [[ ${PLATFORM} =~ .*linux.* ]]; then CONDA_FORGE_DOCKER_RUN_ARGS="--network=host --security-opt=seccomp=unconfined" ./.scripts/run_docker_build.sh; fi \ No newline at end of file diff --git a/LICENSE.txt b/LICENSE.txt index 6ec1401..2ec51d7 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,13 +1,27 @@ -BSD 3-clause license +BSD-3-Clause license Copyright (c) 2015-2022, conda-forge contributors All rights reserved. -Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: -1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. Neither the name of the copyright holder nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. -2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - -3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH +DAMAGE. diff --git a/README.md b/README.md index e512977..f5015e4 100644 --- a/README.md +++ b/README.md @@ -24,8 +24,8 @@ Current build status
VariantStatus
linux_64linux_64_openssl1.1.1 - variant + variant
linux_aarch64linux_64_openssl3 - variant + variant
linux_ppc64lelinux_aarch64_openssl1.1.1 - variant + variant
osx_64linux_aarch64_openssl3 - variant + variant + +
linux_ppc64le_openssl1.1.1 + + variant + +
linux_ppc64le_openssl3 + + variant + +
osx_64_openssl1.1.1 + + variant + +
osx_64_openssl3 + + variant
@@ -122,18 +122,43 @@ conda config --add channels conda-forge conda config --set channel_priority strict ``` -Once the `conda-forge` channel has been enabled, `ruby` can be installed with: +Once the `conda-forge` channel has been enabled, `ruby` can be installed with `conda`: ``` conda install ruby ``` -It is possible to list all of the versions of `ruby` available on your platform with: +or with `mamba`: + +``` +mamba install ruby +``` + +It is possible to list all of the versions of `ruby` available on your platform with `conda`: ``` conda search ruby --channel conda-forge ``` +or with `mamba`: + +``` +mamba search ruby --channel conda-forge +``` + +Alternatively, `mamba repoquery` may provide more information: + +``` +# Search all versions available on your platform: +mamba repoquery search ruby --channel conda-forge + +# List packages depending on `ruby`: +mamba repoquery whoneeds ruby --channel conda-forge + +# List dependencies of `ruby`: +mamba repoquery depends ruby --channel conda-forge +``` + About conda-forge ================= @@ -149,10 +174,12 @@ for each of the installable packages. Such a repository is known as a *feedstock A feedstock is made up of a conda recipe (the instructions on what and how to build the package) and the necessary configurations for automatic building using freely available continuous integration services. Thanks to the awesome service provided by -[CircleCI](https://circleci.com/), [AppVeyor](https://www.appveyor.com/) -and [TravisCI](https://travis-ci.com/) it is possible to build and upload installable -packages to the [conda-forge](https://anaconda.org/conda-forge) -[Anaconda-Cloud](https://anaconda.org/) channel for Linux, Windows and OSX respectively. +[Azure](https://azure.microsoft.com/en-us/services/devops/), [GitHub](https://github.com/), +[CircleCI](https://circleci.com/), [AppVeyor](https://www.appveyor.com/), +[Drone](https://cloud.drone.io/welcome), and [TravisCI](https://travis-ci.com/) +it is possible to build and upload installable packages to the +[conda-forge](https://anaconda.org/conda-forge) [Anaconda-Cloud](https://anaconda.org/) +channel for Linux, Windows and OSX respectively. To manage the continuous integration and simplify feedstock maintenance [conda-smithy](https://github.com/conda-forge/conda-smithy) has been developed. diff --git a/build-locally.py b/build-locally.py index eec38a0..3f4b7a7 100755 --- a/build-locally.py +++ b/build-locally.py @@ -86,12 +86,19 @@ def main(args=None): verify_config(ns) setup_environment(ns) - if ns.config.startswith("linux") or ( - ns.config.startswith("osx") and platform.system() == "Linux" - ): - run_docker_build(ns) - elif ns.config.startswith("osx"): - run_osx_build(ns) + try: + if ns.config.startswith("linux") or ( + ns.config.startswith("osx") and platform.system() == "Linux" + ): + run_docker_build(ns) + elif ns.config.startswith("osx"): + run_osx_build(ns) + finally: + recipe_license_file = os.path.join( + "recipe", "recipe-scripts-license.txt" + ) + if os.path.exists(recipe_license_file): + os.remove(recipe_license_file) if __name__ == "__main__":
Travis - - macOS + + linux