diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 4299ef4..c8eca2d 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -11,19 +11,23 @@ jobs: linux_64_numpy1.16python3.6.____cpython: CONFIG: linux_64_numpy1.16python3.6.____cpython UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: condaforge/linux-anvil-comp7 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 linux_64_numpy1.16python3.7.____cpython: CONFIG: linux_64_numpy1.16python3.7.____cpython UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: condaforge/linux-anvil-comp7 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 linux_64_numpy1.16python3.8.____cpython: CONFIG: linux_64_numpy1.16python3.8.____cpython UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: condaforge/linux-anvil-comp7 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 linux_64_numpy1.18python3.6.____73_pypy: CONFIG: linux_64_numpy1.18python3.6.____73_pypy UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: condaforge/linux-anvil-comp7 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 + linux_64_numpy1.19python3.7.____73_pypy: + CONFIG: linux_64_numpy1.19python3.7.____73_pypy + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 timeoutInMinutes: 360 steps: diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 5069e0d..c2b0bce 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -20,6 +20,9 @@ jobs: osx_64_numpy1.18python3.6.____73_pypy: CONFIG: osx_64_numpy1.18python3.6.____73_pypy UPLOAD_PACKAGES: 'True' + osx_64_numpy1.19python3.7.____73_pypy: + CONFIG: osx_64_numpy1.19python3.7.____73_pypy + UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 steps: diff --git a/.ci_support/linux_64_numpy1.16python3.6.____cpython.yaml b/.ci_support/linux_64_numpy1.16python3.6.____cpython.yaml index a659645..8c9e501 100644 --- a/.ci_support/linux_64_numpy1.16python3.6.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.16python3.6.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '7' +- '9' cdt_name: - cos6 channel_sources: @@ -11,9 +11,9 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '7' +- '9' docker_image: -- condaforge/linux-anvil-comp7 +- quay.io/condaforge/linux-anvil-comp7 numpy: - '1.16' pin_run_as_build: @@ -27,5 +27,7 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version +- - cdt_name + - docker_image - - python - numpy diff --git a/.ci_support/linux_64_numpy1.16python3.7.____cpython.yaml b/.ci_support/linux_64_numpy1.16python3.7.____cpython.yaml index 96b3320..7dfc6ea 100644 --- a/.ci_support/linux_64_numpy1.16python3.7.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.16python3.7.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '7' +- '9' cdt_name: - cos6 channel_sources: @@ -11,9 +11,9 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '7' +- '9' docker_image: -- condaforge/linux-anvil-comp7 +- quay.io/condaforge/linux-anvil-comp7 numpy: - '1.16' pin_run_as_build: @@ -27,5 +27,7 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version +- - cdt_name + - docker_image - - python - numpy diff --git a/.ci_support/linux_64_numpy1.16python3.8.____cpython.yaml b/.ci_support/linux_64_numpy1.16python3.8.____cpython.yaml index 19f9840..29ad7a7 100644 --- a/.ci_support/linux_64_numpy1.16python3.8.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.16python3.8.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '7' +- '9' cdt_name: - cos6 channel_sources: @@ -11,9 +11,9 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '7' +- '9' docker_image: -- condaforge/linux-anvil-comp7 +- quay.io/condaforge/linux-anvil-comp7 numpy: - '1.16' pin_run_as_build: @@ -27,5 +27,7 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version +- - cdt_name + - docker_image - - python - numpy diff --git a/.ci_support/linux_64_numpy1.18python3.6.____73_pypy.yaml b/.ci_support/linux_64_numpy1.18python3.6.____73_pypy.yaml index 894451d..7679a48 100644 --- a/.ci_support/linux_64_numpy1.18python3.6.____73_pypy.yaml +++ b/.ci_support/linux_64_numpy1.18python3.6.____73_pypy.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '7' +- '9' cdt_name: - cos6 channel_sources: @@ -11,9 +11,9 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '7' +- '9' docker_image: -- condaforge/linux-anvil-comp7 +- quay.io/condaforge/linux-anvil-comp7 numpy: - '1.18' pin_run_as_build: @@ -27,5 +27,7 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version +- - cdt_name + - docker_image - - python - numpy diff --git a/.ci_support/linux_64_numpy1.19python3.7.____73_pypy.yaml b/.ci_support/linux_64_numpy1.19python3.7.____73_pypy.yaml new file mode 100644 index 0000000..e2bc49d --- /dev/null +++ b/.ci_support/linux_64_numpy1.19python3.7.____73_pypy.yaml @@ -0,0 +1,33 @@ +c_compiler: +- gcc +c_compiler_version: +- '9' +cdt_name: +- cos6 +channel_sources: +- conda-forge,defaults +channel_targets: +- conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '9' +docker_image: +- quay.io/condaforge/linux-anvil-comp7 +numpy: +- '1.19' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.7.* *_73_pypy +target_platform: +- linux-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - cdt_name + - docker_image +- - python + - numpy diff --git a/.ci_support/linux_aarch64_numpy1.16python3.6.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.16python3.6.____cpython.yaml index db9909d..a6b9e21 100644 --- a/.ci_support/linux_aarch64_numpy1.16python3.6.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.16python3.6.____cpython.yaml @@ -3,7 +3,7 @@ BUILD: c_compiler: - gcc c_compiler_version: -- '7' +- '9' cdt_arch: - aarch64 cdt_name: @@ -15,9 +15,9 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '7' +- '9' docker_image: -- condaforge/linux-anvil-aarch64 +- quay.io/condaforge/linux-anvil-aarch64 numpy: - '1.16' pin_run_as_build: diff --git a/.ci_support/linux_aarch64_numpy1.16python3.7.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.16python3.7.____cpython.yaml index cade88d..f9d7e9a 100644 --- a/.ci_support/linux_aarch64_numpy1.16python3.7.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.16python3.7.____cpython.yaml @@ -3,7 +3,7 @@ BUILD: c_compiler: - gcc c_compiler_version: -- '7' +- '9' cdt_arch: - aarch64 cdt_name: @@ -15,9 +15,9 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '7' +- '9' docker_image: -- condaforge/linux-anvil-aarch64 +- quay.io/condaforge/linux-anvil-aarch64 numpy: - '1.16' pin_run_as_build: diff --git a/.ci_support/linux_aarch64_numpy1.16python3.8.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.16python3.8.____cpython.yaml index 5b3f024..95302f4 100644 --- a/.ci_support/linux_aarch64_numpy1.16python3.8.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.16python3.8.____cpython.yaml @@ -3,7 +3,7 @@ BUILD: c_compiler: - gcc c_compiler_version: -- '7' +- '9' cdt_arch: - aarch64 cdt_name: @@ -15,9 +15,9 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '7' +- '9' docker_image: -- condaforge/linux-anvil-aarch64 +- quay.io/condaforge/linux-anvil-aarch64 numpy: - '1.16' pin_run_as_build: diff --git a/.ci_support/linux_aarch64_numpy1.18python3.6.____73_pypy.yaml b/.ci_support/linux_aarch64_numpy1.18python3.6.____73_pypy.yaml index eedfb4d..1c76487 100644 --- a/.ci_support/linux_aarch64_numpy1.18python3.6.____73_pypy.yaml +++ b/.ci_support/linux_aarch64_numpy1.18python3.6.____73_pypy.yaml @@ -3,7 +3,7 @@ BUILD: c_compiler: - gcc c_compiler_version: -- '7' +- '9' cdt_arch: - aarch64 cdt_name: @@ -15,9 +15,9 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '7' +- '9' docker_image: -- condaforge/linux-anvil-aarch64 +- quay.io/condaforge/linux-anvil-aarch64 numpy: - '1.18' pin_run_as_build: diff --git a/.ci_support/linux_aarch64_numpy1.19python3.7.____73_pypy.yaml b/.ci_support/linux_aarch64_numpy1.19python3.7.____73_pypy.yaml new file mode 100644 index 0000000..dd4f3c4 --- /dev/null +++ b/.ci_support/linux_aarch64_numpy1.19python3.7.____73_pypy.yaml @@ -0,0 +1,35 @@ +BUILD: +- aarch64-conda_cos7-linux-gnu +c_compiler: +- gcc +c_compiler_version: +- '9' +cdt_arch: +- aarch64 +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '9' +docker_image: +- quay.io/condaforge/linux-anvil-aarch64 +numpy: +- '1.19' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.7.* *_73_pypy +target_platform: +- linux-aarch64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy diff --git a/.ci_support/linux_ppc64le_numpy1.16python3.6.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.16python3.6.____cpython.yaml index ebb05eb..a32987b 100644 --- a/.ci_support/linux_ppc64le_numpy1.16python3.6.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.16python3.6.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '8' +- '9' cdt_name: - cos7 channel_sources: @@ -11,9 +11,9 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '8' +- '9' docker_image: -- condaforge/linux-anvil-ppc64le +- quay.io/condaforge/linux-anvil-ppc64le numpy: - '1.16' pin_run_as_build: diff --git a/.ci_support/linux_ppc64le_numpy1.16python3.7.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.16python3.7.____cpython.yaml index 14f9937..93bf18c 100644 --- a/.ci_support/linux_ppc64le_numpy1.16python3.7.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.16python3.7.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '8' +- '9' cdt_name: - cos7 channel_sources: @@ -11,9 +11,9 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '8' +- '9' docker_image: -- condaforge/linux-anvil-ppc64le +- quay.io/condaforge/linux-anvil-ppc64le numpy: - '1.16' pin_run_as_build: diff --git a/.ci_support/linux_ppc64le_numpy1.16python3.8.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.16python3.8.____cpython.yaml index be33454..93c85aa 100644 --- a/.ci_support/linux_ppc64le_numpy1.16python3.8.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.16python3.8.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '8' +- '9' cdt_name: - cos7 channel_sources: @@ -11,9 +11,9 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '8' +- '9' docker_image: -- condaforge/linux-anvil-ppc64le +- quay.io/condaforge/linux-anvil-ppc64le numpy: - '1.16' pin_run_as_build: diff --git a/.ci_support/linux_ppc64le_numpy1.18python3.6.____73_pypy.yaml b/.ci_support/linux_ppc64le_numpy1.18python3.6.____73_pypy.yaml index acc8a4e..ac97338 100644 --- a/.ci_support/linux_ppc64le_numpy1.18python3.6.____73_pypy.yaml +++ b/.ci_support/linux_ppc64le_numpy1.18python3.6.____73_pypy.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '8' +- '9' cdt_name: - cos7 channel_sources: @@ -11,9 +11,9 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '8' +- '9' docker_image: -- condaforge/linux-anvil-ppc64le +- quay.io/condaforge/linux-anvil-ppc64le numpy: - '1.18' pin_run_as_build: diff --git a/.ci_support/linux_ppc64le_numpy1.19python3.7.____73_pypy.yaml b/.ci_support/linux_ppc64le_numpy1.19python3.7.____73_pypy.yaml new file mode 100644 index 0000000..aca8a11 --- /dev/null +++ b/.ci_support/linux_ppc64le_numpy1.19python3.7.____73_pypy.yaml @@ -0,0 +1,31 @@ +c_compiler: +- gcc +c_compiler_version: +- '9' +cdt_name: +- cos7 +channel_sources: +- conda-forge,defaults +channel_targets: +- conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '9' +docker_image: +- quay.io/condaforge/linux-anvil-ppc64le +numpy: +- '1.19' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.7.* *_73_pypy +target_platform: +- linux-ppc64le +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy diff --git a/.ci_support/migrations/pypy37.yaml b/.ci_support/migrations/pypy37.yaml new file mode 100644 index 0000000..d62decd --- /dev/null +++ b/.ci_support/migrations/pypy37.yaml @@ -0,0 +1,30 @@ +migrator_ts: 1608144114 +__migrator: + migration_number: 1 + operation: key_add + primary_key: python + ordering: + python: + - 3.6.* *_cpython + - 3.7.* *_cpython + - 3.8.* *_cpython + - 3.9.* *_cpython + - 3.6.* *_73_pypy + - 3.7.* *_73_pypy # new entry + paused: False + longterm: True + pr_limit: 10 + bump_number: 0 + exclude: + # this shouldn't attempt to modify the python feedstocks + - python + - pypy3.6 + - pypy-meta + +python: # [not (win or arm64)] + - 3.7.* *_73_pypy # [not (win or arm64)] +# additional entries to add for zip_keys +numpy: # [not (win or arm64)] + - 1.19 # [not (win or arm64)] +python_impl: # [not (win or arm64)] + - pypy # [not (win or arm64)] diff --git a/.ci_support/osx_64_numpy1.16python3.6.____cpython.yaml b/.ci_support/osx_64_numpy1.16python3.6.____cpython.yaml index 9a52bbe..468741f 100644 --- a/.ci_support/osx_64_numpy1.16python3.6.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.16python3.6.____cpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '10' +- '11' channel_sources: - conda-forge,defaults channel_targets: @@ -11,7 +11,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '10' +- '11' macos_machine: - x86_64-apple-darwin13.4.0 numpy: diff --git a/.ci_support/osx_64_numpy1.16python3.7.____cpython.yaml b/.ci_support/osx_64_numpy1.16python3.7.____cpython.yaml index aa0c597..98e8d09 100644 --- a/.ci_support/osx_64_numpy1.16python3.7.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.16python3.7.____cpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '10' +- '11' channel_sources: - conda-forge,defaults channel_targets: @@ -11,7 +11,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '10' +- '11' macos_machine: - x86_64-apple-darwin13.4.0 numpy: diff --git a/.ci_support/osx_64_numpy1.16python3.8.____cpython.yaml b/.ci_support/osx_64_numpy1.16python3.8.____cpython.yaml index c478f17..d710b14 100644 --- a/.ci_support/osx_64_numpy1.16python3.8.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.16python3.8.____cpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '10' +- '11' channel_sources: - conda-forge,defaults channel_targets: @@ -11,7 +11,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '10' +- '11' macos_machine: - x86_64-apple-darwin13.4.0 numpy: diff --git a/.ci_support/osx_64_numpy1.18python3.6.____73_pypy.yaml b/.ci_support/osx_64_numpy1.18python3.6.____73_pypy.yaml index 545a5db..5e2c139 100644 --- a/.ci_support/osx_64_numpy1.18python3.6.____73_pypy.yaml +++ b/.ci_support/osx_64_numpy1.18python3.6.____73_pypy.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '10' +- '11' channel_sources: - conda-forge,defaults channel_targets: @@ -11,7 +11,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '10' +- '11' macos_machine: - x86_64-apple-darwin13.4.0 numpy: diff --git a/.ci_support/osx_64_numpy1.19python3.7.____73_pypy.yaml b/.ci_support/osx_64_numpy1.19python3.7.____73_pypy.yaml new file mode 100644 index 0000000..d4e1e84 --- /dev/null +++ b/.ci_support/osx_64_numpy1.19python3.7.____73_pypy.yaml @@ -0,0 +1,31 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.9' +c_compiler: +- clang +c_compiler_version: +- '11' +channel_sources: +- conda-forge,defaults +channel_targets: +- conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '11' +macos_machine: +- x86_64-apple-darwin13.4.0 +numpy: +- '1.19' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.7.* *_73_pypy +target_platform: +- osx-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy diff --git a/.drone.yml b/.drone.yml index 26ac44d..4a57114 100644 --- a/.drone.yml +++ b/.drone.yml @@ -8,7 +8,7 @@ platform: steps: - name: Install and build - image: condaforge/linux-anvil-aarch64 + image: quay.io/condaforge/linux-anvil-aarch64 environment: CONFIG: linux_aarch64_numpy1.16python3.6.____cpython UPLOAD_PACKAGES: True @@ -39,7 +39,7 @@ platform: steps: - name: Install and build - image: condaforge/linux-anvil-aarch64 + image: quay.io/condaforge/linux-anvil-aarch64 environment: CONFIG: linux_aarch64_numpy1.16python3.7.____cpython UPLOAD_PACKAGES: True @@ -70,7 +70,7 @@ platform: steps: - name: Install and build - image: condaforge/linux-anvil-aarch64 + image: quay.io/condaforge/linux-anvil-aarch64 environment: CONFIG: linux_aarch64_numpy1.16python3.8.____cpython UPLOAD_PACKAGES: True @@ -101,7 +101,7 @@ platform: steps: - name: Install and build - image: condaforge/linux-anvil-aarch64 + image: quay.io/condaforge/linux-anvil-aarch64 environment: CONFIG: linux_aarch64_numpy1.18python3.6.____73_pypy UPLOAD_PACKAGES: True @@ -122,3 +122,34 @@ steps: - /opt/docker/bin/entrypoint $FEEDSTOCK_ROOT/.scripts/build_steps.sh - echo "Done building" +--- +kind: pipeline +name: linux_aarch64_numpy1.19python3.7.____73_pypy + +platform: + os: linux + arch: arm64 + +steps: +- name: Install and build + image: quay.io/condaforge/linux-anvil-aarch64 + environment: + CONFIG: linux_aarch64_numpy1.19python3.7.____73_pypy + UPLOAD_PACKAGES: True + PLATFORM: linux-aarch64 + BINSTAR_TOKEN: + from_secret: BINSTAR_TOKEN + FEEDSTOCK_TOKEN: + from_secret: FEEDSTOCK_TOKEN + STAGING_BINSTAR_TOKEN: + from_secret: STAGING_BINSTAR_TOKEN + commands: + - export FEEDSTOCK_ROOT="$DRONE_WORKSPACE" + - export RECIPE_ROOT="$FEEDSTOCK_ROOT/recipe" + - export CI=drone + - export GIT_BRANCH="$DRONE_BRANCH" + - export FEEDSTOCK_NAME=$(basename ${DRONE_REPO_NAME}) + - sed -i '$ichown -R conda:conda "$FEEDSTOCK_ROOT"' /opt/docker/bin/entrypoint + - /opt/docker/bin/entrypoint $FEEDSTOCK_ROOT/.scripts/build_steps.sh + - echo "Done building" + diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh index 87ba4db..36dacd6 100755 --- a/.scripts/run_docker_build.sh +++ b/.scripts/run_docker_build.sh @@ -45,8 +45,12 @@ 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" + echo "WARNING: DOCKER_IMAGE variable not set and shyaml not installed. Trying to parse with coreutils" + DOCKER_IMAGE=$(cat .ci_support/${CONFIG}.yaml | grep '^docker_image:$' -A 1 | tail -n 1 | cut -b 3-) + if [ "${DOCKER_IMAGE}" = "" ]; then + echo "No docker_image entry found in ${CONFIG}. Falling back to condaforge/linux-anvil-comp7" + DOCKER_IMAGE="condaforge/linux-anvil-comp7" + fi else DOCKER_IMAGE="$(cat "${FEEDSTOCK_ROOT}/.ci_support/${CONFIG}.yaml" | shyaml get-value docker_image.0 condaforge/linux-anvil-comp7 )" fi @@ -64,8 +68,8 @@ 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 \ + -v "${RECIPE_ROOT}":/home/conda/recipe_root:rw,z,delegated \ + -v "${FEEDSTOCK_ROOT}":/home/conda/feedstock_root:rw,z,delegated \ -e CONFIG \ -e HOST_USER_ID \ -e UPLOAD_PACKAGES \ diff --git a/.travis.yml b/.travis.yml index 3310201..5de3794 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,19 +7,23 @@ language: generic matrix: include: - - env: CONFIG=linux_ppc64le_numpy1.16python3.6.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=condaforge/linux-anvil-ppc64le + - env: CONFIG=linux_ppc64le_numpy1.16python3.6.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le os: linux arch: ppc64le - - env: CONFIG=linux_ppc64le_numpy1.16python3.7.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=condaforge/linux-anvil-ppc64le + - env: CONFIG=linux_ppc64le_numpy1.16python3.7.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le os: linux arch: ppc64le - - env: CONFIG=linux_ppc64le_numpy1.16python3.8.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=condaforge/linux-anvil-ppc64le + - env: CONFIG=linux_ppc64le_numpy1.16python3.8.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le os: linux arch: ppc64le - - env: CONFIG=linux_ppc64le_numpy1.18python3.6.____73_pypy UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=condaforge/linux-anvil-ppc64le + - env: CONFIG=linux_ppc64le_numpy1.18python3.6.____73_pypy UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le + os: linux + arch: ppc64le + + - env: CONFIG=linux_ppc64le_numpy1.19python3.7.____73_pypy UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le os: linux arch: ppc64le diff --git a/README.md b/README.md index 6e18650..4480cdc 100644 --- a/README.md +++ b/README.md @@ -78,6 +78,13 @@ Current build status variant + + linux_64_numpy1.19python3.7.____73_pypy + + + variant + + linux_aarch64_numpy1.16python3.6.____cpython @@ -106,6 +113,13 @@ Current build status variant + + linux_aarch64_numpy1.19python3.7.____73_pypy + + + variant + + linux_ppc64le_numpy1.16python3.6.____cpython @@ -134,6 +148,13 @@ Current build status variant + + linux_ppc64le_numpy1.19python3.7.____73_pypy + + + variant + + osx_64_numpy1.16python3.6.____cpython @@ -162,6 +183,13 @@ Current build status variant + + osx_64_numpy1.19python3.7.____73_pypy + + + variant + + win_64_python3.6.____cpython