Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Missing dependencies: compilers and C++ runtime #40

Closed
wants to merge 7 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ environment:
secure: ipv/06DzgA7pzz2CIAtbPxZSsphDtF+JFyoWRnXkn3O8j7oRe3rzqj3LOoq2DZp4

matrix:
- CONFIG: win_python2.7
- CONFIG: win_c_compilervs2008cxx_compilervs2008python2.7
CONDA_INSTALL_LOCN: C:\Miniconda36-x64

- CONFIG: win_python3.5
- CONFIG: win_c_compilervs2015cxx_compilervs2015python3.5
CONDA_INSTALL_LOCN: C:\Miniconda36-x64

- CONFIG: win_python3.6
- CONFIG: win_c_compilervs2015cxx_compilervs2015python3.6
CONDA_INSTALL_LOCN: C:\Miniconda36-x64


Expand Down
6 changes: 6 additions & 0 deletions .ci_support/linux_python2.7.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
c_compiler:
- toolchain_c
cxx_compiler:
- toolchain_cxx
numpy:
- '1.9'
pin_run_as_build:
python:
min_pin: x.x
Expand Down
6 changes: 6 additions & 0 deletions .ci_support/linux_python3.5.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
c_compiler:
- toolchain_c
cxx_compiler:
- toolchain_cxx
numpy:
- '1.9'
pin_run_as_build:
python:
min_pin: x.x
Expand Down
6 changes: 6 additions & 0 deletions .ci_support/linux_python3.6.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
c_compiler:
- toolchain_c
cxx_compiler:
- toolchain_cxx
numpy:
- '1.9'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should this be 1.11? (as for 3.6 we now build against 1.11)

pin_run_as_build:
python:
min_pin: x.x
Expand Down
6 changes: 6 additions & 0 deletions .ci_support/osx_python2.7.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.9'
c_compiler:
- toolchain_c
cxx_compiler:
- toolchain_cxx
macos_machine:
- x86_64-apple-darwin13.4.0
macos_min_version:
- '10.9'
numpy:
- '1.9'
pin_run_as_build:
python:
min_pin: x.x
Expand Down
6 changes: 6 additions & 0 deletions .ci_support/osx_python3.5.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.9'
c_compiler:
- toolchain_c
cxx_compiler:
- toolchain_cxx
macos_machine:
- x86_64-apple-darwin13.4.0
macos_min_version:
- '10.9'
numpy:
- '1.9'
pin_run_as_build:
python:
min_pin: x.x
Expand Down
6 changes: 6 additions & 0 deletions .ci_support/osx_python3.6.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.9'
c_compiler:
- toolchain_c
cxx_compiler:
- toolchain_cxx
macos_machine:
- x86_64-apple-darwin13.4.0
macos_min_version:
- '10.9'
numpy:
- '1.9'
pin_run_as_build:
python:
min_pin: x.x
Expand Down
16 changes: 16 additions & 0 deletions .ci_support/win_c_compilervs2008cxx_compilervs2008python2.7.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
c_compiler:
- vs2008
cxx_compiler:
- vs2008
numpy:
- '1.11'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

windows is now building against 1.11 instead of 1.9 before?

pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- '2.7'
zip_keys:
- - c_compiler
- cxx_compiler
- python
16 changes: 16 additions & 0 deletions .ci_support/win_c_compilervs2015cxx_compilervs2015python3.5.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
c_compiler:
- vs2015
cxx_compiler:
- vs2015
numpy:
- '1.11'
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- '3.5'
zip_keys:
- - c_compiler
- cxx_compiler
- python
16 changes: 16 additions & 0 deletions .ci_support/win_c_compilervs2015cxx_compilervs2015python3.6.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
c_compiler:
- vs2015
cxx_compiler:
- vs2015
numpy:
- '1.11'
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- '3.6'
zip_keys:
- - c_compiler
- cxx_compiler
- python
6 changes: 0 additions & 6 deletions .ci_support/win_python2.7.yaml

This file was deleted.

6 changes: 0 additions & 6 deletions .ci_support/win_python3.5.yaml

This file was deleted.

6 changes: 0 additions & 6 deletions .ci_support/win_python3.6.yaml

This file was deleted.

57 changes: 47 additions & 10 deletions .circleci/run_docker_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,29 +5,66 @@
# 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

config=$(cat <<CONDARC

channels:
- conda-forge
- defaults

conda-build:
root-dir: /home/conda/feedstock_root/build_artifacts

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
export HOST_USER_ID=$(id -u)
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)
HOST_USER_ID=$(docker-machine ssh $(docker-machine active) id -u)
fi

ARTIFACTS="$FEEDSTOCK_ROOT/build_artifacts"
rm -f "$FEEDSTOCK_ROOT/build_artifacts/conda-forge-build-done"

cat << EOF | docker run -i \
-v "${RECIPE_ROOT}":/home/conda/recipe_root \
-v "${FEEDSTOCK_ROOT}":/home/conda/feedstock_root \
-e CONFIG="$CONFIG" \
-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
# A lock sometimes occurs with incomplete builds. The lock file is stored in build_artifacts.
conda clean --lock

# Make sure we pull in the latest conda-build version too
conda install --yes --quiet conda-forge-ci-setup=1 conda-build
source run_conda_forge_build_setup

conda build /home/conda/recipe_root -m /home/conda/feedstock_root/.ci_support/${CONFIG}.yaml --quiet || exit 1
upload_or_check_non_existence /home/conda/recipe_root conda-forge --channel=main -m /home/conda/feedstock_root/.ci_support/${CONFIG}.yaml || exit 1

touch /home/conda/feedstock_root/build_artifacts/conda-forge-build-done
EOF

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}"
Expand All @@ -44,4 +81,4 @@ docker run -it \
/home/conda/feedstock_root/.circleci/build_steps.sh

# verify that the end of the script was reached
test -f "$DONE_CANARY"
test -f "$DONE_CANARY"
13 changes: 7 additions & 6 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,21 +10,22 @@ source:
sha256: 4489f2bdfa0259752a3afceebfff49056f7c9c0366ea315cf191953d364a2593

build:
number: 0
number: 1
script: python -m pip install --no-deps --ignore-installed .

requirements:
build:
- {{ compiler('c') }}
- {{ compiler('cxx') }}
host:
- python
- pip
- cython
- numpy 1.9.* # [py27 or py35]
- numpy 1.11.* # [py36]
- numpy
run:
- python
- numpy >=1.9.* # [py27 or py35]
- numpy >=1.11.* # [py36]
- python-dateutil >=2.5.*
- {{ pin_compatible('numpy') }}
- python-dateutil
- pytz

test:
Expand Down