From c748a36379b3f0ece7ffdc85beebed2928ce0cc1 Mon Sep 17 00:00:00 2001 From: Travis CI User Date: Wed, 23 May 2018 17:37:21 +0000 Subject: [PATCH 1/2] updated v0.3.0 --- recipe/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index f518c62..c7b6a92 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "0.2.20" %} +{% set version = "0.3.0" %} package: name: openblas @@ -7,7 +7,7 @@ package: source: fn: openblas-{{ version }}.tar.gz url: https://github.com/xianyi/OpenBLAS/archive/v{{ version }}.tar.gz - sha256: 5ef38b15d9c652985774869efd548b8e3e972e1e99475c673b25537ed7bcf394 + sha256: cf51543709abe364d8ecfb5c09a2b533d2b725ea1a66f203509b21a8e9d8f1a1 patches: - gh_1247.patch - gh_1259.patch @@ -20,7 +20,7 @@ source: - gh_1417.patch build: - number: 7 + number: 0 skip: true # [win32] features: - vc14 # [win] From 9956132171bdb85c537e538011c206eae4c8878c Mon Sep 17 00:00:00 2001 From: Travis CI User Date: Wed, 23 May 2018 17:37:34 +0000 Subject: [PATCH 2/2] MNT: Re-rendered with conda-smithy 3.1.4 and pinning 2018.05.07 --- appveyor.yml => .appveyor.yml | 14 ++-- .ci_support/README | 1 + .ci_support/linux_.yaml | 5 ++ .ci_support/osx_.yaml | 11 +++ .ci_support/win_.yaml | 5 ++ .circleci/build_steps.sh | 33 +++++++++ .../checkout_merge_commit.sh | 0 .circleci/config.yml | 16 ++--- .../fast_finish_ci_pr_build.sh | 2 +- .circleci/run_docker_build.sh | 47 ++++++++++++ .github/CONTRIBUTING.md | 15 ++++ .github/ISSUE_TEMPLATE.md | 25 +++++++ .github/PULL_REQUEST_TEMPLATE.md | 18 +++++ .gitignore | 2 +- .travis.yml | 12 ++-- LICENSE => LICENSE.txt | 2 +- README.md | 12 ++-- ci_support/run_docker_build.sh | 71 ------------------- 18 files changed, 188 insertions(+), 103 deletions(-) rename appveyor.yml => .appveyor.yml (84%) create mode 100644 .ci_support/README create mode 100644 .ci_support/linux_.yaml create mode 100644 .ci_support/osx_.yaml create mode 100644 .ci_support/win_.yaml create mode 100755 .circleci/build_steps.sh rename {ci_support => .circleci}/checkout_merge_commit.sh (100%) rename {ci_support => .circleci}/fast_finish_ci_pr_build.sh (54%) create mode 100755 .circleci/run_docker_build.sh create mode 100644 .github/CONTRIBUTING.md create mode 100644 .github/ISSUE_TEMPLATE.md create mode 100644 .github/PULL_REQUEST_TEMPLATE.md rename LICENSE => LICENSE.txt (97%) delete mode 100755 ci_support/run_docker_build.sh diff --git a/appveyor.yml b/.appveyor.yml similarity index 84% rename from appveyor.yml rename to .appveyor.yml index 8bdf963..4597130 100644 --- a/appveyor.yml +++ b/.appveyor.yml @@ -9,10 +9,8 @@ environment: secure: ipv/06DzgA7pzz2CIAtbPxZSsphDtF+JFyoWRnXkn3O8j7oRe3rzqj3LOoq2DZp4 matrix: - - TARGET_ARCH: x64 - CONDA_PERL: 5.22.2.1 - CONDA_PY: 27 - CONDA_INSTALL_LOCN: C:\\Miniconda-x64 + - CONFIG: win_ + CONDA_INSTALL_LOCN: C:\Miniconda36-x64 # We always use a 64-bit machine, but can build x86 distributions @@ -23,7 +21,7 @@ platform: install: # If there is a newer build queued for the same PR, cancel this one. - cmd: | - powershell -Command "(New-Object Net.WebClient).DownloadFile('https://raw.githubusercontent.com/conda-forge/conda-forge-build-setup-feedstock/master/recipe/ff_ci_pr_build.py', 'ff_ci_pr_build.py')" + powershell -Command "(New-Object Net.WebClient).DownloadFile('https://raw.githubusercontent.com/conda-forge/conda-forge-ci-setup-feedstock/master/recipe/ff_ci_pr_build.py', 'ff_ci_pr_build.py')" ff_ci_pr_build -v --ci "appveyor" "%APPVEYOR_ACCOUNT_NAME%/%APPVEYOR_PROJECT_SLUG%" "%APPVEYOR_BUILD_NUMBER%" "%APPVEYOR_PULL_REQUEST_NUMBER%" del ff_ci_pr_build.py @@ -43,13 +41,13 @@ install: - cmd: conda.exe config --add channels conda-forge # Configure the VM. - - cmd: conda.exe install -n root --quiet --yes conda-forge-build-setup + - cmd: conda.exe install -n root --quiet --yes conda-forge-ci-setup=1 - cmd: run_conda_forge_build_setup # Skip .NET project specific build phase. build: off test_script: - - conda.exe build recipe --quiet + - conda.exe build recipe -m .ci_support\%CONFIG%.yaml --quiet deploy_script: - - cmd: upload_or_check_non_existence .\recipe conda-forge --channel=main + - cmd: upload_or_check_non_existence .\recipe conda-forge --channel=main -m .ci_support\%CONFIG%.yaml diff --git a/.ci_support/README b/.ci_support/README new file mode 100644 index 0000000..e4e2dce --- /dev/null +++ b/.ci_support/README @@ -0,0 +1 @@ +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 diff --git a/.ci_support/linux_.yaml b/.ci_support/linux_.yaml new file mode 100644 index 0000000..a52ae30 --- /dev/null +++ b/.ci_support/linux_.yaml @@ -0,0 +1,5 @@ +curl: +- '7.59' +pin_run_as_build: + curl: + max_pin: x diff --git a/.ci_support/osx_.yaml b/.ci_support/osx_.yaml new file mode 100644 index 0000000..9264ac0 --- /dev/null +++ b/.ci_support/osx_.yaml @@ -0,0 +1,11 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.9' +curl: +- '7.59' +macos_machine: +- x86_64-apple-darwin13.4.0 +macos_min_version: +- '10.9' +pin_run_as_build: + curl: + max_pin: x diff --git a/.ci_support/win_.yaml b/.ci_support/win_.yaml new file mode 100644 index 0000000..a52ae30 --- /dev/null +++ b/.ci_support/win_.yaml @@ -0,0 +1,5 @@ +curl: +- '7.59' +pin_run_as_build: + curl: + max_pin: x diff --git a/.circleci/build_steps.sh b/.circleci/build_steps.sh new file mode 100755 index 0000000..1becc90 --- /dev/null +++ b/.circleci/build_steps.sh @@ -0,0 +1,33 @@ +#!/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 && 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 + +test -d "$ARTIFACTS" || mkdir "$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/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md new file mode 100644 index 0000000..d87090f --- /dev/null +++ b/.github/CONTRIBUTING.md @@ -0,0 +1,15 @@ +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 new file mode 100644 index 0000000..fc95334 --- /dev/null +++ b/.github/ISSUE_TEMPLATE.md @@ -0,0 +1,25 @@ + +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 new file mode 100644 index 0000000..d60a25d --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,18 @@ + +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/.gitignore b/.gitignore index 3dc1e2f..c89ecb7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ *.pyc -build_artefacts +build_artifacts diff --git a/.travis.yml b/.travis.yml index 3df57e3..4f825a1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,8 +8,8 @@ osx_image: xcode6.4 env: matrix: - - - CONDA_PERL=5.22.2.1 + - CONFIG=osx_ + global: # The BINSTAR_TOKEN secure variable. This is defined canonically in conda-forge.yml. - secure: "WA9LPhELq7PXUxx0y3hhBVfHwP1ZDPPO4PuPs/uFKm/2VxX0+KOgFdM4MkeSgzE7oQUlrMaENmbHPH3UGSaf4qQNCmwrVcibco8gjcFaWwBiR8Bi58c8j3bwPQ+5v0FYSfnRO02aFDOgy8JZlGTqU2aMYlNec/XDkSdK1j9/4anz/g9f7YH3Fu1lqNayvmaM88N8sKWAP46n0ma5lI/8J+1BeNmFMUALcJHRV5rcw+HoZJ5esBM7culBnbqADMrUFxaYlgoARt6rB97ueqFgOEf5OYjIy7BoDJlLM1ULR974x2EkldJnzF3/rMd04lbsG81UyJncg8tIQsDOOBaQrYQHEyuRqDy1xs7rr88E8/knOu8YqXTXEHlxy6k9/kpptRYYtda7MuKGSwRMJJ4iEM7SUJt6mqYrmIgtfZB2KY3pu1kjl2RGAkbLOrJ+znu1wmqgLeOtlaQDxIqpLt8OcES55Wj9ehGpc7HKBTA3opdGM8Beztbov4Fp4mT5wonQ3WUfChy9WQQwInmwzvmyLHKWrtEk+SJww6svRlegpzjVAOLkgPkmM23o6SYgChPVuUPuTvZ0aIwNr64L7MKZi8+B6+gtR3Dw1cFfIbdFN4yoAe5OO91m/9MwOthSpZMyCDx7kgQebzKUXKBgE3Y+qUAhlzzJ6COKtklviyKXuBo=" @@ -18,7 +18,7 @@ env: before_install: # Fast finish the PR. - | - (curl https://raw.githubusercontent.com/conda-forge/conda-forge-build-setup-feedstock/master/recipe/ff_ci_pr_build.py | \ + (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. @@ -50,10 +50,10 @@ install: conda config --add channels defaults conda config --add channels conda-forge conda config --set show_channel_urls true - conda install --yes --quiet conda-forge-build-setup + conda install --yes --quiet conda-forge-ci-setup=1 source run_conda_forge_build_setup script: - - conda build ./recipe + - conda build ./recipe -m ./.ci_support/${CONFIG}.yaml - - upload_or_check_non_existence ./recipe conda-forge --channel=main + - upload_or_check_non_existence ./recipe conda-forge --channel=main -m ./.ci_support/${CONFIG}.yaml diff --git a/LICENSE b/LICENSE.txt similarity index 97% rename from LICENSE rename to LICENSE.txt index 7f5c363..72dc8fd 100644 --- a/LICENSE +++ b/LICENSE.txt @@ -1,5 +1,5 @@ BSD 3-clause license -Copyright (c) 2015-2017, conda-forge +Copyright (c) 2015-2018, conda-forge 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 f698643..dba3781 100644 --- a/README.md +++ b/README.md @@ -14,14 +14,16 @@ Summary: An optimized BLAS library based on GotoBLAS2 1.13 BSD version. Current build status ==================== -Linux: [![Circle CI](https://circleci.com/gh/conda-forge/openblas-feedstock.svg?style=shield)](https://circleci.com/gh/conda-forge/openblas-feedstock) -OSX: [![TravisCI](https://travis-ci.org/conda-forge/openblas-feedstock.svg?branch=master)](https://travis-ci.org/conda-forge/openblas-feedstock) -Windows: [![AppVeyor](https://ci.appveyor.com/api/projects/status/github/conda-forge/openblas-feedstock?svg=True)](https://ci.appveyor.com/project/conda-forge/openblas-feedstock/branch/master) +[![Linux](https://img.shields.io/circleci/project/github/conda-forge/openblas-feedstock/master.svg?label=Linux)](https://circleci.com/gh/conda-forge/openblas-feedstock) +[![OSX](https://img.shields.io/travis/conda-forge/openblas-feedstock/master.svg?label=macOS)](https://travis-ci.org/conda-forge/openblas-feedstock) +[![Windows](https://img.shields.io/appveyor/ci/conda-forge/openblas-feedstock/master.svg?label=Windows)](https://ci.appveyor.com/project/conda-forge/openblas-feedstock/branch/master) Current release info ==================== -Version: [![Anaconda-Server Badge](https://anaconda.org/conda-forge/openblas/badges/version.svg)](https://anaconda.org/conda-forge/openblas) -Downloads: [![Anaconda-Server Badge](https://anaconda.org/conda-forge/openblas/badges/downloads.svg)](https://anaconda.org/conda-forge/openblas) + +| Name | Downloads | Version | Platforms | +| --- | --- | --- | --- | +| [![Conda Recipe](https://img.shields.io/badge/recipe-openblas-green.svg)](https://anaconda.org/conda-forge/openblas) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/openblas.svg)](https://anaconda.org/conda-forge/openblas) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/openblas.svg)](https://anaconda.org/conda-forge/openblas) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/openblas.svg)](https://anaconda.org/conda-forge/openblas) | Installing openblas =================== diff --git a/ci_support/run_docker_build.sh b/ci_support/run_docker_build.sh deleted file mode 100755 index a534369..0000000 --- a/ci_support/run_docker_build.sh +++ /dev/null @@ -1,71 +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. - -FEEDSTOCK_ROOT=$(cd "$(dirname "$0")/.."; pwd;) -RECIPE_ROOT=$FEEDSTOCK_ROOT/recipe - -docker info - -config=$(cat < /dev/null && docker-machine active > /dev/null; then - HOST_USER_ID=$(docker-machine ssh $(docker-machine active) id -u) -fi - -rm -f "$FEEDSTOCK_ROOT/build_artefacts/conda-forge-build-done" - -cat << EOF | docker run -i \ - -v "${RECIPE_ROOT}":/recipe_root \ - -v "${FEEDSTOCK_ROOT}":/feedstock_root \ - -e HOST_USER_ID="${HOST_USER_ID}" \ - -e CONDA_PERL="${CONDA_PERL}" \ - -a stdin -a stdout -a stderr \ - condaforge/linux-anvil \ - bash || exit 1 - -set -e -set +x -export BINSTAR_TOKEN=${BINSTAR_TOKEN} -set -x -export PYTHONUNBUFFERED=1 - -echo "$config" > ~/.condarc -# A lock sometimes occurs with incomplete builds. The lock file is stored in build_artefacts. -conda clean --lock - -conda install --yes --quiet conda-forge-build-setup -source run_conda_forge_build_setup - -conda build /recipe_root --quiet || exit 1 -upload_or_check_non_existence /recipe_root conda-forge --channel=main || exit 1 - -touch /feedstock_root/build_artefacts/conda-forge-build-done -EOF - -# double-check that the build got to the end -# see https://github.com/conda-forge/conda-smithy/pull/337 -# for a possible fix -set -x -test -f "$FEEDSTOCK_ROOT/build_artefacts/conda-forge-build-done" || exit 1