From 04a153d9f8e1ae9ccca55049a300381f3a639c2f Mon Sep 17 00:00:00 2001 From: ocefpaf Date: Tue, 6 Jun 2017 13:03:34 -0300 Subject: [PATCH 1/2] rerender with auto --- README.md | 2 +- appveyor.yml | 18 ++---------------- ci_support/run_docker_build.sh | 14 ++++++++++++++ 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index 87930d1..e6f9a32 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ About kealib ============ -Home: kealib.org +Home: http://kealib.org/ Package license: MIT diff --git a/appveyor.yml b/appveyor.yml index 99faacd..63d439f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -4,11 +4,6 @@ environment: - # SDK v7.0 MSVC Express 2008's SetEnv.cmd script will fail if the - # /E:ON and /V:ON options are not enabled in the batch script intepreter - # See: http://stackoverflow.com/a/13751649/163740 - CMD_IN_ENV: "cmd /E:ON /V:ON /C obvci_appveyor_python_build_env.cmd" - BINSTAR_TOKEN: # The BINSTAR_TOKEN secure variable. This is defined canonically in conda-forge.yml. secure: MP4hZYylDyUWEsrt3u3cod2sbFeRwUziH02mvQOdbjsTO/l1yIxDkP/76rSIjcGC @@ -30,14 +25,6 @@ environment: CONDA_PY: 35 CONDA_INSTALL_LOCN: C:\\Miniconda35-x64 - - TARGET_ARCH: x86 - CONDA_PY: 36 - CONDA_INSTALL_LOCN: C:\\Miniconda35 - - - TARGET_ARCH: x64 - CONDA_PY: 36 - CONDA_INSTALL_LOCN: C:\\Miniconda35-x64 - # We always use a 64-bit machine, but can build x86 distributions # with the TARGET_ARCH variable. @@ -47,7 +34,7 @@ platform: install: # If there is a newer build queued for the same PR, cancel this one. - cmd: | - curl 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-build-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 @@ -67,7 +54,6 @@ install: - cmd: conda config --add channels conda-forge # Configure the VM. - - cmd: conda install -n root --quiet --yes obvious-ci - cmd: conda install -n root --quiet --yes conda-forge-build-setup - cmd: run_conda_forge_build_setup @@ -75,6 +61,6 @@ install: build: off test_script: - - "%CMD_IN_ENV% conda build recipe --quiet" + - conda build recipe --quiet deploy_script: - cmd: upload_or_check_non_existence .\recipe conda-forge --channel=main diff --git a/ci_support/run_docker_build.sh b/ci_support/run_docker_build.sh index b34f7ac..5c1bacb 100755 --- a/ci_support/run_docker_build.sh +++ b/ci_support/run_docker_build.sh @@ -24,16 +24,30 @@ show_channel_urls: true CONDARC ) +# 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 +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 + 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}" \ -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 From 16104769847166ec2b9a3779d7f7740bc093e2b9 Mon Sep 17 00:00:00 2001 From: ocefpaf Date: Tue, 6 Jun 2017 13:03:41 -0300 Subject: [PATCH 2/2] pin hdf5 --- recipe/meta.yaml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 157b512..6b484b1 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -22,10 +22,15 @@ requirements: - toolchain - python # [win] - cmake - - hdf5 1.8.17|1.8.17.* + - hdf5 1.8.18|1.8.18.* run: - - hdf5 1.8.17|1.8.17.* + - hdf5 1.8.18|1.8.18.* + +test: + commands: + - conda inspect linkages -p $PREFIX kealib # [not win] + - conda inspect objects -p $PREFIX kealib # [osx] about: home: http://kealib.org/