diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 59e7535..40c3e70 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -5,34 +5,21 @@ jobs: - job: linux pool: - vmImage: ubuntu-16.04 + vmImage: ubuntu-latest strategy: matrix: - linux_64_boost_cpp1.72.0mpimpich: - CONFIG: linux_64_boost_cpp1.72.0mpimpich + linux_64_mpimpich: + CONFIG: linux_64_mpimpich UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: condaforge/linux-anvil-comp7 - linux_64_boost_cpp1.72.0mpiopenmpi: - CONFIG: linux_64_boost_cpp1.72.0mpiopenmpi + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 + linux_64_mpiopenmpi: + CONFIG: linux_64_mpiopenmpi UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: condaforge/linux-anvil-comp7 - linux_64_boost_cpp1.74.0mpimpich: - CONFIG: linux_64_boost_cpp1.74.0mpimpich - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: condaforge/linux-anvil-comp7 - linux_64_boost_cpp1.74.0mpiopenmpi: - CONFIG: linux_64_boost_cpp1.74.0mpiopenmpi - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: condaforge/linux-anvil-comp7 - maxParallel: 8 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 timeoutInMinutes: 360 + variables: {} steps: - - script: | - rm -rf /opt/ghc - df -h - displayName: Manage disk space - # configure qemu binfmt-misc running. This allows us to run docker containers # embedded qemu-static - script: | @@ -43,8 +30,16 @@ jobs: - script: | export CI=azure + export flow_run_id=azure_$(Build.BuildNumber).$(System.JobAttempt) + export remote_url=$(Build.Repository.Uri) + export sha=$(Build.SourceVersion) export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME}) + if [[ "${BUILD_REASON:-}" == "PullRequest" ]]; then + export IS_PR_BUILD="True" + else + export IS_PR_BUILD="False" + fi .scripts/run_docker_build.sh displayName: Run docker build env: diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml new file mode 100755 index 0000000..472bbfc --- /dev/null +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -0,0 +1,40 @@ +# This file was generated automatically from conda-smithy. To update this configuration, +# update the conda-forge.yml and/or the recipe/meta.yaml. +# -*- mode: yaml -*- + +jobs: +- job: osx + pool: + vmImage: macOS-13 + strategy: + matrix: + osx_64_mpimpich: + CONFIG: osx_64_mpimpich + UPLOAD_PACKAGES: 'True' + osx_64_mpiopenmpi: + CONFIG: osx_64_mpiopenmpi + UPLOAD_PACKAGES: 'True' + timeoutInMinutes: 360 + variables: {} + + steps: + # TODO: Fast finish on azure pipelines? + - script: | + export CI=azure + export flow_run_id=azure_$(Build.BuildNumber).$(System.JobAttempt) + export remote_url=$(Build.Repository.Uri) + export sha=$(Build.SourceVersion) + export OSX_FORCE_SDK_DOWNLOAD="1" + export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME + export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME}) + if [[ "${BUILD_REASON:-}" == "PullRequest" ]]; then + export IS_PR_BUILD="True" + else + export IS_PR_BUILD="False" + fi + ./.scripts/run_osx_build.sh + displayName: Run OSX build + env: + BINSTAR_TOKEN: $(BINSTAR_TOKEN) + FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) + STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) \ No newline at end of file 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_boost_cpp1.72.0mpimpich.yaml b/.ci_support/linux_64_boost_cpp1.72.0mpimpich.yaml deleted file mode 100644 index bb1267c..0000000 --- a/.ci_support/linux_64_boost_cpp1.72.0mpimpich.yaml +++ /dev/null @@ -1,35 +0,0 @@ -boost_cpp: -- 1.72.0 -c_compiler: -- gcc -c_compiler_version: -- '7' -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '7' -docker_image: -- condaforge/linux-anvil-comp7 -libblas: -- 3.8 *netlib -liblapack: -- 3.8.0 *netlib -libmatio: -- '1.5' -mpi: -- mpich -netcdf_cxx4: -- '4.3' -pin_run_as_build: - boost-cpp: - max_pin: x.x.x - libmatio: - max_pin: x.x - netcdf-cxx4: - max_pin: x.x -target_platform: -- linux-64 diff --git a/.ci_support/linux_64_boost_cpp1.72.0mpiopenmpi.yaml b/.ci_support/linux_64_boost_cpp1.72.0mpiopenmpi.yaml deleted file mode 100644 index e146e28..0000000 --- a/.ci_support/linux_64_boost_cpp1.72.0mpiopenmpi.yaml +++ /dev/null @@ -1,35 +0,0 @@ -boost_cpp: -- 1.72.0 -c_compiler: -- gcc -c_compiler_version: -- '7' -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '7' -docker_image: -- condaforge/linux-anvil-comp7 -libblas: -- 3.8 *netlib -liblapack: -- 3.8.0 *netlib -libmatio: -- '1.5' -mpi: -- openmpi -netcdf_cxx4: -- '4.3' -pin_run_as_build: - boost-cpp: - max_pin: x.x.x - libmatio: - max_pin: x.x - netcdf-cxx4: - max_pin: x.x -target_platform: -- linux-64 diff --git a/.ci_support/linux_64_boost_cpp1.74.0mpimpich.yaml b/.ci_support/linux_64_boost_cpp1.74.0mpimpich.yaml deleted file mode 100644 index 44274db..0000000 --- a/.ci_support/linux_64_boost_cpp1.74.0mpimpich.yaml +++ /dev/null @@ -1,35 +0,0 @@ -boost_cpp: -- 1.74.0 -c_compiler: -- gcc -c_compiler_version: -- '7' -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '7' -docker_image: -- condaforge/linux-anvil-comp7 -libblas: -- 3.8 *netlib -liblapack: -- 3.8.0 *netlib -libmatio: -- '1.5' -mpi: -- mpich -netcdf_cxx4: -- '4.3' -pin_run_as_build: - boost-cpp: - max_pin: x.x.x - libmatio: - max_pin: x.x - netcdf-cxx4: - max_pin: x.x -target_platform: -- linux-64 diff --git a/.ci_support/linux_64_boost_cpp1.74.0mpiopenmpi.yaml b/.ci_support/linux_64_boost_cpp1.74.0mpiopenmpi.yaml deleted file mode 100644 index 7344e1e..0000000 --- a/.ci_support/linux_64_boost_cpp1.74.0mpiopenmpi.yaml +++ /dev/null @@ -1,35 +0,0 @@ -boost_cpp: -- 1.74.0 -c_compiler: -- gcc -c_compiler_version: -- '7' -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '7' -docker_image: -- condaforge/linux-anvil-comp7 -libblas: -- 3.8 *netlib -liblapack: -- 3.8.0 *netlib -libmatio: -- '1.5' -mpi: -- openmpi -netcdf_cxx4: -- '4.3' -pin_run_as_build: - boost-cpp: - max_pin: x.x.x - libmatio: - max_pin: x.x - netcdf-cxx4: - max_pin: x.x -target_platform: -- linux-64 diff --git a/.ci_support/linux_64_mpimpich.yaml b/.ci_support/linux_64_mpimpich.yaml new file mode 100644 index 0000000..8d5868a --- /dev/null +++ b/.ci_support/linux_64_mpimpich.yaml @@ -0,0 +1,49 @@ +c_compiler: +- gcc +c_compiler_version: +- '13' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +cdt_name: +- conda +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '13' +docker_image: +- quay.io/condaforge/linux-anvil-x86_64:alma9 +fortran_compiler: +- gfortran +fortran_compiler_version: +- '13' +libblas: +- 3.9.* *netlib +libboost_devel: +- '1.84' +liblapack: +- 3.9.* *netlib +libmatio: +- 1.5.28 +mpi: +- mpich +mpich: +- '4' +netcdf_cxx4: +- '4.3' +openmpi: +- '4' +pin_run_as_build: + netcdf-cxx4: + max_pin: x.x +target_platform: +- linux-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version + - fortran_compiler_version diff --git a/.ci_support/linux_64_mpiopenmpi.yaml b/.ci_support/linux_64_mpiopenmpi.yaml new file mode 100644 index 0000000..fd20d83 --- /dev/null +++ b/.ci_support/linux_64_mpiopenmpi.yaml @@ -0,0 +1,49 @@ +c_compiler: +- gcc +c_compiler_version: +- '13' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +cdt_name: +- conda +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '13' +docker_image: +- quay.io/condaforge/linux-anvil-x86_64:alma9 +fortran_compiler: +- gfortran +fortran_compiler_version: +- '13' +libblas: +- 3.9.* *netlib +libboost_devel: +- '1.84' +liblapack: +- 3.9.* *netlib +libmatio: +- 1.5.28 +mpi: +- openmpi +mpich: +- '4' +netcdf_cxx4: +- '4.3' +openmpi: +- '4' +pin_run_as_build: + netcdf-cxx4: + max_pin: x.x +target_platform: +- linux-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version + - fortran_compiler_version diff --git a/.ci_support/migrations/boost_cpp1740.yaml b/.ci_support/migrations/boost_cpp1740.yaml deleted file mode 100644 index 8bdcff1..0000000 --- a/.ci_support/migrations/boost_cpp1740.yaml +++ /dev/null @@ -1,11 +0,0 @@ -__migrator: - build_number: 1 - kind: version - migration_number: 1 -boost_cpp: -- 1.74.0 -- 1.72.0 # [not (osx and arm64)] -boost: -- 1.74.0 -- 1.72.0 # [not (osx and arm64)] -migrator_ts: 1599847606.929981 diff --git a/.ci_support/osx_64_boost_cpp1.72.0mpimpich.yaml b/.ci_support/osx_64_boost_cpp1.72.0mpimpich.yaml deleted file mode 100644 index c3a1156..0000000 --- a/.ci_support/osx_64_boost_cpp1.72.0mpimpich.yaml +++ /dev/null @@ -1,37 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.9' -boost_cpp: -- 1.72.0 -c_compiler: -- clang -c_compiler_version: -- '10' -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -cxx_compiler: -- clangxx -cxx_compiler_version: -- '10' -libblas: -- 3.8 *netlib -liblapack: -- 3.8.0 *netlib -libmatio: -- '1.5' -macos_machine: -- x86_64-apple-darwin13.4.0 -mpi: -- mpich -netcdf_cxx4: -- '4.3' -pin_run_as_build: - boost-cpp: - max_pin: x.x.x - libmatio: - max_pin: x.x - netcdf-cxx4: - max_pin: x.x -target_platform: -- osx-64 diff --git a/.ci_support/osx_64_boost_cpp1.72.0mpiopenmpi.yaml b/.ci_support/osx_64_boost_cpp1.72.0mpiopenmpi.yaml deleted file mode 100644 index 7021f23..0000000 --- a/.ci_support/osx_64_boost_cpp1.72.0mpiopenmpi.yaml +++ /dev/null @@ -1,37 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.9' -boost_cpp: -- 1.72.0 -c_compiler: -- clang -c_compiler_version: -- '10' -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -cxx_compiler: -- clangxx -cxx_compiler_version: -- '10' -libblas: -- 3.8 *netlib -liblapack: -- 3.8.0 *netlib -libmatio: -- '1.5' -macos_machine: -- x86_64-apple-darwin13.4.0 -mpi: -- openmpi -netcdf_cxx4: -- '4.3' -pin_run_as_build: - boost-cpp: - max_pin: x.x.x - libmatio: - max_pin: x.x - netcdf-cxx4: - max_pin: x.x -target_platform: -- osx-64 diff --git a/.ci_support/osx_64_boost_cpp1.74.0mpimpich.yaml b/.ci_support/osx_64_boost_cpp1.74.0mpimpich.yaml deleted file mode 100644 index f000597..0000000 --- a/.ci_support/osx_64_boost_cpp1.74.0mpimpich.yaml +++ /dev/null @@ -1,37 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.9' -boost_cpp: -- 1.74.0 -c_compiler: -- clang -c_compiler_version: -- '10' -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -cxx_compiler: -- clangxx -cxx_compiler_version: -- '10' -libblas: -- 3.8 *netlib -liblapack: -- 3.8.0 *netlib -libmatio: -- '1.5' -macos_machine: -- x86_64-apple-darwin13.4.0 -mpi: -- mpich -netcdf_cxx4: -- '4.3' -pin_run_as_build: - boost-cpp: - max_pin: x.x.x - libmatio: - max_pin: x.x - netcdf-cxx4: - max_pin: x.x -target_platform: -- osx-64 diff --git a/.ci_support/osx_64_boost_cpp1.74.0mpiopenmpi.yaml b/.ci_support/osx_64_boost_cpp1.74.0mpiopenmpi.yaml deleted file mode 100644 index 69ba684..0000000 --- a/.ci_support/osx_64_boost_cpp1.74.0mpiopenmpi.yaml +++ /dev/null @@ -1,37 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.9' -boost_cpp: -- 1.74.0 -c_compiler: -- clang -c_compiler_version: -- '10' -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -cxx_compiler: -- clangxx -cxx_compiler_version: -- '10' -libblas: -- 3.8 *netlib -liblapack: -- 3.8.0 *netlib -libmatio: -- '1.5' -macos_machine: -- x86_64-apple-darwin13.4.0 -mpi: -- openmpi -netcdf_cxx4: -- '4.3' -pin_run_as_build: - boost-cpp: - max_pin: x.x.x - libmatio: - max_pin: x.x - netcdf-cxx4: - max_pin: x.x -target_platform: -- osx-64 diff --git a/.ci_support/osx_64_mpimpich.yaml b/.ci_support/osx_64_mpimpich.yaml new file mode 100644 index 0000000..40e9a57 --- /dev/null +++ b/.ci_support/osx_64_mpimpich.yaml @@ -0,0 +1,51 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.13' +MACOSX_SDK_VERSION: +- '10.13' +c_compiler: +- clang +c_compiler_version: +- '18' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '18' +fortran_compiler: +- gfortran +fortran_compiler_version: +- '13' +libblas: +- 3.9.* *netlib +libboost_devel: +- '1.84' +liblapack: +- 3.9.* *netlib +libmatio: +- 1.5.28 +macos_machine: +- x86_64-apple-darwin13.4.0 +mpi: +- mpich +mpich: +- '4' +netcdf_cxx4: +- '4.3' +openmpi: +- '4' +pin_run_as_build: + netcdf-cxx4: + max_pin: x.x +target_platform: +- osx-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version + - fortran_compiler_version diff --git a/.ci_support/osx_64_mpiopenmpi.yaml b/.ci_support/osx_64_mpiopenmpi.yaml new file mode 100644 index 0000000..65799ad --- /dev/null +++ b/.ci_support/osx_64_mpiopenmpi.yaml @@ -0,0 +1,51 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.13' +MACOSX_SDK_VERSION: +- '10.13' +c_compiler: +- clang +c_compiler_version: +- '18' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '18' +fortran_compiler: +- gfortran +fortran_compiler_version: +- '13' +libblas: +- 3.9.* *netlib +libboost_devel: +- '1.84' +liblapack: +- 3.9.* *netlib +libmatio: +- 1.5.28 +macos_machine: +- x86_64-apple-darwin13.4.0 +mpi: +- openmpi +mpich: +- '4' +netcdf_cxx4: +- '4.3' +openmpi: +- '4' +pin_run_as_build: + netcdf-cxx4: + max_pin: x.x +target_platform: +- osx-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version + - fortran_compiler_version diff --git a/.circleci/checkout_merge_commit.sh b/.circleci/checkout_merge_commit.sh deleted file mode 100755 index 9528e4b..0000000 --- a/.circleci/checkout_merge_commit.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash - - -# Update PR refs for testing. -if [[ -n "${CIRCLE_PR_NUMBER}" ]] -then - FETCH_REFS="${FETCH_REFS} +refs/pull/${CIRCLE_PR_NUMBER}/head:pr/${CIRCLE_PR_NUMBER}/head" - FETCH_REFS="${FETCH_REFS} +refs/pull/${CIRCLE_PR_NUMBER}/merge:pr/${CIRCLE_PR_NUMBER}/merge" -fi - -# Retrieve the refs. -if [[ -n "${CIRCLE_PR_NUMBER}" ]] -then - git fetch -u origin ${FETCH_REFS} -fi - -# Checkout the PR merge ref. -if [[ -n "${CIRCLE_PR_NUMBER}" ]] -then - git checkout -qf "pr/${CIRCLE_PR_NUMBER}/merge" -fi - -# Check for merge conflicts. -if [[ -n "${CIRCLE_PR_NUMBER}" ]] -then - git branch --merged | grep "pr/${CIRCLE_PR_NUMBER}/head" > /dev/null -fi diff --git a/.circleci/config.yml b/.circleci/config.yml index aaceb35..8b4ef2f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,96 +1,25 @@ # This file was generated automatically from conda-smithy. To update this configuration, # update the conda-forge.yml and/or the recipe/meta.yaml. -# -*- mode: yaml -*- +# -*- mode: jinja-yaml -*- version: 2 jobs: - build_osx_64_boost_cpp1.72.0mpimpich: + build: working_directory: ~/test - macos: - xcode: "9.0" - environment: - - CONFIG: "osx_64_boost_cpp1.72.0mpimpich" - - UPLOAD_PACKAGES: "True" + machine: + image: ubuntu-2004:current steps: - - checkout - run: - name: Fast finish outdated PRs and merge PRs - command: | - ./.circleci/fast_finish_ci_pr_build.sh - ./.circleci/checkout_merge_commit.sh - - run: - # Run, test and (if we have a BINSTAR_TOKEN) upload the distributions. - command: | - export CI=circle - export FEEDSTOCK_NAME=$(basename ${CIRCLE_PROJECT_REPONAME}) - ./.scripts/run_osx_build.sh - build_osx_64_boost_cpp1.72.0mpiopenmpi: - working_directory: ~/test - macos: - xcode: "9.0" - environment: - - CONFIG: "osx_64_boost_cpp1.72.0mpiopenmpi" - - UPLOAD_PACKAGES: "True" - steps: - - checkout - - run: - name: Fast finish outdated PRs and merge PRs - command: | - ./.circleci/fast_finish_ci_pr_build.sh - ./.circleci/checkout_merge_commit.sh - - run: - # Run, test and (if we have a BINSTAR_TOKEN) upload the distributions. - command: | - export CI=circle - export FEEDSTOCK_NAME=$(basename ${CIRCLE_PROJECT_REPONAME}) - ./.scripts/run_osx_build.sh - build_osx_64_boost_cpp1.74.0mpimpich: - working_directory: ~/test - macos: - xcode: "9.0" - environment: - - CONFIG: "osx_64_boost_cpp1.74.0mpimpich" - - UPLOAD_PACKAGES: "True" - steps: - - checkout - - run: - name: Fast finish outdated PRs and merge PRs - command: | - ./.circleci/fast_finish_ci_pr_build.sh - ./.circleci/checkout_merge_commit.sh - - run: - # Run, test and (if we have a BINSTAR_TOKEN) upload the distributions. - command: | - export CI=circle - export FEEDSTOCK_NAME=$(basename ${CIRCLE_PROJECT_REPONAME}) - ./.scripts/run_osx_build.sh - build_osx_64_boost_cpp1.74.0mpiopenmpi: - working_directory: ~/test - macos: - xcode: "9.0" - environment: - - CONFIG: "osx_64_boost_cpp1.74.0mpiopenmpi" - - UPLOAD_PACKAGES: "True" - steps: - - checkout - - run: - name: Fast finish outdated PRs and merge PRs - command: | - ./.circleci/fast_finish_ci_pr_build.sh - ./.circleci/checkout_merge_commit.sh - - run: - # Run, test and (if we have a BINSTAR_TOKEN) upload the distributions. - command: | - export CI=circle - export FEEDSTOCK_NAME=$(basename ${CIRCLE_PROJECT_REPONAME}) - ./.scripts/run_osx_build.sh + # The Circle-CI build should not be active, but if this is not true for some reason, do a fast finish. + command: exit 0 workflows: version: 2 build_and_test: jobs: - - build_osx_64_boost_cpp1.72.0mpimpich - - build_osx_64_boost_cpp1.72.0mpiopenmpi - - build_osx_64_boost_cpp1.74.0mpimpich - - build_osx_64_boost_cpp1.74.0mpiopenmpi + - build: + filters: + branches: + ignore: + - /.*/ diff --git a/.circleci/fast_finish_ci_pr_build.sh b/.circleci/fast_finish_ci_pr_build.sh deleted file mode 100755 index 4c0b560..0000000 --- a/.circleci/fast_finish_ci_pr_build.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -curl https://raw.githubusercontent.com/conda-forge/conda-forge-ci-setup-feedstock/master/recipe/conda_forge_ci_setup/ff_ci_pr_build.py | \ - python - -v --ci "circle" "${CIRCLE_PROJECT_USERNAME}/${CIRCLE_PROJECT_REPONAME}" "${CIRCLE_BUILD_NUM}" "${CIRCLE_PR_NUMBER}" diff --git a/.gitattributes b/.gitattributes index 9060b27..18f114a 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 @@ -18,8 +19,9 @@ bld.bat text eol=crlf .gitignore linguist-generated=true .travis.yml linguist-generated=true .scripts/* linguist-generated=true -LICENSE.txt linguist-generated=true -README.md linguist-generated=true +.woodpecker.yml 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/.github/CODEOWNERS b/.github/CODEOWNERS index 4fb6d35..49d47a7 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +1 @@ -* @pyt-viper \ No newline at end of file +* @RaulPPelaez @pyt-viper \ No newline at end of file diff --git a/.gitignore b/.gitignore index c89ecb7..bb38536 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,27 @@ +# User content belongs under recipe/. +# Feedstock configuration goes in `conda-forge.yml` +# Everything else is managed by the conda-smithy rerender process. +# Please do not modify + +# Ignore all files and folders in root +* +!/conda-forge.yml + +# Don't ignore any files/folders if the parent folder is 'un-ignored' +# This also avoids warnings when adding an already-checked file with an ignored parent. +!/**/ +# Don't ignore any files/folders recursively in the following folders +!/recipe/** +!/.ci_support/** + +# Since we ignore files/folders recursively, any folders inside +# build_artifacts gets ignored which trips some build systems. +# To avoid that we 'un-ignore' all files/folders recursively +# and only ignore the root build_artifacts folder. +!/build_artifacts/** +/build_artifacts + *.pyc -build_artifacts +# Rattler-build's artifacts are in `output` when not specifying anything. +/output diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index eede105..53554c0 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -5,9 +5,18 @@ # changes to this script, consider a proposal to conda-smithy so that other feedstocks can also # benefit from the improvement. +# -*- mode: jinja-shell -*- + set -xeuo pipefail -export PYTHONUNBUFFERED=1 export FEEDSTOCK_ROOT="${FEEDSTOCK_ROOT:-/home/conda/feedstock_root}" +source ${FEEDSTOCK_ROOT}/.scripts/logging_utils.sh + + +( endgroup "Start Docker" ) 2> /dev/null + +( startgroup "Configuring conda" ) 2> /dev/null + +export PYTHONUNBUFFERED=1 export RECIPE_ROOT="${RECIPE_ROOT:-/home/conda/recipe_root}" export CI_SUPPORT="${FEEDSTOCK_ROOT}/.ci_support" export CONFIG_FILE="${CI_SUPPORT}/${CONFIG}.yaml" @@ -15,35 +24,86 @@ export CONFIG_FILE="${CI_SUPPORT}/${CONFIG}.yaml" cat >~/.condarc < /opt/conda/conda-meta/history +micromamba install --root-prefix ~/.conda --prefix /opt/conda \ + --yes --override-channels --channel conda-forge --strict-channel-priority \ + pip python=3.12 conda-build conda-forge-ci-setup=4 "conda-build>=24.1" +export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" source run_conda_forge_build_setup +( +# Due to https://bugzilla.redhat.com/show_bug.cgi?id=1537564 old versions of rpm +# are drastically slowed down when the number of file descriptors is very high. +# This can be visible during a `yum install` step of a feedstock build. +# => Set a lower limit in a subshell for the `yum install`s only. +ulimit -n 1024 # Install the yum requirements defined canonically in the # "recipe/yum_requirements.txt" file. After updating that file, # run "conda smithy rerender" and this line will be updated # automatically. /usr/bin/sudo -n yum install -y openssh-clients - +) # make the build number clobber make_build_number "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" -conda build "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ - --suppress-variables ${EXTRA_CB_OPTIONS:-} \ - --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" -validate_recipe_outputs "${FEEDSTOCK_NAME}" -if [[ "${UPLOAD_PACKAGES}" != "False" ]]; then - upload_package --validate --feedstock-name="${FEEDSTOCK_NAME}" "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" + +( endgroup "Configuring conda" ) 2> /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}" + fi + conda debug "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ + ${EXTRA_CB_OPTIONS:-} \ + --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" + + # Drop into an interactive shell + /bin/bash +else + conda-build "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ + --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.9.4 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts --recipe-dir "${RECIPE_ROOT}" -m "${CONFIG_FILE}" || echo "inspect_artifacts needs conda-forge-ci-setup >=4.9.4" + + ( endgroup "Inspecting artifacts" ) 2> /dev/null + ( startgroup "Validating outputs" ) 2> /dev/null + + validate_recipe_outputs "${FEEDSTOCK_NAME}" + + ( 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}" "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" + fi + + ( endgroup "Uploading packages" ) 2> /dev/null +fi + +( startgroup "Final checks" ) 2> /dev/null + touch "${FEEDSTOCK_ROOT}/build_artifacts/conda-forge-build-done-${CONFIG}" \ No newline at end of file diff --git a/.scripts/logging_utils.sh b/.scripts/logging_utils.sh new file mode 100644 index 0000000..aff009f --- /dev/null +++ b/.scripts/logging_utils.sh @@ -0,0 +1,35 @@ +#!/bin/bash + +# Provide a unified interface for the different logging +# utilities CI providers offer. If unavailable, provide +# a compatible fallback (e.g. bare `echo xxxxxx`). + +function startgroup { + # Start a foldable group of log lines + # Pass a single argument, quoted + case ${CI:-} in + azure ) + echo "##[group]$1";; + travis ) + echo "$1" + echo -en 'travis_fold:start:'"${1// /}"'\r';; + github_actions ) + echo "::group::$1";; + * ) + echo "$1";; + esac +} 2> /dev/null + +function endgroup { + # End a foldable group of log lines + # Pass a single argument, quoted + + case ${CI:-} in + azure ) + echo "##[endgroup]";; + travis ) + echo -en 'travis_fold:end:'"${1// /}"'\r';; + github_actions ) + echo "::endgroup::";; + esac +} 2> /dev/null diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh index e4d5bab..00f377a 100755 --- a/.scripts/run_docker_build.sh +++ b/.scripts/run_docker_build.sh @@ -5,18 +5,28 @@ # changes to this script, consider a proposal to conda-smithy so that other feedstocks can also # benefit from the improvement. +source .scripts/logging_utils.sh + +( startgroup "Configure Docker" ) 2> /dev/null + 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 export FEEDSTOCK_NAME=$(basename ${FEEDSTOCK_ROOT}) fi +if [[ "${sha:-}" == "" ]]; then + pushd "${FEEDSTOCK_ROOT}" + sha=$(git rev-parse HEAD) + popd +fi + docker info # In order for the conda-build process in the container to write to the mounted @@ -45,10 +55,14 @@ fi if [ -z "${DOCKER_IMAGE}" ]; then SHYAML_INSTALLED="$(shyaml -h || echo NO)" if [ "${SHYAML_INSTALLED}" == "NO" ]; then - echo "WARNING: DOCKER_IMAGE variable not set and shyaml not installed. Falling back to condaforge/linux-anvil-comp7" - DOCKER_IMAGE="condaforge/linux-anvil-comp7" + echo "WARNING: DOCKER_IMAGE variable not set and shyaml not installed. Trying to parse with coreutils" + DOCKER_IMAGE=$(cat .ci_support/${CONFIG}.yaml | grep '^docker_image:$' -A 1 | tail -n 1 | cut -b 3-) + if [ "${DOCKER_IMAGE}" = "" ]; then + echo "No docker_image entry found in ${CONFIG}. Falling back to quay.io/condaforge/linux-anvil-comp7" + DOCKER_IMAGE="quay.io/condaforge/linux-anvil-comp7" + fi else - DOCKER_IMAGE="$(cat "${FEEDSTOCK_ROOT}/.ci_support/${CONFIG}.yaml" | shyaml get-value docker_image.0 condaforge/linux-anvil-comp7 )" + DOCKER_IMAGE="$(cat "${FEEDSTOCK_ROOT}/.ci_support/${CONFIG}.yaml" | shyaml get-value docker_image.0 quay.io/condaforge/linux-anvil-comp7 )" fi fi @@ -62,24 +76,39 @@ if [ -z "${CI}" ]; then DOCKER_RUN_ARGS="-it ${DOCKER_RUN_ARGS}" fi +( endgroup "Configure Docker" ) 2> /dev/null + +( startgroup "Start Docker" ) 2> /dev/null + export UPLOAD_PACKAGES="${UPLOAD_PACKAGES:-True}" +export IS_PR_BUILD="${IS_PR_BUILD:-False}" +docker pull "${DOCKER_IMAGE}" docker run ${DOCKER_RUN_ARGS} \ - -v "${RECIPE_ROOT}":/home/conda/recipe_root:rw,z \ - -v "${FEEDSTOCK_ROOT}":/home/conda/feedstock_root:rw,z \ + -v "${RECIPE_ROOT}":/home/conda/recipe_root:rw,z,delegated \ + -v "${FEEDSTOCK_ROOT}":/home/conda/feedstock_root:rw,z,delegated \ -e CONFIG \ -e HOST_USER_ID \ -e UPLOAD_PACKAGES \ + -e IS_PR_BUILD \ -e GIT_BRANCH \ -e UPLOAD_ON_BRANCH \ -e CI \ -e FEEDSTOCK_NAME \ -e CPU_COUNT \ + -e BUILD_WITH_CONDA_DEBUG \ + -e BUILD_OUTPUT_ID \ + -e flow_run_id \ + -e remote_url \ + -e sha \ -e BINSTAR_TOKEN \ -e FEEDSTOCK_TOKEN \ -e STAGING_BINSTAR_TOKEN \ - $DOCKER_IMAGE \ + "${DOCKER_IMAGE}" \ bash \ - /home/conda/feedstock_root/${PROVIDER_DIR}/build_steps.sh + "/home/conda/feedstock_root/${PROVIDER_DIR}/build_steps.sh" # verify that the end of the script was reached -test -f "$DONE_CANARY" \ No newline at end of file +test -f "$DONE_CANARY" + +# This closes the last group opened in `build_steps.sh` +( endgroup "Final checks" ) 2> /dev/null \ No newline at end of file diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 982eae9..ee996f4 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -1,57 +1,116 @@ #!/usr/bin/env bash -set -x +# -*- mode: jinja-shell -*- -echo -e "\n\nInstalling a fresh version of Miniforge." -if [[ ${CI} == "travis" ]]; then - echo -en 'travis_fold:start:install_miniforge\\r' -fi -MINIFORGE_URL="https://github.com/conda-forge/miniforge/releases/latest/download" -MINIFORGE_FILE="Miniforge3-MacOSX-x86_64.sh" -curl -L -O "${MINIFORGE_URL}/${MINIFORGE_FILE}" -bash $MINIFORGE_FILE -b -if [[ ${CI} == "travis" ]]; then - echo -en 'travis_fold:end:install_miniforge\\r' -fi +source .scripts/logging_utils.sh -echo -e "\n\nConfiguring conda." -if [[ ${CI} == "travis" ]]; then - echo -en 'travis_fold:start:configure_conda\\r' -fi +set -xe -source ${HOME}/miniforge3/etc/profile.d/conda.sh +MINIFORGE_HOME="${MINIFORGE_HOME:-${HOME}/miniforge3}" +MINIFORGE_HOME="${MINIFORGE_HOME%/}" # remove trailing slash +export CONDA_BLD_PATH="${CONDA_BLD_PATH:-${MINIFORGE_HOME}/conda-bld}" + +( startgroup "Provisioning base env with micromamba" ) 2> /dev/null +MICROMAMBA_VERSION="1.5.10-0" +if [[ "$(uname -m)" == "arm64" ]]; then + osx_arch="osx-arm64" +else + osx_arch="osx-64" +fi +MICROMAMBA_URL="https://github.com/mamba-org/micromamba-releases/releases/download/${MICROMAMBA_VERSION}/micromamba-${osx_arch}" +MAMBA_ROOT_PREFIX="${MINIFORGE_HOME}-micromamba-$(date +%s)" +echo "Downloading micromamba ${MICROMAMBA_VERSION}" +micromamba_exe="$(mktemp -d)/micromamba" +curl -L -o "${micromamba_exe}" "${MICROMAMBA_URL}" +chmod +x "${micromamba_exe}" +echo "Creating environment" +"${micromamba_exe}" create --yes --root-prefix "${MAMBA_ROOT_PREFIX}" --prefix "${MINIFORGE_HOME}" \ + --channel conda-forge \ + pip python=3.12 conda-build conda-forge-ci-setup=4 "conda-build>=24.1" +echo "Moving pkgs cache from ${MAMBA_ROOT_PREFIX} to ${MINIFORGE_HOME}" +mv "${MAMBA_ROOT_PREFIX}/pkgs" "${MINIFORGE_HOME}" +echo "Cleaning up micromamba" +rm -rf "${MAMBA_ROOT_PREFIX}" "${micromamba_exe}" || true +( endgroup "Provisioning base env with micromamba" ) 2> /dev/null + +( startgroup "Configuring conda" ) 2> /dev/null +echo "Activating environment" +source "${MINIFORGE_HOME}/etc/profile.d/conda.sh" conda activate base +export CONDA_SOLVER="libmamba" +export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 + -echo -e "\n\nInstalling conda-forge-ci-setup=3 and conda-build." -conda install -n base --quiet --yes conda-forge-ci-setup=3 conda-build pip echo -e "\n\nSetting up the condarc and mangling the compiler." setup_conda_rc ./ ./recipe ./.ci_support/${CONFIG}.yaml -mangle_compiler ./ ./recipe .ci_support/${CONFIG}.yaml -echo -e "\n\nMangling homebrew in the CI to avoid conflicts." -/usr/bin/sudo mangle_homebrew -/usr/bin/sudo -k +if [[ "${CI:-}" != "" ]]; then + mangle_compiler ./ ./recipe .ci_support/${CONFIG}.yaml +fi + +if [[ "${CI:-}" != "" ]]; then + echo -e "\n\nMangling homebrew in the CI to avoid conflicts." + /usr/bin/sudo mangle_homebrew + /usr/bin/sudo -k +else + echo -e "\n\nNot mangling homebrew as we are not running in CI" +fi + +if [[ "${sha:-}" == "" ]]; then + sha=$(git rev-parse HEAD) +fi echo -e "\n\nRunning the build setup script." source run_conda_forge_build_setup -if [[ ${CI} == "travis" ]]; then - echo -en 'travis_fold:end:configure_conda\\r' -fi -set -e +( endgroup "Configuring conda" ) 2> /dev/null -echo -e "\n\nMaking the build clobber file and running the build." +echo -e "\n\nMaking the build clobber file" make_build_number ./ ./recipe ./.ci_support/${CONFIG}.yaml -conda build ./recipe -m ./.ci_support/${CONFIG}.yaml --suppress-variables --clobber-file ./.ci_support/clobber_${CONFIG}.yaml ${EXTRA_CB_OPTIONS:-} -validate_recipe_outputs "${FEEDSTOCK_NAME}" +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}" + fi + conda debug ./recipe -m ./.ci_support/${CONFIG}.yaml \ + ${EXTRA_CB_OPTIONS:-} \ + --clobber-file ./.ci_support/clobber_${CONFIG}.yaml + + # Drop into an interactive shell + /bin/bash +else + + conda-build ./recipe -m ./.ci_support/${CONFIG}.yaml \ + --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.9.4 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts --recipe-dir ./recipe -m ./.ci_support/${CONFIG}.yaml || echo "inspect_artifacts needs conda-forge-ci-setup >=4.9.4" + + ( endgroup "Inspecting artifacts" ) 2> /dev/null + ( startgroup "Validating outputs" ) 2> /dev/null + + validate_recipe_outputs "${FEEDSTOCK_NAME}" + + ( 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 -if [[ "${UPLOAD_PACKAGES}" != "False" ]]; then - echo -e "\n\nUploading the packages." - upload_package --validate --feedstock-name="${FEEDSTOCK_NAME}" ./ ./recipe ./.ci_support/${CONFIG}.yaml + ( endgroup "Uploading packages" ) 2> /dev/null fi \ No newline at end of file diff --git a/LICENSE.txt b/LICENSE.txt index 5f30279..2ec51d7 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,13 +1,27 @@ -BSD 3-clause license -Copyright (c) 2015-2020, conda-forge contributors +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 170f516..1cc0e98 100644 --- a/README.md +++ b/README.md @@ -1,94 +1,61 @@ -About trilinos -============== +About trilinos-feedstock +======================== + +Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/trilinos-feedstock/blob/main/LICENSE.txt) Home: https://trilinos.org Package license: BSD-3-Clause -Feedstock license: BSD-3-Clause - Summary: Sandia's suite of HPC solvers and enabling technologies +Development: https://github.com/trilinos/Trilinos + Fast, compiled object-oriented algorithms and enabling technologies that support the solution of large-scale, complex multi-physics engineering and scientific problems. Current build status ==================== - - - - +
CircleCI - - OSX - -
Azure
- - + + - - - - - - - - - - + - + - + - + - - - @@ -113,25 +80,52 @@ Installing `trilinos` from the `conda-forge` channel can be achieved by adding ` ``` conda config --add channels conda-forge +conda config --set channel_priority strict ``` -Once the `conda-forge` channel has been enabled, `trilinos` can be installed with: +Once the `conda-forge` channel has been enabled, `trilinos` can be installed with `conda`: ``` conda install trilinos ``` -It is possible to list all of the versions of `trilinos` available on your platform with: +or with `mamba`: + +``` +mamba install trilinos +``` + +It is possible to list all of the versions of `trilinos` available on your platform with `conda`: ``` conda search trilinos --channel conda-forge ``` +or with `mamba`: + +``` +mamba search trilinos --channel conda-forge +``` + +Alternatively, `mamba repoquery` may provide more information: + +``` +# Search all versions available on your platform: +mamba repoquery search trilinos --channel conda-forge + +# List packages depending on `trilinos`: +mamba repoquery whoneeds trilinos --channel conda-forge + +# List dependencies of `trilinos`: +mamba repoquery depends trilinos --channel conda-forge +``` + About conda-forge ================= -[![Powered by NumFOCUS](https://img.shields.io/badge/powered%20by-NumFOCUS-orange.svg?style=flat&colorA=E1523D&colorB=007D8A)](http://numfocus.org) +[![Powered by +NumFOCUS](https://img.shields.io/badge/powered%20by-NumFOCUS-orange.svg?style=flat&colorA=E1523D&colorB=007D8A)](https://numfocus.org) conda-forge is a community-led conda channel of installable packages. In order to provide high-quality builds, the process has been automated into the @@ -141,10 +135,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.org](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. @@ -183,13 +179,14 @@ build distinct package versions. In order to produce a uniquely identifiable distribution: * If the version of a package **is not** being increased, please add or increase - the [``build/number``](https://conda.io/docs/user-guide/tasks/build-packages/define-metadata.html#build-number-and-string). + the [``build/number``](https://docs.conda.io/projects/conda-build/en/latest/resources/define-metadata.html#build-number-and-string). * If the version of a package **is** being increased, please remember to return - the [``build/number``](https://conda.io/docs/user-guide/tasks/build-packages/define-metadata.html#build-number-and-string) + the [``build/number``](https://docs.conda.io/projects/conda-build/en/latest/resources/define-metadata.html#build-number-and-string) back to 0. Feedstock Maintainers ===================== +* [@RaulPPelaez](https://github.com/RaulPPelaez/) * [@pyt-viper](https://github.com/pyt-viper/) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index ad85a2c..013bdc1 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -2,5 +2,31 @@ # update the conda-forge.yml and/or the recipe/meta.yaml. # -*- mode: yaml -*- -jobs: - - template: ./.azure-pipelines/azure-pipelines-linux.yml \ No newline at end of file +stages: +- stage: Check + jobs: + - job: Skip + pool: + vmImage: 'ubuntu-22.04' + variables: + DECODE_PERCENTS: 'false' + RET: 'true' + steps: + - checkout: self + fetchDepth: '2' + - bash: | + git_log=`git log --max-count=1 --skip=1 --pretty=format:"%B" | tr "\n" " "` + echo "##vso[task.setvariable variable=log]$git_log" + displayName: Obtain commit message + - bash: echo "##vso[task.setvariable variable=RET]false" + condition: and(eq(variables['Build.Reason'], 'PullRequest'), or(contains(variables.log, '[skip azp]'), contains(variables.log, '[azp skip]'), contains(variables.log, '[skip ci]'), contains(variables.log, '[ci skip]'))) + displayName: Skip build? + - bash: echo "##vso[task.setvariable variable=start_main;isOutput=true]$RET" + name: result + displayName: Export result +- stage: Build + condition: and(succeeded(), eq(dependencies.Check.outputs['Skip.result.start_main'], 'true')) + dependsOn: Check + jobs: + - template: ./.azure-pipelines/azure-pipelines-linux.yml + - template: ./.azure-pipelines/azure-pipelines-osx.yml \ No newline at end of file diff --git a/build-locally.py b/build-locally.py index 8f7ecca..c4a56c6 100755 --- a/build-locally.py +++ b/build-locally.py @@ -1,10 +1,14 @@ -#!/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 @@ -12,6 +16,22 @@ def setup_environment(ns): os.environ["CONFIG"] = ns.config os.environ["UPLOAD_PACKAGES"] = "False" + os.environ["IS_PR_BUILD"] = "True" + if ns.debug: + os.environ["BUILD_WITH_CONDA_DEBUG"] = "1" + if ns.output_id: + os.environ["BUILD_OUTPUT_ID"] = ns.output_id + if "MINIFORGE_HOME" not in os.environ: + os.environ["MINIFORGE_HOME"] = os.path.join( + os.path.dirname(__file__), "miniforge3" + ) + + # The default cache location might not be writable using docker on macOS. + if ns.config.startswith("linux") and platform.system() == "Darwin": + os.environ["CONDA_FORGE_DOCKER_RUN_ARGS"] = ( + os.environ.get("CONDA_FORGE_DOCKER_RUN_ARGS", "") + + " -e RATTLER_CACHE_DIR=/tmp/rattler_cache" + ) def run_docker_build(ns): @@ -19,6 +39,11 @@ def run_docker_build(ns): subprocess.check_call([script]) +def run_osx_build(ns): + script = ".scripts/run_osx_build.sh" + subprocess.check_call([script]) + + def verify_config(ns): valid_configs = { os.path.basename(f)[:-5] for f in glob.glob(".ci_support/*.yaml") @@ -42,21 +67,49 @@ def verify_config(ns): else: raise ValueError("config " + ns.config + " is not valid") # Remove the following, as implemented - if not ns.config.startswith("linux"): + if ns.config.startswith("win"): raise ValueError( - f"only Linux configs currently supported, got {ns.config}" + f"only Linux/macOS configs currently supported, got {ns.config}" ) + 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=$PWD/SDKs' " + "to download the SDK automatically to '$PWD/SDKs/MacOSX.sdk'. " + "Note: OSX_SDK_DIR must be set to an absolute path. " + "Setting this variable implies agreement to the licensing terms of the SDK by Apple." + ) def main(args=None): p = ArgumentParser("build-locally") p.add_argument("config", default=None, nargs="?") + p.add_argument( + "--debug", + action="store_true", + help="Setup debug environment using `conda debug`", + ) + p.add_argument( + "--output-id", help="If running debug, specify the output to setup." + ) ns = p.parse_args(args=args) verify_config(ns) setup_environment(ns) - run_docker_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__": diff --git a/conda-forge.yml b/conda-forge.yml index a6941d3..3ea3e13 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -1,7 +1,7 @@ -provider: {osx: circle, win: azure} conda_forge_output_validation: true github: branch_name: main tooling_branch_name: main conda_build: - pkg_format: '2' + error_overlinking: true + pkg_format: 2 diff --git a/recipe/build.sh b/recipe/build.sh index 2d4cdfe..6524e89 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -1,8 +1,10 @@ mkdir -p build cd build +ENABLE_PIRO=ON if [ $(uname) == Darwin ]; then export CXXFLAGS="$CXXFLAGS -stdlib=libc++" + ENABLE_PIRO=OFF #Piro fails to compile on OSX fi export MPI_FLAGS="--allow-run-as-root" @@ -20,58 +22,39 @@ cmake \ -D MPI_EXEC:FILEPATH=$PREFIX/bin/mpiexec \ -D PYTHON_EXECUTABLE:FILEPATH=$PYTHON \ -D Trilinos_ENABLE_Fortran:BOOL=OFF \ - -D Trilinos_ENABLE_ALL_PACKAGES:BOOL=OFF \ - -D Trilinos_ENABLE_ALL_OPTIONAL_PACKAGES:BOOL=OFF \ - -D Trilinos_ENABLE_TESTS:BOOL=OFF \ - -D Trilinos_ENABLE_EXAMPLES:BOOL=OFF \ - -D Trilinos_ENABLE_Teuchos:BOOL=ON \ - -D Trilinos_ENABLE_RTOp:BOOL=ON \ - -D Trilinos_ENABLE_Sacado:BOOL=ON \ - -D Trilinos_ENABLE_MiniTensor:BOOL=ON \ - -D Trilinos_ENABLE_Epetra:BOOL=ON \ - -D Trilinos_ENABLE_Zoltan:BOOL=ON \ - -D Trilinos_ENABLE_Shards:BOOL=ON \ - -D Trilinos_ENABLE_GlobiPack:BOOL=ON \ - -D Trilinos_ENABLE_Triutils:BOOL=ON \ - -D Trilinos_ENABLE_Tpetra:BOOL=ON \ - -D Trilinos_ENABLE_EpetraExt:BOOL=ON \ - -D Trilinos_ENABLE_Domi:BOOL=ON \ - -D Trilinos_ENABLE_Thyra:BOOL=ON \ - -D Trilinos_ENABLE_Xpetra:BOOL=ON \ - -D Trilinos_ENABLE_Isorropia:BOOL=ON \ - -D Trilinos_ENABLE_Pliris:BOOL=ON \ - -D Trilinos_ENABLE_AztecOO:BOOL=ON \ - -D Trilinos_ENABLE_Galeri:BOOL=ON \ - -D Trilinos_ENABLE_Amesos:BOOL=ON \ - -D TPL_ENABLE_UMFPACK:BOOL=ON \ - -D Trilinos_ENABLE_Pamgen:BOOL=ON \ - -D Trilinos_ENABLE_Zoltan2:BOOL=ON \ - -D Trilinos_ENABLE_Ifpack:BOOL=ON \ - -D Trilinos_ENABLE_ML:BOOL=ON \ - -D Trilinos_ENABLE_Belos:BOOL=ON \ - -D Trilinos_ENABLE_ShyLU:BOOL=ON \ - -D Trilinos_ENABLE_Amesos2:BOOL=ON \ - -D Trilinos_ENABLE_SEACAS:BOOL=ON \ -D TPL_ENABLE_HDF5:BOOL=ON \ - -D Trilinos_ENABLE_Komplex:BOOL=ON \ - -D Trilinos_ENABLE_Anasazi:BOOL=ON \ - -D Trilinos_ENABLE_Ifpack2:BOOL=ON \ - -D Ifpack2_ENABLE_TESTS:BOOL=OFF \ - -D Trilinos_ENABLE_Stratimikos:BOOL=ON \ - -D Trilinos_ENABLE_FEI:BOOL=ON \ - -D Trilinos_ENABLE_Teko:BOOL=ON \ - -D Trilinos_ENABLE_Intrepid:BOOL=ON \ - -D Trilinos_ENABLE_STK:BOOL=OFF \ - -D Trilinos_ENABLE_Phalanx:BOOL=ON \ - -D Trilinos_ENABLE_NOX:BOOL=ON \ - -D NOX_ENABLE_LOCA:BOOL=ON \ - -D Trilinos_ENABLE_MueLu:BOOL=ON \ - -D Trilinos_ENABLE_Rythmos:BOOL=ON \ - -D Trilinos_ENABLE_Stokhos:BOOL=ON \ - -D Trilinos_ENABLE_ROL:BOOL=ON \ - -D Trilinos_ENABLE_Piro:BOOL=ON \ - -D Trilinos_ENABLE_TrilinosCouplings:BOOL=ON \ - -D Trilinos_ENABLE_Pike:BOOL=ON \ + -D TPL_ENABLE_Kokkos:BOOL=ON \ + -D Kokkos_DIR=$PREFIX \ + -D Kokkos_ROOT=$PREFIX \ + -D TPL_ENABLE_KokkosKernels=ON \ + -D KokkosKernels_ROOT=$PREFIX \ + -D KokkosKernels_DIR=$PREFIX \ + -D Tpetra_IGNORE_KOKKOS_COMPATIBILITY=ON \ + -D Trilinos_ENABLE_OpenMP:BOOL=ON \ + -D Tpetra_INST_OPENMP:BOOL=ON \ + -D Tpetra_INST_SERIAL:BOOL=ON \ + -D Trilinos_ENABLE_ALL_PACKAGES=ON \ + -D Trilinos_ENABLE_TESTS=OFF \ + -D Trilinos_ENABLE_EXAMPLES:BOOL=OFF \ + -D Trilinos_ENABLE_Piro=${ENABLE_PIRO} \ + -D Trilinos_ENABLE_SEACAS=OFF \ + -D Trilinos_ENABLE_EPETRA=OFF \ + -D Trilinos_ENABLE_ISORROPIA=OFF \ + -D Trilinos_ENABLE_Intrepid=OFF \ + -D Trilinos_ENABLE_AMESOS=OFF \ + -D Trilinos_ENABLE_ML=OFF \ + -D Trilinos_ENABLE_IFpack=OFF \ + -D Trilinos_ENABLE_Krino=OFF \ + -D Trilinos_ENABLE_Percept=OFF \ + -D Trilinos_ENABLE_STK=OFF \ + -D Trilinos_ENABLE_Pytrilinos=OFF \ + -D Trilinos_ENABLE_ShyLU_DDCore=OFF \ + -D Trilinos_ENABLE_ShyLU_DD=OFF \ + -D Trilinos_ENABLE_Triutils=OFF \ + -D Trilinos_ENABLE_EPETRAEXT=OFF \ + -D Trilinos_ENABLE_AzteCOO=OFF \ + -D Trilinos_ENABLE_ThyraEpetraAdapters=OFF \ + -D Trilinos_ENABLE_ThyraEpetraExtAdapters=OFF \ $SRC_DIR make -j $CPU_COUNT install diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 34393e2..5cfd268 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "12.18.1" %} +{% set version = "16.0.0" %} package: name: trilinos @@ -6,10 +6,10 @@ package: source: url: https://github.com/trilinos/Trilinos/archive/trilinos-release-{{ version | replace('.', '-') }}.tar.gz - sha256: 7d2e1a1a3e2d2ce78bb248c63411fed5007c827b87cadee3d13c1a45c09a89cf + sha256: 46bfc40419ed2aa2db38c144fb8e61d4aa8170eaa654a88d833ba6b92903f309 build: - number: 4 + number: 0 skip: true # [win] requirements: @@ -17,19 +17,26 @@ requirements: - cmake >=3.10.0 - {{ compiler('c') }} - {{ compiler('cxx') }} + - {{ compiler('fortran') }} + - {{ stdlib("c") }} + - make host: - libblas - liblapack - {{ mpi }} # [unix] - - boost-cpp + - libboost-devel - scikit-umfpack - netcdf-cxx4 - libmatio - xorg-libx11 + - kokkos <4.5 + - kokkos-kernels + - gtest - hdf5 * mpi_{{ mpi }}_* + - libgomp # [linux] + - llvm-openmp # [osx] run: - {{ mpi }} # [unix] - - boost-cpp - scikit-umfpack run_constrained: - pytrilinos ==999999999 @@ -58,3 +65,4 @@ about: extra: recipe-maintainers: - pyt-viper + - RaulPPelaez
VariantStatus
linux_64_boost_cpp1.72.0mpimpich - - variant - -
linux_64_boost_cpp1.72.0mpiopenmpi - - variant - -
linux_64_boost_cpp1.74.0mpimpich - - variant - -
linux_64_boost_cpp1.74.0mpiopenmpilinux_64_mpimpich - - variant + + variant
osx_64_boost_cpp1.72.0mpimpichlinux_64_mpiopenmpi - - variant + + variant
osx_64_boost_cpp1.72.0mpiopenmpiosx_64_mpimpich - - variant + + variant
osx_64_boost_cpp1.74.0mpimpichosx_64_mpiopenmpi - - variant - -
osx_64_boost_cpp1.74.0mpiopenmpi - - variant + + variant