diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 141133e2..7176ff48 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,20 +8,20 @@ jobs: vmImage: ubuntu-16.04 strategy: matrix: - linux_64_python3.6.____cpython: - CONFIG: linux_64_python3.6.____cpython + linux_64_numpy1.17python3.6.____cpython: + CONFIG: linux_64_numpy1.17python3.6.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 - linux_64_python3.7.____cpython: - CONFIG: linux_64_python3.7.____cpython + linux_64_numpy1.17python3.7.____cpython: + CONFIG: linux_64_numpy1.17python3.7.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 - linux_64_python3.8.____cpython: - CONFIG: linux_64_python3.8.____cpython + linux_64_numpy1.17python3.8.____cpython: + CONFIG: linux_64_numpy1.17python3.8.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 - linux_64_python3.9.____cpython: - CONFIG: linux_64_python3.9.____cpython + linux_64_numpy1.19python3.9.____cpython: + CONFIG: linux_64_numpy1.19python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 timeoutInMinutes: 360 diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 8aadc553..40951f4f 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -8,17 +8,23 @@ jobs: vmImage: macOS-10.15 strategy: matrix: - osx_64_python3.6.____cpython: - CONFIG: osx_64_python3.6.____cpython + osx_64_numpy1.17python3.6.____cpython: + CONFIG: osx_64_numpy1.17python3.6.____cpython UPLOAD_PACKAGES: 'True' - osx_64_python3.7.____cpython: - CONFIG: osx_64_python3.7.____cpython + osx_64_numpy1.17python3.7.____cpython: + CONFIG: osx_64_numpy1.17python3.7.____cpython UPLOAD_PACKAGES: 'True' - osx_64_python3.8.____cpython: - CONFIG: osx_64_python3.8.____cpython + osx_64_numpy1.17python3.8.____cpython: + CONFIG: osx_64_numpy1.17python3.8.____cpython UPLOAD_PACKAGES: 'True' - osx_64_python3.9.____cpython: - CONFIG: osx_64_python3.9.____cpython + osx_64_numpy1.19python3.9.____cpython: + CONFIG: osx_64_numpy1.19python3.9.____cpython + UPLOAD_PACKAGES: 'True' + osx_arm64_python3.8.____cpython: + CONFIG: osx_arm64_python3.8.____cpython + UPLOAD_PACKAGES: 'True' + osx_arm64_python3.9.____cpython: + CONFIG: osx_arm64_python3.9.____cpython UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 diff --git a/.ci_support/linux_64_python3.6.____cpython.yaml b/.ci_support/linux_64_numpy1.17python3.6.____cpython.yaml similarity index 63% rename from .ci_support/linux_64_python3.6.____cpython.yaml rename to .ci_support/linux_64_numpy1.17python3.6.____cpython.yaml index 0057db54..66314f0d 100644 --- a/.ci_support/linux_64_python3.6.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.17python3.6.____cpython.yaml @@ -1,11 +1,21 @@ +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.17' pin_run_as_build: python: min_pin: x.x @@ -15,5 +25,9 @@ python: target_platform: - linux-64 zip_keys: +- - c_compiler_version + - cxx_compiler_version - - cdt_name - docker_image +- - python + - numpy diff --git a/.ci_support/linux_64_python3.7.____cpython.yaml b/.ci_support/linux_64_numpy1.17python3.7.____cpython.yaml similarity index 63% rename from .ci_support/linux_64_python3.7.____cpython.yaml rename to .ci_support/linux_64_numpy1.17python3.7.____cpython.yaml index ae99d55b..c0263f77 100644 --- a/.ci_support/linux_64_python3.7.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.17python3.7.____cpython.yaml @@ -1,11 +1,21 @@ +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.17' pin_run_as_build: python: min_pin: x.x @@ -15,5 +25,9 @@ python: target_platform: - linux-64 zip_keys: +- - c_compiler_version + - cxx_compiler_version - - cdt_name - docker_image +- - python + - numpy diff --git a/.ci_support/linux_64_python3.8.____cpython.yaml b/.ci_support/linux_64_numpy1.17python3.8.____cpython.yaml similarity index 63% rename from .ci_support/linux_64_python3.8.____cpython.yaml rename to .ci_support/linux_64_numpy1.17python3.8.____cpython.yaml index f0c7b1c5..798fb873 100644 --- a/.ci_support/linux_64_python3.8.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.17python3.8.____cpython.yaml @@ -1,11 +1,21 @@ +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.17' pin_run_as_build: python: min_pin: x.x @@ -15,5 +25,9 @@ python: target_platform: - linux-64 zip_keys: +- - c_compiler_version + - cxx_compiler_version - - cdt_name - docker_image +- - python + - numpy diff --git a/.ci_support/linux_64_python3.9.____cpython.yaml b/.ci_support/linux_64_numpy1.19python3.9.____cpython.yaml similarity index 63% rename from .ci_support/linux_64_python3.9.____cpython.yaml rename to .ci_support/linux_64_numpy1.19python3.9.____cpython.yaml index 53735358..0c640328 100644 --- a/.ci_support/linux_64_python3.9.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.19python3.9.____cpython.yaml @@ -1,11 +1,21 @@ +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 @@ -15,5 +25,9 @@ python: target_platform: - linux-64 zip_keys: +- - c_compiler_version + - cxx_compiler_version - - cdt_name - docker_image +- - python + - numpy diff --git a/.ci_support/osx_64_python3.6.____cpython.yaml b/.ci_support/osx_64_numpy1.17python3.6.____cpython.yaml similarity index 57% rename from .ci_support/osx_64_python3.6.____cpython.yaml rename to .ci_support/osx_64_numpy1.17python3.6.____cpython.yaml index e5f17c2b..dd6aa454 100644 --- a/.ci_support/osx_64_python3.6.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.17python3.6.____cpython.yaml @@ -1,11 +1,21 @@ 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.17' pin_run_as_build: python: min_pin: x.x @@ -14,3 +24,8 @@ python: - 3.6.* *_cpython target_platform: - osx-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy diff --git a/.ci_support/osx_64_python3.7.____cpython.yaml b/.ci_support/osx_64_numpy1.17python3.7.____cpython.yaml similarity index 57% rename from .ci_support/osx_64_python3.7.____cpython.yaml rename to .ci_support/osx_64_numpy1.17python3.7.____cpython.yaml index 163d3ce6..ec5c6071 100644 --- a/.ci_support/osx_64_python3.7.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.17python3.7.____cpython.yaml @@ -1,11 +1,21 @@ 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.17' pin_run_as_build: python: min_pin: x.x @@ -14,3 +24,8 @@ python: - 3.7.* *_cpython target_platform: - osx-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy diff --git a/.ci_support/osx_64_python3.8.____cpython.yaml b/.ci_support/osx_64_numpy1.17python3.8.____cpython.yaml similarity index 57% rename from .ci_support/osx_64_python3.8.____cpython.yaml rename to .ci_support/osx_64_numpy1.17python3.8.____cpython.yaml index 63cee21d..610cb2e2 100644 --- a/.ci_support/osx_64_python3.8.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.17python3.8.____cpython.yaml @@ -1,11 +1,21 @@ 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.17' pin_run_as_build: python: min_pin: x.x @@ -14,3 +24,8 @@ python: - 3.8.* *_cpython target_platform: - osx-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy diff --git a/.ci_support/osx_64_python3.9.____cpython.yaml b/.ci_support/osx_64_numpy1.19python3.9.____cpython.yaml similarity index 57% rename from .ci_support/osx_64_python3.9.____cpython.yaml rename to .ci_support/osx_64_numpy1.19python3.9.____cpython.yaml index 51915a80..f6ba5598 100644 --- a/.ci_support/osx_64_python3.9.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.19python3.9.____cpython.yaml @@ -1,11 +1,21 @@ 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 @@ -14,3 +24,8 @@ python: - 3.9.* *_cpython target_platform: - osx-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy diff --git a/.ci_support/osx_arm64_python3.8.____cpython.yaml b/.ci_support/osx_arm64_python3.8.____cpython.yaml new file mode 100644 index 00000000..1ad6e21e --- /dev/null +++ b/.ci_support/osx_arm64_python3.8.____cpython.yaml @@ -0,0 +1,31 @@ +MACOSX_DEPLOYMENT_TARGET: +- '11.0' +c_compiler: +- clang +c_compiler_version: +- '11' +channel_sources: +- conda-forge/label/rust_dev,conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '11' +macos_machine: +- arm64-apple-darwin20.0.0 +numpy: +- '1.19' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.8.* *_cpython +target_platform: +- osx-arm64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy diff --git a/.ci_support/osx_arm64_python3.9.____cpython.yaml b/.ci_support/osx_arm64_python3.9.____cpython.yaml new file mode 100644 index 00000000..0534e4af --- /dev/null +++ b/.ci_support/osx_arm64_python3.9.____cpython.yaml @@ -0,0 +1,31 @@ +MACOSX_DEPLOYMENT_TARGET: +- '11.0' +c_compiler: +- clang +c_compiler_version: +- '11' +channel_sources: +- conda-forge/label/rust_dev,conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '11' +macos_machine: +- arm64-apple-darwin20.0.0 +numpy: +- '1.19' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.9.* *_cpython +target_platform: +- osx-arm64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 3c5dcaee..4f033996 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +1 @@ -* @ericmjl \ No newline at end of file +* @ericmjl @xhochy \ No newline at end of file diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 522eabcf..7fbce051 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -36,6 +36,10 @@ source run_conda_forge_build_setup # make the build number clobber make_build_number "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" +if [[ "${HOST_PLATFORM}" != "${BUILD_PLATFORM}" ]] && [[ "${BUILD_WITH_CONDA_DEBUG:-0}" != 1 ]]; then + EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" +fi + endgroup "Configuring conda" if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 614ca844..7688497f 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -42,6 +42,10 @@ startgroup "Running conda $BUILD_CMD" echo -e "\n\nMaking the build clobber file" make_build_number ./ ./recipe ./.ci_support/${CONFIG}.yaml +if [[ "${HOST_PLATFORM}" != "${BUILD_PLATFORM}" ]]; then + EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" +fi + conda $BUILD_CMD ./recipe -m ./.ci_support/${CONFIG}.yaml --suppress-variables --clobber-file ./.ci_support/clobber_${CONFIG}.yaml ${EXTRA_CB_OPTIONS:-} endgroup "Running conda build" startgroup "Validating outputs" diff --git a/README.md b/README.md index 3a107570..cf577e09 100644 --- a/README.md +++ b/README.md @@ -29,59 +29,73 @@ Current build status
Variant | Status | |
---|---|---|
linux_64_python3.6.____cpython | +linux_64_numpy1.17python3.6.____cpython | - + |
linux_64_python3.7.____cpython | +linux_64_numpy1.17python3.7.____cpython | - + |
linux_64_python3.8.____cpython | +linux_64_numpy1.17python3.8.____cpython | - + |
linux_64_python3.9.____cpython | +linux_64_numpy1.19python3.9.____cpython | - + |
osx_64_python3.6.____cpython | +osx_64_numpy1.17python3.6.____cpython | - + |
osx_64_python3.7.____cpython | +osx_64_numpy1.17python3.7.____cpython | - + |
osx_64_python3.8.____cpython | +osx_64_numpy1.17python3.8.____cpython | - + |
osx_64_python3.9.____cpython | +osx_64_numpy1.19python3.9.____cpython | - + + + | +
osx_arm64_python3.8.____cpython | ++ + + + | +|
osx_arm64_python3.9.____cpython | ++ + |