diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml new file mode 100755 index 0000000..26f3933 --- /dev/null +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -0,0 +1,52 @@ +# 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: linux + pool: + vmImage: ubuntu-16.04 + strategy: + matrix: + linux_64_c_compiler_version7cxx_compiler_version7python3.6.____cpython: + CONFIG: linux_64_c_compiler_version7cxx_compiler_version7python3.6.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: condaforge/linux-anvil-comp7 + linux_64_c_compiler_version7cxx_compiler_version7python3.7.____cpython: + CONFIG: linux_64_c_compiler_version7cxx_compiler_version7python3.7.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: condaforge/linux-anvil-comp7 + linux_64_c_compiler_version7cxx_compiler_version7python3.8.____cpython: + CONFIG: linux_64_c_compiler_version7cxx_compiler_version7python3.8.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: condaforge/linux-anvil-comp7 + linux_64_c_compiler_version7cxx_compiler_version7python3.9.____cpython: + CONFIG: linux_64_c_compiler_version7cxx_compiler_version7python3.9.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: condaforge/linux-anvil-comp7 + timeoutInMinutes: 360 + + 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: | + docker run --rm --privileged multiarch/qemu-user-static:register --reset --credential yes + ls /proc/sys/fs/binfmt_misc/ + condition: not(startsWith(variables['CONFIG'], 'linux_64')) + displayName: Configure binfmt_misc + + - script: | + export CI=azure + export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME + export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME}) + .scripts/run_docker_build.sh + displayName: Run docker 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/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml new file mode 100755 index 0000000..7eb66c8 --- /dev/null +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -0,0 +1,37 @@ +# 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-10.15 + strategy: + matrix: + osx_64_c_compiler_version10cxx_compiler_version10python3.6.____cpython: + CONFIG: osx_64_c_compiler_version10cxx_compiler_version10python3.6.____cpython + UPLOAD_PACKAGES: 'True' + osx_64_c_compiler_version10cxx_compiler_version10python3.7.____cpython: + CONFIG: osx_64_c_compiler_version10cxx_compiler_version10python3.7.____cpython + UPLOAD_PACKAGES: 'True' + osx_64_c_compiler_version10cxx_compiler_version10python3.8.____cpython: + CONFIG: osx_64_c_compiler_version10cxx_compiler_version10python3.8.____cpython + UPLOAD_PACKAGES: 'True' + osx_64_c_compiler_version10cxx_compiler_version10python3.9.____cpython: + CONFIG: osx_64_c_compiler_version10cxx_compiler_version10python3.9.____cpython + UPLOAD_PACKAGES: 'True' + timeoutInMinutes: 360 + + steps: + # TODO: Fast finish on azure pipelines? + - script: | + export CI=azure + export OSX_FORCE_SDK_DOWNLOAD="1" + export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME + export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME}) + ./.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/linux_64_c_compiler_version7cxx_compiler_version7python3.6.____cpython.yaml b/.ci_support/linux_64_c_compiler_version7cxx_compiler_version7python3.6.____cpython.yaml new file mode 100644 index 0000000..f7365a3 --- /dev/null +++ b/.ci_support/linux_64_c_compiler_version7cxx_compiler_version7python3.6.____cpython.yaml @@ -0,0 +1,31 @@ +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 +fftw: +- '3' +hdf5: +- 1.10.5 +pin_run_as_build: + fftw: + max_pin: x + python: + min_pin: x.x + max_pin: x.x +python: +- 3.6.* *_cpython +target_platform: +- linux-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version diff --git a/.ci_support/linux_64_c_compiler_version7cxx_compiler_version7python3.7.____cpython.yaml b/.ci_support/linux_64_c_compiler_version7cxx_compiler_version7python3.7.____cpython.yaml new file mode 100644 index 0000000..eafbb0d --- /dev/null +++ b/.ci_support/linux_64_c_compiler_version7cxx_compiler_version7python3.7.____cpython.yaml @@ -0,0 +1,31 @@ +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 +fftw: +- '3' +hdf5: +- 1.10.5 +pin_run_as_build: + fftw: + max_pin: x + python: + min_pin: x.x + max_pin: x.x +python: +- 3.7.* *_cpython +target_platform: +- linux-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version diff --git a/.ci_support/linux_64_c_compiler_version7cxx_compiler_version7python3.8.____cpython.yaml b/.ci_support/linux_64_c_compiler_version7cxx_compiler_version7python3.8.____cpython.yaml new file mode 100644 index 0000000..51dfb11 --- /dev/null +++ b/.ci_support/linux_64_c_compiler_version7cxx_compiler_version7python3.8.____cpython.yaml @@ -0,0 +1,31 @@ +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 +fftw: +- '3' +hdf5: +- 1.10.5 +pin_run_as_build: + fftw: + max_pin: x + python: + min_pin: x.x + max_pin: x.x +python: +- 3.8.* *_cpython +target_platform: +- linux-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version diff --git a/.ci_support/linux_64_c_compiler_version7cxx_compiler_version7python3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version7cxx_compiler_version7python3.9.____cpython.yaml new file mode 100644 index 0000000..234e7f9 --- /dev/null +++ b/.ci_support/linux_64_c_compiler_version7cxx_compiler_version7python3.9.____cpython.yaml @@ -0,0 +1,31 @@ +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 +fftw: +- '3' +hdf5: +- 1.10.5 +pin_run_as_build: + fftw: + max_pin: x + python: + min_pin: x.x + max_pin: x.x +python: +- 3.9.* *_cpython +target_platform: +- linux-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version diff --git a/.ci_support/linux_python2.7.yaml b/.ci_support/linux_python2.7.yaml deleted file mode 100644 index dd7a8b0..0000000 --- a/.ci_support/linux_python2.7.yaml +++ /dev/null @@ -1,14 +0,0 @@ -c_compiler: -- toolchain_c -cxx_compiler: -- toolchain_cxx -hdf5: -- 1.10.2 -pin_run_as_build: - hdf5: - max_pin: x.x.x - python: - min_pin: x.x - max_pin: x.x -python: -- '2.7' diff --git a/.ci_support/linux_python3.5.yaml b/.ci_support/linux_python3.5.yaml deleted file mode 100644 index 4adecb2..0000000 --- a/.ci_support/linux_python3.5.yaml +++ /dev/null @@ -1,14 +0,0 @@ -c_compiler: -- toolchain_c -cxx_compiler: -- toolchain_cxx -hdf5: -- 1.10.2 -pin_run_as_build: - hdf5: - max_pin: x.x.x - python: - min_pin: x.x - max_pin: x.x -python: -- '3.5' diff --git a/.ci_support/linux_python3.6.yaml b/.ci_support/linux_python3.6.yaml deleted file mode 100644 index 08af43c..0000000 --- a/.ci_support/linux_python3.6.yaml +++ /dev/null @@ -1,14 +0,0 @@ -c_compiler: -- toolchain_c -cxx_compiler: -- toolchain_cxx -hdf5: -- 1.10.2 -pin_run_as_build: - hdf5: - max_pin: x.x.x - python: - min_pin: x.x - max_pin: x.x -python: -- '3.6' diff --git a/.ci_support/migrations/python39.yaml b/.ci_support/migrations/python39.yaml new file mode 100644 index 0000000..0fd3158 --- /dev/null +++ b/.ci_support/migrations/python39.yaml @@ -0,0 +1,20 @@ +migrator_ts: 1602104489 +__migrator: + migration_number: 2 + operation: key_add + primary_key: python + ordering: + python: + - 3.6.* *_cpython + - 3.7.* *_cpython + - 3.8.* *_cpython + - 3.9.* *_cpython # new entry + - 3.6.* *_73_pypy + paused: false +python: + - 3.9.* *_cpython +# additional entries to add for zip_keys +numpy: + - 1.18 +python_impl: + - cpython diff --git a/.ci_support/osx_64_c_compiler_version10cxx_compiler_version10python3.6.____cpython.yaml b/.ci_support/osx_64_c_compiler_version10cxx_compiler_version10python3.6.____cpython.yaml new file mode 100644 index 0000000..d7e94c8 --- /dev/null +++ b/.ci_support/osx_64_c_compiler_version10cxx_compiler_version10python3.6.____cpython.yaml @@ -0,0 +1,33 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.9' +c_compiler: +- clang +c_compiler_version: +- '10' +channel_sources: +- conda-forge,defaults +channel_targets: +- conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '10' +fftw: +- '3' +hdf5: +- 1.10.5 +macos_machine: +- x86_64-apple-darwin13.4.0 +pin_run_as_build: + fftw: + max_pin: x + python: + min_pin: x.x + max_pin: x.x +python: +- 3.6.* *_cpython +target_platform: +- osx-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version diff --git a/.ci_support/osx_64_c_compiler_version10cxx_compiler_version10python3.7.____cpython.yaml b/.ci_support/osx_64_c_compiler_version10cxx_compiler_version10python3.7.____cpython.yaml new file mode 100644 index 0000000..e17f459 --- /dev/null +++ b/.ci_support/osx_64_c_compiler_version10cxx_compiler_version10python3.7.____cpython.yaml @@ -0,0 +1,33 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.9' +c_compiler: +- clang +c_compiler_version: +- '10' +channel_sources: +- conda-forge,defaults +channel_targets: +- conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '10' +fftw: +- '3' +hdf5: +- 1.10.5 +macos_machine: +- x86_64-apple-darwin13.4.0 +pin_run_as_build: + fftw: + max_pin: x + python: + min_pin: x.x + max_pin: x.x +python: +- 3.7.* *_cpython +target_platform: +- osx-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version diff --git a/.ci_support/osx_64_c_compiler_version10cxx_compiler_version10python3.8.____cpython.yaml b/.ci_support/osx_64_c_compiler_version10cxx_compiler_version10python3.8.____cpython.yaml new file mode 100644 index 0000000..9facce1 --- /dev/null +++ b/.ci_support/osx_64_c_compiler_version10cxx_compiler_version10python3.8.____cpython.yaml @@ -0,0 +1,33 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.9' +c_compiler: +- clang +c_compiler_version: +- '10' +channel_sources: +- conda-forge,defaults +channel_targets: +- conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '10' +fftw: +- '3' +hdf5: +- 1.10.5 +macos_machine: +- x86_64-apple-darwin13.4.0 +pin_run_as_build: + fftw: + max_pin: x + python: + min_pin: x.x + max_pin: x.x +python: +- 3.8.* *_cpython +target_platform: +- osx-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version diff --git a/.ci_support/osx_64_c_compiler_version10cxx_compiler_version10python3.9.____cpython.yaml b/.ci_support/osx_64_c_compiler_version10cxx_compiler_version10python3.9.____cpython.yaml new file mode 100644 index 0000000..a889083 --- /dev/null +++ b/.ci_support/osx_64_c_compiler_version10cxx_compiler_version10python3.9.____cpython.yaml @@ -0,0 +1,33 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.9' +c_compiler: +- clang +c_compiler_version: +- '10' +channel_sources: +- conda-forge,defaults +channel_targets: +- conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '10' +fftw: +- '3' +hdf5: +- 1.10.5 +macos_machine: +- x86_64-apple-darwin13.4.0 +pin_run_as_build: + fftw: + max_pin: x + python: + min_pin: x.x + max_pin: x.x +python: +- 3.9.* *_cpython +target_platform: +- osx-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version diff --git a/.ci_support/osx_python2.7.yaml b/.ci_support/osx_python2.7.yaml deleted file mode 100644 index f7ac45d..0000000 --- a/.ci_support/osx_python2.7.yaml +++ /dev/null @@ -1,20 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.9' -c_compiler: -- toolchain_c -cxx_compiler: -- toolchain_cxx -hdf5: -- 1.10.2 -macos_machine: -- x86_64-apple-darwin13.4.0 -macos_min_version: -- '10.9' -pin_run_as_build: - hdf5: - max_pin: x.x.x - python: - min_pin: x.x - max_pin: x.x -python: -- '2.7' diff --git a/.ci_support/osx_python3.5.yaml b/.ci_support/osx_python3.5.yaml deleted file mode 100644 index 65a4d49..0000000 --- a/.ci_support/osx_python3.5.yaml +++ /dev/null @@ -1,20 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.9' -c_compiler: -- toolchain_c -cxx_compiler: -- toolchain_cxx -hdf5: -- 1.10.2 -macos_machine: -- x86_64-apple-darwin13.4.0 -macos_min_version: -- '10.9' -pin_run_as_build: - hdf5: - max_pin: x.x.x - python: - min_pin: x.x - max_pin: x.x -python: -- '3.5' diff --git a/.ci_support/osx_python3.6.yaml b/.ci_support/osx_python3.6.yaml deleted file mode 100644 index 100c0e5..0000000 --- a/.ci_support/osx_python3.6.yaml +++ /dev/null @@ -1,20 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.9' -c_compiler: -- toolchain_c -cxx_compiler: -- toolchain_cxx -hdf5: -- 1.10.2 -macos_machine: -- x86_64-apple-darwin13.4.0 -macos_min_version: -- '10.9' -pin_run_as_build: - hdf5: - max_pin: x.x.x - python: - min_pin: x.x - max_pin: x.x -python: -- '3.6' diff --git a/.circleci/build_steps.sh b/.circleci/build_steps.sh deleted file mode 100755 index 1becc90..0000000 --- a/.circleci/build_steps.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -# PLEASE NOTE: This script has been automatically generated by conda-smithy. Any changes here -# will be lost next time ``conda smithy rerender`` is run. If you would like to make permanent -# changes to this script, consider a proposal to conda-smithy so that other feedstocks can also -# benefit from the improvement. - -set -xeuo pipefail -export PYTHONUNBUFFERED=1 - -cat >~/.condarc < /dev/null -fi diff --git a/.circleci/config.yml b/.circleci/config.yml index c6a016c..6ad461b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,62 +1,24 @@ +# 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 -*- + version: 2 jobs: - build_linux_python2.7: - working_directory: ~/test - machine: true - environment: - - CONFIG: "linux_python2.7" - 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: - command: docker pull condaforge/linux-anvil - - run: - # Run, test and (if we have a BINSTAR_TOKEN) upload the distributions. - command: ./.circleci/run_docker_build.sh - build_linux_python3.5: + build: working_directory: ~/test machine: true - environment: - - CONFIG: "linux_python3.5" 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: - command: docker pull condaforge/linux-anvil - - run: - # Run, test and (if we have a BINSTAR_TOKEN) upload the distributions. - command: ./.circleci/run_docker_build.sh - build_linux_python3.6: - working_directory: ~/test - machine: true - environment: - - CONFIG: "linux_python3.6" - 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: - command: docker pull condaforge/linux-anvil - run: - # Run, test and (if we have a BINSTAR_TOKEN) upload the distributions. - command: ./.circleci/run_docker_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_linux_python2.7 - - build_linux_python3.5 - - build_linux_python3.6 + - 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 3db687a..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/ff_ci_pr_build.py | \ - python - -v --ci "circle" "${CIRCLE_PROJECT_USERNAME}/${CIRCLE_PROJECT_REPONAME}" "${CIRCLE_BUILD_NUM}" "${CIRCLE_PR_NUMBER}" diff --git a/.circleci/run_docker_build.sh b/.circleci/run_docker_build.sh deleted file mode 100755 index 1887217..0000000 --- a/.circleci/run_docker_build.sh +++ /dev/null @@ -1,47 +0,0 @@ -#!/usr/bin/env bash - -# PLEASE NOTE: This script has been automatically generated by conda-smithy. Any changes here -# will be lost next time ``conda smithy rerender`` is run. If you would like to make permanent -# changes to this script, consider a proposal to conda-smithy so that other feedstocks can also -# benefit from the improvement. - -set -xeuo pipefail - -FEEDSTOCK_ROOT=$(cd "$(dirname "$0")/.."; pwd;) -RECIPE_ROOT=$FEEDSTOCK_ROOT/recipe - -docker info - -# In order for the conda-build process in the container to write to the mounted -# volumes, we need to run with the same id as the host machine, which is -# normally the owner of the mounted volumes, or at least has write permission -export HOST_USER_ID=$(id -u) -# Check if docker-machine is being used (normally on OSX) and get the uid from -# the VM -if hash docker-machine 2> /dev/null && docker-machine active > /dev/null; then - export HOST_USER_ID=$(docker-machine ssh $(docker-machine active) id -u) -fi - -ARTIFACTS="$FEEDSTOCK_ROOT/build_artifacts" - -if [ -z "$CONFIG" ]; then - echo "Need to set CONFIG env variable" - exit 1 -fi - -mkdir -p "$ARTIFACTS" -DONE_CANARY="$ARTIFACTS/conda-forge-build-done-${CONFIG}" -rm -f "$DONE_CANARY" - -docker run -it \ - -v "${RECIPE_ROOT}":/home/conda/recipe_root \ - -v "${FEEDSTOCK_ROOT}":/home/conda/feedstock_root \ - -e CONFIG \ - -e BINSTAR_TOKEN \ - -e HOST_USER_ID \ - condaforge/linux-anvil \ - bash \ - /home/conda/feedstock_root/.circleci/build_steps.sh - -# verify that the end of the script was reached -test -f "$DONE_CANARY" \ No newline at end of file diff --git a/.gitattributes b/.gitattributes index 974953e..9060b27 100644 --- a/.gitattributes +++ b/.gitattributes @@ -5,3 +5,21 @@ meta.yaml text eol=lf build.sh text eol=lf 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 +.drone/* linguist-generated=true +.drone.yml linguist-generated=true +.github/* linguist-generated=true +.travis/* linguist-generated=true +.appveyor.yml linguist-generated=true +.gitattributes linguist-generated=true +.gitignore linguist-generated=true +.travis.yml linguist-generated=true +.scripts/* 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 new file mode 100644 index 0000000..eec7f3a --- /dev/null +++ b/.github/CODEOWNERS @@ -0,0 +1 @@ +* @hbredin @thomasfillon \ No newline at end of file diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md deleted file mode 100644 index d87090f..0000000 --- a/.github/CONTRIBUTING.md +++ /dev/null @@ -1,15 +0,0 @@ -Thanks for your interest in helping out conda-forge. - -Whether you are brand new or a seasoned maintainer, we always appreciate -feedback from the community about how we can improve conda-forge. If you -are submitting a PR or issue, please fill out the respective template. Should -any questions arise please feel free to ask the maintainer team of the -respective feedstock or reach out to `@conda-forge/core` for more complex -issues. - -In the case of any issues reported, please be sure to demonstrate the relevant -issue (even if it is an absence of a feature). Providing this information will -help busy maintainers understand what it is you hope to accomplish. Also this -will help provide them clues as to what might be going wrong. These examples -can also be reused as tests in the build to ensure further packages meet these -criteria. This is requested to help you get timely and relevant feedback. :) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md deleted file mode 100644 index fc95334..0000000 --- a/.github/ISSUE_TEMPLATE.md +++ /dev/null @@ -1,25 +0,0 @@ - -Issue: - -
-Environment (conda list): -
- -``` -$ conda list - -``` -
- -
-Details about conda and system ( conda info ): -
- -``` -$ conda info - -``` -
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md deleted file mode 100644 index d60a25d..0000000 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ /dev/null @@ -1,18 +0,0 @@ - -Checklist -* [ ] Used a fork of the feedstock to propose changes -* [ ] Bumped the build number (if the version is unchanged) -* [ ] Reset the build number to `0` (if the version changed) -* [ ] [Re-rendered]( https://conda-forge.org/docs/conda_smithy.html#how-to-re-render ) with the latest `conda-smithy` -* [ ] Ensured the license file is being packaged. - - - - diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh new file mode 100755 index 0000000..aa9727b --- /dev/null +++ b/.scripts/build_steps.sh @@ -0,0 +1,53 @@ +#!/usr/bin/env bash + +# PLEASE NOTE: This script has been automatically generated by conda-smithy. Any changes here +# will be lost next time ``conda smithy rerender`` is run. If you would like to make permanent +# changes to this script, consider a proposal to conda-smithy so that other feedstocks can also +# benefit from the improvement. + +set -xeuo pipefail +export PYTHONUNBUFFERED=1 +export FEEDSTOCK_ROOT="${FEEDSTOCK_ROOT:-/home/conda/feedstock_root}" +export RECIPE_ROOT="${RECIPE_ROOT:-/home/conda/recipe_root}" +export CI_SUPPORT="${FEEDSTOCK_ROOT}/.ci_support" +export CONFIG_FILE="${CI_SUPPORT}/${CONFIG}.yaml" + +cat >~/.condarc </dev/null && pwd )" +PROVIDER_DIR="$(basename $THISDIR)" + +FEEDSTOCK_ROOT=$(cd "$(dirname "$0")/.."; pwd;) +RECIPE_ROOT="${FEEDSTOCK_ROOT}/recipe" + +if [ -z ${FEEDSTOCK_NAME} ]; then + export FEEDSTOCK_NAME=$(basename ${FEEDSTOCK_ROOT}) +fi + +docker info + +# In order for the conda-build process in the container to write to the mounted +# volumes, we need to run with the same id as the host machine, which is +# normally the owner of the mounted volumes, or at least has write permission +export HOST_USER_ID=$(id -u) +# Check if docker-machine is being used (normally on OSX) and get the uid from +# the VM +if hash docker-machine 2> /dev/null && docker-machine active > /dev/null; then + export HOST_USER_ID=$(docker-machine ssh $(docker-machine active) id -u) +fi + +ARTIFACTS="$FEEDSTOCK_ROOT/build_artifacts" + +if [ -z "$CONFIG" ]; then + set +x + FILES=`ls .ci_support/linux_*` + CONFIGS="" + for file in $FILES; do + CONFIGS="${CONFIGS}'${file:12:-5}' or "; + done + echo "Need to set CONFIG env variable. Value can be one of ${CONFIGS:0:-4}" + exit 1 +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" + else + DOCKER_IMAGE="$(cat "${FEEDSTOCK_ROOT}/.ci_support/${CONFIG}.yaml" | shyaml get-value docker_image.0 condaforge/linux-anvil-comp7 )" + fi +fi + +mkdir -p "$ARTIFACTS" +DONE_CANARY="$ARTIFACTS/conda-forge-build-done-${CONFIG}" +rm -f "$DONE_CANARY" + +# Allow people to specify extra default arguments to `docker run` (e.g. `--rm`) +DOCKER_RUN_ARGS="${CONDA_FORGE_DOCKER_RUN_ARGS}" +if [ -z "${CI}" ]; then + DOCKER_RUN_ARGS="-it ${DOCKER_RUN_ARGS}" +fi + +export UPLOAD_PACKAGES="${UPLOAD_PACKAGES:-True}" +docker run ${DOCKER_RUN_ARGS} \ + -v "${RECIPE_ROOT}":/home/conda/recipe_root:rw,z \ + -v "${FEEDSTOCK_ROOT}":/home/conda/feedstock_root:rw,z \ + -e CONFIG \ + -e HOST_USER_ID \ + -e UPLOAD_PACKAGES \ + -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 BINSTAR_TOKEN \ + -e FEEDSTOCK_TOKEN \ + -e STAGING_BINSTAR_TOKEN \ + $DOCKER_IMAGE \ + bash \ + /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 diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh new file mode 100755 index 0000000..c299b79 --- /dev/null +++ b/.scripts/run_osx_build.sh @@ -0,0 +1,57 @@ +#!/usr/bin/env bash + +set -x + +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 + +echo -e "\n\nConfiguring conda." +if [[ ${CI} == "travis" ]]; then + echo -en 'travis_fold:start:configure_conda\\r' +fi + +source ${HOME}/miniforge3/etc/profile.d/conda.sh +conda activate base + +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 + +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 + +echo -e "\n\nMaking the build clobber file and running the build." +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 [[ "${UPLOAD_PACKAGES}" != "False" ]]; then + echo -e "\n\nUploading the packages." + upload_package --validate --feedstock-name="${FEEDSTOCK_NAME}" ./ ./recipe ./.ci_support/${CONFIG}.yaml +fi \ No newline at end of file diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 05d0fe2..0000000 --- a/.travis.yml +++ /dev/null @@ -1,61 +0,0 @@ -# This file was generated automatically from conda-smithy. To update this configuration, -# update the conda-forge.yml and/or the recipe/meta.yaml. - -language: generic - -os: osx -osx_image: xcode6.4 - -env: - matrix: - - CONFIG=osx_python2.7 - - CONFIG=osx_python3.5 - - CONFIG=osx_python3.6 - - global: - # The BINSTAR_TOKEN secure variable. This is defined canonically in conda-forge.yml. - - secure: "JXkW/9C4n91dtNvAuFt1AdXq7c2s6hl3mDuZOHP/nr6dgrivvLosehU5ynrj9GC1uNh1ThiLnZtgcdVJA+ryInZgQi2wmjYmUEyrB4x3AmhTK2r9Y99dxnkmCbiyJ9uwTHYdBZwWqjlENLSMTUqIMtqDGjrSchv9WmEc5D88YVWmRsZC0ZikH2IW//E9Y5Wn9GbB/zARka7zPKlv0J9xbPMWY/vkXorxZ8gAwVvQycrpu0zzJXR7o11eOeRnuGJJmI1/tcYdiemvolt2dt1qbePs3tlQUYiD8TezPmdnWf5YVMLdk9DOJscbbsJn6hSSGl00GLsbYwoEsNmePqnf8fvoncCO9SGLKRorMzfXXfEjLCNNfXAdcAi/g/QgfnD6rMnMAE3b+pnBAxbHq/AjzQ829+co8/KqRWFvSqfag37Li+RSk3WcoEqU2dpjfMUOgAhtKefQvq9u9WzsdQ7+WGspeeW4BkG/8SXpMobGcC/zy1fa4AxDh2djRByxaW0/AyRZkfr1mCXASt6Z37H6dZf+XRY+cDWizPfrWgy7UYNV2XaXlg9nbvzWc9kDMKQOk5eEO6HD5oo5oC9xycX9d/I9zocrPymFF1Qz7fNQzu2vIzuCUFEVjIxjKsdUVQyop5dwTv5MOh2X0LdTutzgjZkyl+icq9HmY6MVg5jC4jQ=" - - -before_install: - # Fast finish the PR. - - | - (curl https://raw.githubusercontent.com/conda-forge/conda-forge-ci-setup-feedstock/master/recipe/ff_ci_pr_build.py | \ - python - -v --ci "travis" "${TRAVIS_REPO_SLUG}" "${TRAVIS_BUILD_NUMBER}" "${TRAVIS_PULL_REQUEST}") || exit 1 - - # Remove homebrew. - - | - echo "" - echo "Removing homebrew from Travis CI to avoid conflicts." - curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/uninstall > ~/uninstall_homebrew - chmod +x ~/uninstall_homebrew - ~/uninstall_homebrew -fq - rm ~/uninstall_homebrew - - -install: - # Install Miniconda. - - | - echo "" - echo "Installing a fresh version of Miniconda." - MINICONDA_URL="https://repo.continuum.io/miniconda" - MINICONDA_FILE="Miniconda3-latest-MacOSX-x86_64.sh" - curl -L -O "${MINICONDA_URL}/${MINICONDA_FILE}" - bash $MINICONDA_FILE -b - - # Configure conda. - - | - echo "" - echo "Configuring conda." - source /Users/travis/miniconda3/bin/activate root - conda config --remove channels defaults - conda config --add channels defaults - conda config --add channels conda-forge - conda config --set show_channel_urls true - conda install --yes --quiet conda-forge-ci-setup=1 - source run_conda_forge_build_setup - -script: - - conda build ./recipe -m ./.ci_support/${CONFIG}.yaml - - - upload_or_check_non_existence ./recipe conda-forge --channel=main -m ./.ci_support/${CONFIG}.yaml diff --git a/LICENSE.txt b/LICENSE.txt index 72dc8fd..5f30279 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,5 +1,5 @@ BSD 3-clause license -Copyright (c) 2015-2018, conda-forge +Copyright (c) 2015-2020, 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 ef8e30e..02d0df7 100644 --- a/README.md +++ b/README.md @@ -5,18 +5,90 @@ Home: https://github.com/Yaafe/Yaafe Package license: LGPL-3 -Feedstock license: BSD 3-Clause +Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/yaafe-feedstock/blob/master/LICENSE.txt) Summary: Yaafe - audio features extraction - - Current build status ==================== -[![Linux](https://img.shields.io/circleci/project/github/conda-forge/yaafe-feedstock/master.svg?label=Linux)](https://circleci.com/gh/conda-forge/yaafe-feedstock) -[![OSX](https://img.shields.io/travis/conda-forge/yaafe-feedstock/master.svg?label=macOS)](https://travis-ci.org/conda-forge/yaafe-feedstock) -![Windows disabled](https://img.shields.io/badge/Windows-disabled-lightgrey.svg) + + + + + + + +
Azure +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
VariantStatus
linux_64_c_compiler_version7cxx_compiler_version7python3.6.____cpython + + variant + +
linux_64_c_compiler_version7cxx_compiler_version7python3.7.____cpython + + variant + +
linux_64_c_compiler_version7cxx_compiler_version7python3.8.____cpython + + variant + +
linux_64_c_compiler_version7cxx_compiler_version7python3.9.____cpython + + variant + +
osx_64_c_compiler_version10cxx_compiler_version10python3.6.____cpython + + variant + +
osx_64_c_compiler_version10cxx_compiler_version10python3.7.____cpython + + variant + +
osx_64_c_compiler_version10cxx_compiler_version10python3.8.____cpython + + variant + +
osx_64_c_compiler_version10cxx_compiler_version10python3.9.____cpython + + variant + +
+
+
Current release info ==================== @@ -50,6 +122,8 @@ conda search yaafe --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) + 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 conda-forge GitHub organization. The conda-forge organization contains one repository @@ -58,13 +132,13 @@ 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](http://www.appveyor.com/) -and [TravisCI](https://travis-ci.org/) it is possible to build and upload installable +[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](http://docs.anaconda.org/) channel for Linux, Windows and OSX respectively. +[Anaconda-Cloud](https://anaconda.org/) channel for Linux, Windows and OSX respectively. To manage the continuous integration and simplify feedstock maintenance -[conda-smithy](http://github.com/conda-forge/conda-smithy) has been developed. +[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``. @@ -100,7 +174,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``](http://conda.pydata.org/docs/building/meta-yaml.html#build-number-and-string). + the [``build/number``](https://conda.io/docs/user-guide/tasks/build-packages/define-metadata.html#build-number-and-string). * If the version of a package **is** being increased, please remember to return - the [``build/number``](http://conda.pydata.org/docs/building/meta-yaml.html#build-number-and-string) - back to 0. \ No newline at end of file + the [``build/number``](https://conda.io/docs/user-guide/tasks/build-packages/define-metadata.html#build-number-and-string) + back to 0. + +Feedstock Maintainers +===================== + +* [@hbredin](https://github.com/hbredin/) +* [@thomasfillon](https://github.com/thomasfillon/) + diff --git a/azure-pipelines.yml b/azure-pipelines.yml new file mode 100644 index 0000000..33a441c --- /dev/null +++ b/azure-pipelines.yml @@ -0,0 +1,7 @@ +# 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: + - 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 new file mode 100755 index 0000000..3453cfe --- /dev/null +++ b/build-locally.py @@ -0,0 +1,75 @@ +#!/usr/bin/env python3 +# +# This file has been generated by conda-smithy in order to build the recipe +# locally. +# +import os +import glob +import subprocess +from argparse import ArgumentParser + + +def setup_environment(ns): + os.environ["CONFIG"] = ns.config + os.environ["UPLOAD_PACKAGES"] = "False" + if ns.debug: + os.environ["BUILD_WITH_CONDA_DEBUG"] = "1" + if ns.output_id: + os.environ["BUILD_OUTPUT_ID"] = ns.output_id + + +def run_docker_build(ns): + script = ".scripts/run_docker_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") + } + print(f"valid configs are {valid_configs}") + if ns.config in valid_configs: + print("Using " + ns.config + " configuration") + return + elif len(valid_configs) == 1: + ns.config = valid_configs.pop() + print("Found " + ns.config + " configuration") + elif ns.config is None: + print("config not selected, please choose from the following:\n") + selections = list(enumerate(sorted(valid_configs), 1)) + for i, c in selections: + print(f"{i}. {c}") + s = input("\n> ") + idx = int(s) - 1 + ns.config = selections[idx][1] + print(f"selected {ns.config}") + else: + raise ValueError("config " + ns.config + " is not valid") + # Remove the following, as implemented + if not ns.config.startswith("linux"): + raise ValueError( + f"only Linux configs currently supported, got {ns.config}" + ) + + +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) + + +if __name__ == "__main__": + main() diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 6e1de67..e2c7336 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -14,7 +14,7 @@ source: build: rpaths: - lib/ - number: 1 + number: 2 skip: true # [win] requirements: