From 351eb019b36876b99423c403b06795da7d18bad9 Mon Sep 17 00:00:00 2001 From: "Richard J. Knight" Date: Tue, 29 Oct 2019 17:08:42 +0000 Subject: [PATCH 01/12] Add wasabi feedstock repo --- .travis.yml | 2 +- conda-recipes/wasabi-feedstock/LICENSE.txt | 13 ++ conda-recipes/wasabi-feedstock/README.md | 121 ++++++++++++++++++ .../ci_support/build_steps.sh | 46 +++++++ .../ci_support/run_docker_build.sh | 59 +++++++++ .../recipe/conda_build_config.yaml | 3 + .../wasabi-feedstock/recipe/meta.yaml | 47 +++++++ 7 files changed, 290 insertions(+), 1 deletion(-) create mode 100644 conda-recipes/wasabi-feedstock/LICENSE.txt create mode 100644 conda-recipes/wasabi-feedstock/README.md create mode 100644 conda-recipes/wasabi-feedstock/ci_support/build_steps.sh create mode 100755 conda-recipes/wasabi-feedstock/ci_support/run_docker_build.sh create mode 100644 conda-recipes/wasabi-feedstock/recipe/conda_build_config.yaml create mode 100644 conda-recipes/wasabi-feedstock/recipe/meta.yaml diff --git a/.travis.yml b/.travis.yml index 00dd9d2..6a2d462 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,5 +29,5 @@ matrix: language: generic script: - - cd conda-recipes/multicoretsne-feedstock + - cd conda-recipes/wasabi-feedstock - ./ci_support/run_docker_build.sh diff --git a/conda-recipes/wasabi-feedstock/LICENSE.txt b/conda-recipes/wasabi-feedstock/LICENSE.txt new file mode 100644 index 0000000..cba42cf --- /dev/null +++ b/conda-recipes/wasabi-feedstock/LICENSE.txt @@ -0,0 +1,13 @@ +BSD 3-clause license +Copyright (c) 2015-2019, 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: + +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. + +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. diff --git a/conda-recipes/wasabi-feedstock/README.md b/conda-recipes/wasabi-feedstock/README.md new file mode 100644 index 0000000..7b1e984 --- /dev/null +++ b/conda-recipes/wasabi-feedstock/README.md @@ -0,0 +1,121 @@ +About wasabi +============ + +Home: http://github.com/ines/wasabi + +Package license: MIT + +Feedstock license: BSD 3-Clause + +Summary: A lightweight console printing and formatting toolkit + + + +Current build status +==================== + + + + + +
All platforms: + + + +
+ +Current release info +==================== + +| Name | Downloads | Version | Platforms | +| --- | --- | --- | --- | +| [![Conda Recipe](https://img.shields.io/badge/recipe-wasabi-green.svg)](https://anaconda.org/conda-forge/wasabi) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/wasabi.svg)](https://anaconda.org/conda-forge/wasabi) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/wasabi.svg)](https://anaconda.org/conda-forge/wasabi) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/wasabi.svg)](https://anaconda.org/conda-forge/wasabi) | + +Installing wasabi +================= + +Installing `wasabi` from the `conda-forge` channel can be achieved by adding `conda-forge` to your channels with: + +``` +conda config --add channels conda-forge +``` + +Once the `conda-forge` channel has been enabled, `wasabi` can be installed with: + +``` +conda install wasabi +``` + +It is possible to list all of the versions of `wasabi` available on your platform with: + +``` +conda search wasabi --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 +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.org/) it is possible to build and upload installable +packages to the [conda-forge](https://anaconda.org/conda-forge) +[Anaconda-Cloud](https://anaconda.org/) channel for Linux, Windows and OSX respectively. + +To manage the continuous integration and simplify feedstock maintenance +[conda-smithy](https://github.com/conda-forge/conda-smithy) has been developed. +Using the ``conda-forge.yml`` within this repository, it is possible to re-render all of +this feedstock's supporting files (e.g. the CI configuration files) with ``conda smithy rerender``. + +For more information please check the [conda-forge documentation](https://conda-forge.org/docs/). + +Terminology +=========== + +**feedstock** - the conda recipe (raw material), supporting scripts and CI configuration. + +**conda-smithy** - the tool which helps orchestrate the feedstock. + Its primary use is in the construction of the CI ``.yml`` files + and simplify the management of *many* feedstocks. + +**conda-forge** - the place where the feedstock and smithy live and work to + produce the finished article (built conda distributions) + + +Updating wasabi-feedstock +========================= + +If you would like to improve the wasabi recipe or build a new +package version, please fork this repository and submit a PR. Upon submission, +your changes will be run on the appropriate platforms to give the reviewer an +opportunity to confirm that the changes result in a successful build. Once +merged, the recipe will be re-built and uploaded automatically to the +`conda-forge` channel, whereupon the built conda packages will be available for +everybody to install and use from the `conda-forge` channel. +Note that all branches in the conda-forge/wasabi-feedstock are +immediately built and any created packages are uploaded, so PRs should be based +on branches in forks and branches in the main repository should only be used to +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). + * 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) + back to 0. + +Feedstock Maintainers +===================== + +* [@honnibal](https://github.com/honnibal/) +* [@ines](https://github.com/ines/) + diff --git a/conda-recipes/wasabi-feedstock/ci_support/build_steps.sh b/conda-recipes/wasabi-feedstock/ci_support/build_steps.sh new file mode 100644 index 0000000..35bd567 --- /dev/null +++ b/conda-recipes/wasabi-feedstock/ci_support/build_steps.sh @@ -0,0 +1,46 @@ +# (C) Copyright IBM Corp. 2018, 2019. All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +#!/usr/bin/env bash + +set -xeuo pipefail +export PYTHONUNBUFFERED=1 +export FEEDSTOCK_ROOT=/home/conda/feedstock_root +export RECIPE_ROOT=/home/conda/recipe_root +export CI_SUPPORT=/home/conda/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 + +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 + HOST_USER_ID=$(docker-machine ssh $(docker-machine active) id -u) +fi + +ARTIFACTS="$FEEDSTOCK_ROOT/build_artifacts" +mkdir -p "$ARTIFACTS" +DONE_CANARY="$ARTIFACTS/conda-forge-build-done-${CONFIG}" +rm -f "$DONE_CANARY" +# Enable running in interactive mode attached to a tty +DOCKER_RUN_ARGS=" -it " + +docker run ${DOCKER_RUN_ARGS} \ + -v "${RECIPE_ROOT}":/home/conda/recipe_root:ro,z \ + -v "${FEEDSTOCK_ROOT}":/home/conda/feedstock_root:rw,z \ + -e CONFIG \ + -e BINSTAR_TOKEN \ + -e HOST_USER_ID \ + -e UPLOAD_PACKAGES \ + -e CI \ + -a stdin -a stdout -a stderr \ + $DOCKER_IMAGE \ + bash \ + /home/conda/feedstock_root/${PROVIDER_DIR}/build_steps.sh + +# double-check that the build got to the end +# see https://github.com/conda-forge/conda-smithy/pull/337 +# for a possible fix + +test -f "$DONE_CANARY" diff --git a/conda-recipes/wasabi-feedstock/recipe/conda_build_config.yaml b/conda-recipes/wasabi-feedstock/recipe/conda_build_config.yaml new file mode 100644 index 0000000..d06cf07 --- /dev/null +++ b/conda-recipes/wasabi-feedstock/recipe/conda_build_config.yaml @@ -0,0 +1,3 @@ +python: + - 3.6 + - 3.7 diff --git a/conda-recipes/wasabi-feedstock/recipe/meta.yaml b/conda-recipes/wasabi-feedstock/recipe/meta.yaml new file mode 100644 index 0000000..a36c6e6 --- /dev/null +++ b/conda-recipes/wasabi-feedstock/recipe/meta.yaml @@ -0,0 +1,47 @@ +# adapted from the conda-foge wasabi recipe +{% set name = "wasabi" %} +{% set version = "0.3.0" %} +{% set sha256sum = "051fd33b47cf5f21626a3b750001b267c464c84a33f8e8fbcb49e48c8fe82838" %} + +package: + name: {{ name|lower }} + version: {{ version }} + +source: + url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ version }}.tar.gz + sha256: {{ sha256sum }} +build: + linxu-ppc64le: python + number: 0 + script: "{{ PYTHON }} -m pip install . --no-deps -vv" + +requirements: + host: + - python + - pip + run: + - python + +test: + requires: + - pytest <4 + imports: + - {{ name }} + commands: + - python -m pytest --tb=native --pyargs {{ name }} + + +about: + home: http://github.com/ines/wasabi + license: MIT + license_family: MIT + license_file: LICENSE + summary: 'A lightweight console printing and formatting toolkit' + + dev_url: https://github.com/ines/wasabi + doc_url: https://github.com/ines/wasabi#-api + +extra: + recipe-maintainers: + - ines + - honnibal From bcbcbd36acdd55c3c3f0ba323254caa833269e3a Mon Sep 17 00:00:00 2001 From: "Richard J. Knight" Date: Tue, 29 Oct 2019 12:34:46 -0500 Subject: [PATCH 02/12] Fix add .ci_support dir --- .../.ci_support/linux_ppc64le_python3.6.yaml | 16 ++++++++++++++++ .../.ci_support/linux_ppc64le_python3.7.yaml | 16 ++++++++++++++++ .../.ci_support/linux_python3.6.yaml | 16 ++++++++++++++++ .../.ci_support/linux_python3.7.yaml | 16 ++++++++++++++++ conda-recipes/wasabi-feedstock/recipe/meta.yaml | 2 +- 5 files changed, 65 insertions(+), 1 deletion(-) create mode 100644 conda-recipes/wasabi-feedstock/.ci_support/linux_ppc64le_python3.6.yaml create mode 100644 conda-recipes/wasabi-feedstock/.ci_support/linux_ppc64le_python3.7.yaml create mode 100644 conda-recipes/wasabi-feedstock/.ci_support/linux_python3.6.yaml create mode 100644 conda-recipes/wasabi-feedstock/.ci_support/linux_python3.7.yaml diff --git a/conda-recipes/wasabi-feedstock/.ci_support/linux_ppc64le_python3.6.yaml b/conda-recipes/wasabi-feedstock/.ci_support/linux_ppc64le_python3.6.yaml new file mode 100644 index 0000000..f658983 --- /dev/null +++ b/conda-recipes/wasabi-feedstock/.ci_support/linux_ppc64le_python3.6.yaml @@ -0,0 +1,16 @@ +c_compiler: +- gcc +c_compiler_version: +- '8' +channel_sources: +- defaults,powerai +channel_targets: +- powerai main +docker_image: +- condaforge/linux-anvil-ppc64le +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- '3.6' diff --git a/conda-recipes/wasabi-feedstock/.ci_support/linux_ppc64le_python3.7.yaml b/conda-recipes/wasabi-feedstock/.ci_support/linux_ppc64le_python3.7.yaml new file mode 100644 index 0000000..f5318c3 --- /dev/null +++ b/conda-recipes/wasabi-feedstock/.ci_support/linux_ppc64le_python3.7.yaml @@ -0,0 +1,16 @@ +c_compiler: +- gcc +c_compiler_version: +- '8' +channel_sources: +- defaults,powerai +channel_targets: +- powerai main +docker_image: +- condaforge/linux-anvil-ppc64le +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- '3.7' diff --git a/conda-recipes/wasabi-feedstock/.ci_support/linux_python3.6.yaml b/conda-recipes/wasabi-feedstock/.ci_support/linux_python3.6.yaml new file mode 100644 index 0000000..f90d0c6 --- /dev/null +++ b/conda-recipes/wasabi-feedstock/.ci_support/linux_python3.6.yaml @@ -0,0 +1,16 @@ +c_compiler: +- gcc +c_compiler_version: +- '8' +channel_sources: +- defaults,powerai +channel_targets: +- powerai main +docker_image: +- condaforge/linux-anvil-comp7 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- '3.6' diff --git a/conda-recipes/wasabi-feedstock/.ci_support/linux_python3.7.yaml b/conda-recipes/wasabi-feedstock/.ci_support/linux_python3.7.yaml new file mode 100644 index 0000000..fbae340 --- /dev/null +++ b/conda-recipes/wasabi-feedstock/.ci_support/linux_python3.7.yaml @@ -0,0 +1,16 @@ +c_compiler: +- gcc +c_compiler_version: +- '8' +channel_sources: +- defaults,powerai +channel_targets: +- powerai main +docker_image: +- condaforge/linux-anvil-comp7 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- '3.7' diff --git a/conda-recipes/wasabi-feedstock/recipe/meta.yaml b/conda-recipes/wasabi-feedstock/recipe/meta.yaml index a36c6e6..802f348 100644 --- a/conda-recipes/wasabi-feedstock/recipe/meta.yaml +++ b/conda-recipes/wasabi-feedstock/recipe/meta.yaml @@ -1,4 +1,4 @@ -# adapted from the conda-foge wasabi recipe +# adapted from the conda-forge wasabi recipe {% set name = "wasabi" %} {% set version = "0.3.0" %} {% set sha256sum = "051fd33b47cf5f21626a3b750001b267c464c84a33f8e8fbcb49e48c8fe82838" %} From d5701ed4c508f3fa15911e1a4053b6af1723b4c2 Mon Sep 17 00:00:00 2001 From: "Richard J. Knight" Date: Tue, 29 Oct 2019 12:49:58 -0500 Subject: [PATCH 03/12] Fix build script --- conda-recipes/wasabi-feedstock/ci_support/run_docker_build.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conda-recipes/wasabi-feedstock/ci_support/run_docker_build.sh b/conda-recipes/wasabi-feedstock/ci_support/run_docker_build.sh index 28dad84..2bea02c 100755 --- a/conda-recipes/wasabi-feedstock/ci_support/run_docker_build.sh +++ b/conda-recipes/wasabi-feedstock/ci_support/run_docker_build.sh @@ -20,6 +20,8 @@ PROVIDER_DIR="$(basename $THISDIR)" FEEDSTOCK_ROOT=$(cd "$(dirname "$0")/.."; pwd;) RECIPE_ROOT=$FEEDSTOCK_ROOT/recipe +DOCKER_IMAGE="condaforge/linux-anvil-ppc64le" + docker info # In order for the conda-build process in the container to write to the mounted From ec65a60688c6d72fdb32e6c965290c432e56ff91 Mon Sep 17 00:00:00 2001 From: "Richard J. Knight" Date: Tue, 29 Oct 2019 12:57:55 -0500 Subject: [PATCH 04/12] Fix run_docker_build.sh --- conda-recipes/wasabi-feedstock/ci_support/run_docker_build.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/conda-recipes/wasabi-feedstock/ci_support/run_docker_build.sh b/conda-recipes/wasabi-feedstock/ci_support/run_docker_build.sh index 2bea02c..28dad84 100755 --- a/conda-recipes/wasabi-feedstock/ci_support/run_docker_build.sh +++ b/conda-recipes/wasabi-feedstock/ci_support/run_docker_build.sh @@ -20,8 +20,6 @@ PROVIDER_DIR="$(basename $THISDIR)" FEEDSTOCK_ROOT=$(cd "$(dirname "$0")/.."; pwd;) RECIPE_ROOT=$FEEDSTOCK_ROOT/recipe -DOCKER_IMAGE="condaforge/linux-anvil-ppc64le" - docker info # In order for the conda-build process in the container to write to the mounted From 49a0c50aa5d5cd49ed0137f736e2c7891fca954d Mon Sep 17 00:00:00 2001 From: "Richard J. Knight" Date: Tue, 29 Oct 2019 13:02:59 -0500 Subject: [PATCH 05/12] Fix CONFIG=linux_ppc64le --- .travis.yml | 2 +- conda-recipes/wasabi-feedstock/ci_support/run_docker_build.sh | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6a2d462..256845e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,7 +24,7 @@ env: matrix: include: - - env: CONFIG=linux_noarch UPLOAD_PACKAGES=True + - env: CONFIG=linux_ppc64le UPLOAD_PACKAGES=True os: linux-ppc64le language: generic diff --git a/conda-recipes/wasabi-feedstock/ci_support/run_docker_build.sh b/conda-recipes/wasabi-feedstock/ci_support/run_docker_build.sh index 28dad84..02074c0 100755 --- a/conda-recipes/wasabi-feedstock/ci_support/run_docker_build.sh +++ b/conda-recipes/wasabi-feedstock/ci_support/run_docker_build.sh @@ -22,6 +22,8 @@ RECIPE_ROOT=$FEEDSTOCK_ROOT/recipe docker info +DOCKER_IMAGE="condaforge/linux-anvil-ppc64le" + # 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 From e3a1750a71d23511c21af0c61c218fd9fb3f6c3e Mon Sep 17 00:00:00 2001 From: "Richard J. Knight" Date: Tue, 29 Oct 2019 13:14:17 -0500 Subject: [PATCH 06/12] Fix .travis.yaml --- .travis.yml | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 256845e..7d7491d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,12 +22,26 @@ env: # The BINSTAR Token for uploading to anaconda.org/powerai - secure: "JZRf0nvjA0bNtlHCo2FiF9Xls11cYLoEK4JComWELDq0Qi1wOtlORR9t9RgyOCeldUt0n8ZiDtGVh42jCyI9xqo+lMpzZsp4GWu3apMSiDfFRNhDrakYxU1FMefathMHBCTk8rmq+P1LX7i/V+wPbNyzoSoNzcci3FmEc6eRUEGM/sBgHqH/xyvRFGZnSXbOMTigzgVSruZOVtL6opxHfo1RnxlU/dR5lytKIKm00r+GPK1w9tuwOPTdGpZUaWA6/aoxMQkUNnKqrZq382xBJ6TFgzmkkY80wJFnvchg0NuPqI7oNoA8z30W0vgYbZ7nno3SExjoCYbwCLWPlwIwsCEipEUG1lFPvVwAMELkCWu22JX95e34ZKxd5SR143/509CFMKHK5UrvLqg4tI7EgjrRpLcEI8utvNdjTCp/KUOcXbLq+cw1TMnzDwFuIdgPfsKGrTNreuaiHxCdt2NKuy8oD497WcMOUpq4rWoWXjDXeUfwxOt6GEH1F07Em5Ng0mSiwyCHxiL5XERpYj4lAnSnMBIaIXaHOWlGpron0jAtcpTu3lIY2rF7zdpUFSGNVnaiwwHUD7RDxy96zc/ig0X7DVIofeNTTML/rYsHEbB+hO92sBll+lxEq1xjeAO8Khsp0ohJLOyM3iglBgHxXrSfLhcYk6pmKrOqi1onJK0=" + matrix: include: - - env: CONFIG=linux_ppc64le UPLOAD_PACKAGES=True + - env: CONFIG=linux_ppc64le_python3.6 UPLOAD_PACKAGES=True DOCKER_IMAGE=condaforge/linux-anvil-ppc64le os: linux-ppc64le language: generic + - env: CONFIG=linux_ppc64le_python3.7 UPLOAD_PACKAGES=True DOCKER_IMAGE=condaforge/linux-anvil-ppc64le + os: linux-ppc64le + language: generic + + - env: CONFIG=linux_python3.6 UPLOAD_PACKAGES=True DOCKER_IMAGE=condaforge/linux-anvil-comp7 + os: linux-64 + language: generic + + - env: CONFIG=linux_python3.7 UPLOAD_PACKAGES=True DOCKER_IMAGE=condaforge/linux-anvil-comp7 + os: linux-64 + language: generic + + script: - cd conda-recipes/wasabi-feedstock - ./ci_support/run_docker_build.sh From ab5776880b478ae2eb91e19ebf782aeb84b15967 Mon Sep 17 00:00:00 2001 From: "Richard J. Knight" Date: Tue, 29 Oct 2019 13:15:43 -0500 Subject: [PATCH 07/12] Remove conda_config_build.yml --- conda-recipes/wasabi-feedstock/recipe/conda_build_config.yaml | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 conda-recipes/wasabi-feedstock/recipe/conda_build_config.yaml diff --git a/conda-recipes/wasabi-feedstock/recipe/conda_build_config.yaml b/conda-recipes/wasabi-feedstock/recipe/conda_build_config.yaml deleted file mode 100644 index d06cf07..0000000 --- a/conda-recipes/wasabi-feedstock/recipe/conda_build_config.yaml +++ /dev/null @@ -1,3 +0,0 @@ -python: - - 3.6 - - 3.7 From f263ea977287ecaf59bddab889beef6d0b3aa1f5 Mon Sep 17 00:00:00 2001 From: "Richard J. Knight" Date: Tue, 29 Oct 2019 13:23:01 -0500 Subject: [PATCH 08/12] Try fixing the docker run script again --- .../wasabi-feedstock/ci_support/run_docker_build.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/conda-recipes/wasabi-feedstock/ci_support/run_docker_build.sh b/conda-recipes/wasabi-feedstock/ci_support/run_docker_build.sh index 02074c0..c94ed94 100755 --- a/conda-recipes/wasabi-feedstock/ci_support/run_docker_build.sh +++ b/conda-recipes/wasabi-feedstock/ci_support/run_docker_build.sh @@ -22,8 +22,6 @@ RECIPE_ROOT=$FEEDSTOCK_ROOT/recipe docker info -DOCKER_IMAGE="condaforge/linux-anvil-ppc64le" - # 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 @@ -41,6 +39,11 @@ rm -f "$DONE_CANARY" # Enable running in interactive mode attached to a tty DOCKER_RUN_ARGS=" -it " +if [ -z "${DOCKER_IMAGE}" ]; then + echo "WARNING: DOCKER_IMAGE variable not set. Falling back to condaforge/linux-anvil-ppc64le" + DOCKER_IMAGE="condaforge/linux-anvil-ppc64le" +fi + docker run ${DOCKER_RUN_ARGS} \ -v "${RECIPE_ROOT}":/home/conda/recipe_root:ro,z \ -v "${FEEDSTOCK_ROOT}":/home/conda/feedstock_root:rw,z \ From f0f84c612725306d3e1ebe78dc83ad7017a0ee2e Mon Sep 17 00:00:00 2001 From: "Richard J. Knight" Date: Tue, 29 Oct 2019 13:41:20 -0500 Subject: [PATCH 09/12] Fix the README file --- conda-recipes/wasabi-feedstock/README.md | 110 ----------------------- 1 file changed, 110 deletions(-) diff --git a/conda-recipes/wasabi-feedstock/README.md b/conda-recipes/wasabi-feedstock/README.md index 7b1e984..eccce2d 100644 --- a/conda-recipes/wasabi-feedstock/README.md +++ b/conda-recipes/wasabi-feedstock/README.md @@ -9,113 +9,3 @@ Feedstock license: BSD 3-Clause Summary: A lightweight console printing and formatting toolkit - - -Current build status -==================== - - - - - -
All platforms: - - - -
- -Current release info -==================== - -| Name | Downloads | Version | Platforms | -| --- | --- | --- | --- | -| [![Conda Recipe](https://img.shields.io/badge/recipe-wasabi-green.svg)](https://anaconda.org/conda-forge/wasabi) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/wasabi.svg)](https://anaconda.org/conda-forge/wasabi) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/wasabi.svg)](https://anaconda.org/conda-forge/wasabi) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/wasabi.svg)](https://anaconda.org/conda-forge/wasabi) | - -Installing wasabi -================= - -Installing `wasabi` from the `conda-forge` channel can be achieved by adding `conda-forge` to your channels with: - -``` -conda config --add channels conda-forge -``` - -Once the `conda-forge` channel has been enabled, `wasabi` can be installed with: - -``` -conda install wasabi -``` - -It is possible to list all of the versions of `wasabi` available on your platform with: - -``` -conda search wasabi --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 -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.org/) it is possible to build and upload installable -packages to the [conda-forge](https://anaconda.org/conda-forge) -[Anaconda-Cloud](https://anaconda.org/) channel for Linux, Windows and OSX respectively. - -To manage the continuous integration and simplify feedstock maintenance -[conda-smithy](https://github.com/conda-forge/conda-smithy) has been developed. -Using the ``conda-forge.yml`` within this repository, it is possible to re-render all of -this feedstock's supporting files (e.g. the CI configuration files) with ``conda smithy rerender``. - -For more information please check the [conda-forge documentation](https://conda-forge.org/docs/). - -Terminology -=========== - -**feedstock** - the conda recipe (raw material), supporting scripts and CI configuration. - -**conda-smithy** - the tool which helps orchestrate the feedstock. - Its primary use is in the construction of the CI ``.yml`` files - and simplify the management of *many* feedstocks. - -**conda-forge** - the place where the feedstock and smithy live and work to - produce the finished article (built conda distributions) - - -Updating wasabi-feedstock -========================= - -If you would like to improve the wasabi recipe or build a new -package version, please fork this repository and submit a PR. Upon submission, -your changes will be run on the appropriate platforms to give the reviewer an -opportunity to confirm that the changes result in a successful build. Once -merged, the recipe will be re-built and uploaded automatically to the -`conda-forge` channel, whereupon the built conda packages will be available for -everybody to install and use from the `conda-forge` channel. -Note that all branches in the conda-forge/wasabi-feedstock are -immediately built and any created packages are uploaded, so PRs should be based -on branches in forks and branches in the main repository should only be used to -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). - * 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) - back to 0. - -Feedstock Maintainers -===================== - -* [@honnibal](https://github.com/honnibal/) -* [@ines](https://github.com/ines/) - From e8721f7ad9aaa5c9b58ac94b57d25efd5d104db7 Mon Sep 17 00:00:00 2001 From: "Richard J. Knight" Date: Tue, 29 Oct 2019 14:31:08 -0500 Subject: [PATCH 10/12] Make wasabi a noarch package --- .travis.yml | 15 +-------------- ..._ppc64le_python3.6.yaml => linux_noarch.yaml} | 8 +------- .../.ci_support/linux_ppc64le_python3.7.yaml | 16 ---------------- .../.ci_support/linux_python3.6.yaml | 16 ---------------- .../.ci_support/linux_python3.7.yaml | 16 ---------------- 5 files changed, 2 insertions(+), 69 deletions(-) rename conda-recipes/wasabi-feedstock/.ci_support/{linux_ppc64le_python3.6.yaml => linux_noarch.yaml} (59%) delete mode 100644 conda-recipes/wasabi-feedstock/.ci_support/linux_ppc64le_python3.7.yaml delete mode 100644 conda-recipes/wasabi-feedstock/.ci_support/linux_python3.6.yaml delete mode 100644 conda-recipes/wasabi-feedstock/.ci_support/linux_python3.7.yaml diff --git a/.travis.yml b/.travis.yml index 7d7491d..bba841f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,23 +25,10 @@ env: matrix: include: - - env: CONFIG=linux_ppc64le_python3.6 UPLOAD_PACKAGES=True DOCKER_IMAGE=condaforge/linux-anvil-ppc64le + - env: CONFIG=linux_noarch UPLOAD_PACKAGES=True DOCKER_IMAGE=condaforge/linux-anvil-ppc64le os: linux-ppc64le language: generic - - env: CONFIG=linux_ppc64le_python3.7 UPLOAD_PACKAGES=True DOCKER_IMAGE=condaforge/linux-anvil-ppc64le - os: linux-ppc64le - language: generic - - - env: CONFIG=linux_python3.6 UPLOAD_PACKAGES=True DOCKER_IMAGE=condaforge/linux-anvil-comp7 - os: linux-64 - language: generic - - - env: CONFIG=linux_python3.7 UPLOAD_PACKAGES=True DOCKER_IMAGE=condaforge/linux-anvil-comp7 - os: linux-64 - language: generic - - script: - cd conda-recipes/wasabi-feedstock - ./ci_support/run_docker_build.sh diff --git a/conda-recipes/wasabi-feedstock/.ci_support/linux_ppc64le_python3.6.yaml b/conda-recipes/wasabi-feedstock/.ci_support/linux_noarch.yaml similarity index 59% rename from conda-recipes/wasabi-feedstock/.ci_support/linux_ppc64le_python3.6.yaml rename to conda-recipes/wasabi-feedstock/.ci_support/linux_noarch.yaml index f658983..4dbfce8 100644 --- a/conda-recipes/wasabi-feedstock/.ci_support/linux_ppc64le_python3.6.yaml +++ b/conda-recipes/wasabi-feedstock/.ci_support/linux_noarch.yaml @@ -3,14 +3,8 @@ c_compiler: c_compiler_version: - '8' channel_sources: -- defaults,powerai +- conda-forge, defaults channel_targets: - powerai main docker_image: - condaforge/linux-anvil-ppc64le -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- '3.6' diff --git a/conda-recipes/wasabi-feedstock/.ci_support/linux_ppc64le_python3.7.yaml b/conda-recipes/wasabi-feedstock/.ci_support/linux_ppc64le_python3.7.yaml deleted file mode 100644 index f5318c3..0000000 --- a/conda-recipes/wasabi-feedstock/.ci_support/linux_ppc64le_python3.7.yaml +++ /dev/null @@ -1,16 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '8' -channel_sources: -- defaults,powerai -channel_targets: -- powerai main -docker_image: -- condaforge/linux-anvil-ppc64le -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- '3.7' diff --git a/conda-recipes/wasabi-feedstock/.ci_support/linux_python3.6.yaml b/conda-recipes/wasabi-feedstock/.ci_support/linux_python3.6.yaml deleted file mode 100644 index f90d0c6..0000000 --- a/conda-recipes/wasabi-feedstock/.ci_support/linux_python3.6.yaml +++ /dev/null @@ -1,16 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '8' -channel_sources: -- defaults,powerai -channel_targets: -- powerai main -docker_image: -- condaforge/linux-anvil-comp7 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- '3.6' diff --git a/conda-recipes/wasabi-feedstock/.ci_support/linux_python3.7.yaml b/conda-recipes/wasabi-feedstock/.ci_support/linux_python3.7.yaml deleted file mode 100644 index fbae340..0000000 --- a/conda-recipes/wasabi-feedstock/.ci_support/linux_python3.7.yaml +++ /dev/null @@ -1,16 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '8' -channel_sources: -- defaults,powerai -channel_targets: -- powerai main -docker_image: -- condaforge/linux-anvil-comp7 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- '3.7' From f8d85889113f8f7202678516bf03299134aff941 Mon Sep 17 00:00:00 2001 From: "Richard J. Knight" Date: Tue, 29 Oct 2019 18:25:03 -0500 Subject: [PATCH 11/12] Minor fixups to meta.yaml and linux_noarch.yaml --- conda-recipes/wasabi-feedstock/.ci_support/linux_noarch.yaml | 2 +- conda-recipes/wasabi-feedstock/recipe/meta.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conda-recipes/wasabi-feedstock/.ci_support/linux_noarch.yaml b/conda-recipes/wasabi-feedstock/.ci_support/linux_noarch.yaml index 4dbfce8..110a1f7 100644 --- a/conda-recipes/wasabi-feedstock/.ci_support/linux_noarch.yaml +++ b/conda-recipes/wasabi-feedstock/.ci_support/linux_noarch.yaml @@ -3,7 +3,7 @@ c_compiler: c_compiler_version: - '8' channel_sources: -- conda-forge, defaults +- conda-forge,defaults channel_targets: - powerai main docker_image: diff --git a/conda-recipes/wasabi-feedstock/recipe/meta.yaml b/conda-recipes/wasabi-feedstock/recipe/meta.yaml index 802f348..f0fac95 100644 --- a/conda-recipes/wasabi-feedstock/recipe/meta.yaml +++ b/conda-recipes/wasabi-feedstock/recipe/meta.yaml @@ -11,7 +11,7 @@ source: url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ version }}.tar.gz sha256: {{ sha256sum }} build: - linxu-ppc64le: python + noarch: python number: 0 script: "{{ PYTHON }} -m pip install . --no-deps -vv" From 0a54028528f062bcffd45942fa74632d3c367b49 Mon Sep 17 00:00:00 2001 From: "Richard J. Knight" Date: Tue, 29 Oct 2019 18:58:07 -0500 Subject: [PATCH 12/12] Remove conda-forge from the source list --- conda-recipes/wasabi-feedstock/.ci_support/linux_noarch.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda-recipes/wasabi-feedstock/.ci_support/linux_noarch.yaml b/conda-recipes/wasabi-feedstock/.ci_support/linux_noarch.yaml index 110a1f7..96ffcaf 100644 --- a/conda-recipes/wasabi-feedstock/.ci_support/linux_noarch.yaml +++ b/conda-recipes/wasabi-feedstock/.ci_support/linux_noarch.yaml @@ -3,7 +3,7 @@ c_compiler: c_compiler_version: - '8' channel_sources: -- conda-forge,defaults +- defaults channel_targets: - powerai main docker_image: