diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index be88063..54c75a4 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,20 +8,20 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_numpy1.18python3.7.____cpython: - CONFIG: linux_64_numpy1.18python3.7.____cpython + linux_64_numpy1.18python3.7.____cpythonpython_implcpython: + CONFIG: linux_64_numpy1.18python3.7.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_numpy1.18python3.8.____cpython: - CONFIG: linux_64_numpy1.18python3.8.____cpython + linux_64_numpy1.18python3.8.____cpythonpython_implcpython: + CONFIG: linux_64_numpy1.18python3.8.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_numpy1.19python3.7.____73_pypy: - CONFIG: linux_64_numpy1.19python3.7.____73_pypy + linux_64_numpy1.19python3.7.____73_pypypython_implpypy: + CONFIG: linux_64_numpy1.19python3.7.____73_pypypython_implpypy UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_numpy1.19python3.9.____cpython: - CONFIG: linux_64_numpy1.19python3.9.____cpython + linux_64_numpy1.19python3.9.____cpythonpython_implcpython: + CONFIG: linux_64_numpy1.19python3.9.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 timeoutInMinutes: 360 diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 8d97057..db9e32e 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_numpy1.18python3.7.____cpython: - CONFIG: osx_64_numpy1.18python3.7.____cpython + osx_64_numpy1.18python3.7.____cpythonpython_implcpython: + CONFIG: osx_64_numpy1.18python3.7.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' - osx_64_numpy1.18python3.8.____cpython: - CONFIG: osx_64_numpy1.18python3.8.____cpython + osx_64_numpy1.18python3.8.____cpythonpython_implcpython: + CONFIG: osx_64_numpy1.18python3.8.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' - osx_64_numpy1.19python3.7.____73_pypy: - CONFIG: osx_64_numpy1.19python3.7.____73_pypy + osx_64_numpy1.19python3.7.____73_pypypython_implpypy: + CONFIG: osx_64_numpy1.19python3.7.____73_pypypython_implpypy UPLOAD_PACKAGES: 'True' - osx_64_numpy1.19python3.9.____cpython: - CONFIG: osx_64_numpy1.19python3.9.____cpython + osx_64_numpy1.19python3.9.____cpythonpython_implcpython: + CONFIG: osx_64_numpy1.19python3.9.____cpythonpython_implcpython + 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/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 82c7525..74290b9 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -55,10 +55,9 @@ jobs: condition: contains(variables['CONFIG'], 'vs2008') displayName: Patch vs2008 (if needed) - - task: CondaEnvironment@1 inputs: - packageSpecs: 'python=3.9 conda-build conda "conda-forge-ci-setup=3" pip boa' # Optional + packageSpecs: 'python=3.9 conda-build conda pip boa conda-forge-ci-setup=3' # Optional installOptions: "-c conda-forge" updateConda: true displayName: Install conda-build and activate environment diff --git a/.ci_support/README b/.ci_support/README index e4e2dce..a47316b 100644 --- a/.ci_support/README +++ b/.ci_support/README @@ -1 +1,6 @@ -This file is automatically generated by conda-smithy. To change any matrix elements, you should change conda-smithy's input conda_build_config.yaml and re-render the recipe, rather than editing these files directly. \ No newline at end of file +This file is automatically generated by conda-smithy. If any +particular build configuration is expected, but it is not found, +please make sure all dependencies are satisfiable. To add/modify any +matrix elements, you should create/change conda-smithy's input +recipe/conda_build_config.yaml and re-render the recipe, rather than +editing these files directly. diff --git a/.ci_support/linux_64_numpy1.18python3.7.____cpython.yaml b/.ci_support/linux_64_numpy1.18python3.7.____cpythonpython_implcpython.yaml similarity index 89% rename from .ci_support/linux_64_numpy1.18python3.7.____cpython.yaml rename to .ci_support/linux_64_numpy1.18python3.7.____cpythonpython_implcpython.yaml index e222918..305b8c2 100644 --- a/.ci_support/linux_64_numpy1.18python3.7.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.18python3.7.____cpythonpython_implcpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '9' +- '10' cdt_name: - cos6 channel_sources: @@ -13,7 +13,7 @@ docker_image: fortran_compiler: - gfortran fortran_compiler_version: -- '9' +- '10' numpy: - '1.18' pin_run_as_build: @@ -22,6 +22,8 @@ pin_run_as_build: max_pin: x.x python: - 3.7.* *_cpython +python_impl: +- cpython target_platform: - linux-64 zip_keys: @@ -29,3 +31,4 @@ zip_keys: - fortran_compiler_version - - python - numpy + - python_impl diff --git a/.ci_support/linux_64_numpy1.18python3.8.____cpython.yaml b/.ci_support/linux_64_numpy1.18python3.8.____cpythonpython_implcpython.yaml similarity index 89% rename from .ci_support/linux_64_numpy1.18python3.8.____cpython.yaml rename to .ci_support/linux_64_numpy1.18python3.8.____cpythonpython_implcpython.yaml index 8fabcfe..68115d9 100644 --- a/.ci_support/linux_64_numpy1.18python3.8.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.18python3.8.____cpythonpython_implcpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '9' +- '10' cdt_name: - cos6 channel_sources: @@ -13,7 +13,7 @@ docker_image: fortran_compiler: - gfortran fortran_compiler_version: -- '9' +- '10' numpy: - '1.18' pin_run_as_build: @@ -22,6 +22,8 @@ pin_run_as_build: max_pin: x.x python: - 3.8.* *_cpython +python_impl: +- cpython target_platform: - linux-64 zip_keys: @@ -29,3 +31,4 @@ zip_keys: - fortran_compiler_version - - python - numpy + - python_impl diff --git a/.ci_support/linux_64_numpy1.19python3.7.____73_pypy.yaml b/.ci_support/linux_64_numpy1.19python3.7.____73_pypypython_implpypy.yaml similarity index 90% rename from .ci_support/linux_64_numpy1.19python3.7.____73_pypy.yaml rename to .ci_support/linux_64_numpy1.19python3.7.____73_pypypython_implpypy.yaml index ff95783..e377ce2 100644 --- a/.ci_support/linux_64_numpy1.19python3.7.____73_pypy.yaml +++ b/.ci_support/linux_64_numpy1.19python3.7.____73_pypypython_implpypy.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '9' +- '10' cdt_name: - cos6 channel_sources: @@ -13,7 +13,7 @@ docker_image: fortran_compiler: - gfortran fortran_compiler_version: -- '9' +- '10' numpy: - '1.19' pin_run_as_build: @@ -22,6 +22,8 @@ pin_run_as_build: max_pin: x.x python: - 3.7.* *_73_pypy +python_impl: +- pypy target_platform: - linux-64 zip_keys: @@ -29,3 +31,4 @@ zip_keys: - fortran_compiler_version - - python - numpy + - python_impl diff --git a/.ci_support/linux_64_numpy1.19python3.9.____cpython.yaml b/.ci_support/linux_64_numpy1.19python3.9.____cpythonpython_implcpython.yaml similarity index 89% rename from .ci_support/linux_64_numpy1.19python3.9.____cpython.yaml rename to .ci_support/linux_64_numpy1.19python3.9.____cpythonpython_implcpython.yaml index bf25b34..9ba471f 100644 --- a/.ci_support/linux_64_numpy1.19python3.9.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.19python3.9.____cpythonpython_implcpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '9' +- '10' cdt_name: - cos6 channel_sources: @@ -13,7 +13,7 @@ docker_image: fortran_compiler: - gfortran fortran_compiler_version: -- '9' +- '10' numpy: - '1.19' pin_run_as_build: @@ -22,6 +22,8 @@ pin_run_as_build: max_pin: x.x python: - 3.9.* *_cpython +python_impl: +- cpython target_platform: - linux-64 zip_keys: @@ -29,3 +31,4 @@ zip_keys: - fortran_compiler_version - - python - numpy + - python_impl diff --git a/.ci_support/osx_64_numpy1.18python3.7.____cpython.yaml b/.ci_support/osx_64_numpy1.18python3.7.____cpythonpython_implcpython.yaml similarity index 90% rename from .ci_support/osx_64_numpy1.18python3.7.____cpython.yaml rename to .ci_support/osx_64_numpy1.18python3.7.____cpythonpython_implcpython.yaml index e28d5c5..6e7c248 100644 --- a/.ci_support/osx_64_numpy1.18python3.7.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.18python3.7.____cpythonpython_implcpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '11' +- '12' channel_sources: - conda-forge channel_targets: @@ -22,6 +22,8 @@ pin_run_as_build: max_pin: x.x python: - 3.7.* *_cpython +python_impl: +- cpython target_platform: - osx-64 zip_keys: @@ -29,3 +31,4 @@ zip_keys: - fortran_compiler_version - - python - numpy + - python_impl diff --git a/.ci_support/osx_64_numpy1.18python3.8.____cpython.yaml b/.ci_support/osx_64_numpy1.18python3.8.____cpythonpython_implcpython.yaml similarity index 90% rename from .ci_support/osx_64_numpy1.18python3.8.____cpython.yaml rename to .ci_support/osx_64_numpy1.18python3.8.____cpythonpython_implcpython.yaml index e20a7ea..c4404d5 100644 --- a/.ci_support/osx_64_numpy1.18python3.8.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.18python3.8.____cpythonpython_implcpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '11' +- '12' channel_sources: - conda-forge channel_targets: @@ -22,6 +22,8 @@ pin_run_as_build: max_pin: x.x python: - 3.8.* *_cpython +python_impl: +- cpython target_platform: - osx-64 zip_keys: @@ -29,3 +31,4 @@ zip_keys: - fortran_compiler_version - - python - numpy + - python_impl diff --git a/.ci_support/osx_64_numpy1.19python3.7.____73_pypy.yaml b/.ci_support/osx_64_numpy1.19python3.7.____73_pypypython_implpypy.yaml similarity index 91% rename from .ci_support/osx_64_numpy1.19python3.7.____73_pypy.yaml rename to .ci_support/osx_64_numpy1.19python3.7.____73_pypypython_implpypy.yaml index ec42d74..99a9c54 100644 --- a/.ci_support/osx_64_numpy1.19python3.7.____73_pypy.yaml +++ b/.ci_support/osx_64_numpy1.19python3.7.____73_pypypython_implpypy.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '11' +- '12' channel_sources: - conda-forge channel_targets: @@ -22,6 +22,8 @@ pin_run_as_build: max_pin: x.x python: - 3.7.* *_73_pypy +python_impl: +- pypy target_platform: - osx-64 zip_keys: @@ -29,3 +31,4 @@ zip_keys: - fortran_compiler_version - - python - numpy + - python_impl diff --git a/.ci_support/osx_64_numpy1.19python3.9.____cpython.yaml b/.ci_support/osx_64_numpy1.19python3.9.____cpythonpython_implcpython.yaml similarity index 90% rename from .ci_support/osx_64_numpy1.19python3.9.____cpython.yaml rename to .ci_support/osx_64_numpy1.19python3.9.____cpythonpython_implcpython.yaml index d4ff11f..257cdbb 100644 --- a/.ci_support/osx_64_numpy1.19python3.9.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.19python3.9.____cpythonpython_implcpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '11' +- '12' channel_sources: - conda-forge channel_targets: @@ -22,6 +22,8 @@ pin_run_as_build: max_pin: x.x python: - 3.9.* *_cpython +python_impl: +- cpython target_platform: - osx-64 zip_keys: @@ -29,3 +31,4 @@ zip_keys: - fortran_compiler_version - - python - numpy + - python_impl 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 0000000..b854259 --- /dev/null +++ b/.ci_support/osx_arm64_python3.8.____cpython.yaml @@ -0,0 +1,34 @@ +MACOSX_DEPLOYMENT_TARGET: +- '11.0' +c_compiler: +- clang +c_compiler_version: +- '12' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +fortran_compiler: +- gfortran +fortran_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 +python_impl: +- cpython +target_platform: +- osx-arm64 +zip_keys: +- - c_compiler_version + - fortran_compiler_version +- - python + - numpy + - python_impl 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 0000000..6cec8c0 --- /dev/null +++ b/.ci_support/osx_arm64_python3.9.____cpython.yaml @@ -0,0 +1,34 @@ +MACOSX_DEPLOYMENT_TARGET: +- '11.0' +c_compiler: +- clang +c_compiler_version: +- '12' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +fortran_compiler: +- gfortran +fortran_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 +python_impl: +- cpython +target_platform: +- osx-arm64 +zip_keys: +- - c_compiler_version + - fortran_compiler_version +- - python + - numpy + - python_impl diff --git a/.ci_support/win_64_numpy1.18python3.7.____cpython.yaml b/.ci_support/win_64_numpy1.18python3.7.____cpython.yaml index 3abe66d..32e3a11 100644 --- a/.ci_support/win_64_numpy1.18python3.7.____cpython.yaml +++ b/.ci_support/win_64_numpy1.18python3.7.____cpython.yaml @@ -18,8 +18,11 @@ pin_run_as_build: max_pin: x.x python: - 3.7.* *_cpython +python_impl: +- cpython target_platform: - win-64 zip_keys: - - python - numpy + - python_impl diff --git a/.ci_support/win_64_numpy1.18python3.8.____cpython.yaml b/.ci_support/win_64_numpy1.18python3.8.____cpython.yaml index 7ae6c5b..660d944 100644 --- a/.ci_support/win_64_numpy1.18python3.8.____cpython.yaml +++ b/.ci_support/win_64_numpy1.18python3.8.____cpython.yaml @@ -18,8 +18,11 @@ pin_run_as_build: max_pin: x.x python: - 3.8.* *_cpython +python_impl: +- cpython target_platform: - win-64 zip_keys: - - python - numpy + - python_impl diff --git a/.ci_support/win_64_numpy1.19python3.9.____cpython.yaml b/.ci_support/win_64_numpy1.19python3.9.____cpython.yaml index 57b7e56..a46f165 100644 --- a/.ci_support/win_64_numpy1.19python3.9.____cpython.yaml +++ b/.ci_support/win_64_numpy1.19python3.9.____cpython.yaml @@ -18,8 +18,11 @@ pin_run_as_build: max_pin: x.x python: - 3.9.* *_cpython +python_impl: +- cpython target_platform: - win-64 zip_keys: - - python - numpy + - python_impl diff --git a/.gitattributes b/.gitattributes index ce52713..7f32763 100644 --- a/.gitattributes +++ b/.gitattributes @@ -9,6 +9,7 @@ bld.bat text eol=crlf # github helper pieces to make some files not show up in diffs automatically .azure-pipelines/* linguist-generated=true .circleci/* linguist-generated=true +.ci_support/README linguist-generated=true .drone/* linguist-generated=true .drone.yml linguist-generated=true .github/* linguist-generated=true diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index ff01283..c6b23e8 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -29,8 +29,10 @@ conda-build: CONDARC -mamba install --update-specs --yes --quiet "conda-forge-ci-setup=3" conda-build pip boa -c conda-forge -mamba update --update-specs --yes --quiet "conda-forge-ci-setup=3" conda-build pip boa -c conda-forge +mamba install --update-specs --yes --quiet --channel conda-forge \ + conda-build pip boa conda-forge-ci-setup=3 +mamba update --update-specs --yes --quiet --channel conda-forge \ + conda-build pip boa conda-forge-ci-setup=3 # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" @@ -40,6 +42,9 @@ 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}" ]] && [[ "${HOST_PLATFORM}" != linux-* ]] && [[ "${BUILD_WITH_CONDA_DEBUG:-0}" != 1 ]]; then + EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" +fi ( endgroup "Configuring conda" ) 2> /dev/null diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh index 0c6515f..9236239 100755 --- a/.scripts/run_docker_build.sh +++ b/.scripts/run_docker_build.sh @@ -14,7 +14,7 @@ set -xeo pipefail THISDIR="$( cd "$( dirname "$0" )" >/dev/null && pwd )" PROVIDER_DIR="$(basename $THISDIR)" -FEEDSTOCK_ROOT=$(cd "$(dirname "$0")/.."; pwd;) +FEEDSTOCK_ROOT="$( cd "$( dirname "$0" )/.." >/dev/null && pwd )" RECIPE_ROOT="${FEEDSTOCK_ROOT}/recipe" if [ -z ${FEEDSTOCK_NAME} ]; then diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index d10e0c2..3d85505 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -23,9 +23,11 @@ bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} source ${MINIFORGE_HOME}/etc/profile.d/conda.sh conda activate base -echo -e "\n\nInstalling conda-forge-ci-setup=3 and conda-build." -mamba install -n base --update-specs --quiet --yes "conda-forge-ci-setup=3" conda-build pip boa -mamba update -n base --update-specs --quiet --yes "conda-forge-ci-setup=3" conda-build pip boa +echo -e "\n\nInstalling ['conda-forge-ci-setup=3'] and conda-build." +mamba install --update-specs --quiet --yes --channel conda-forge \ + conda-build pip boa conda-forge-ci-setup=3 +mamba update --update-specs --yes --quiet --channel conda-forge \ + conda-build pip boa conda-forge-ci-setup=3 @@ -51,21 +53,39 @@ source run_conda_forge_build_setup ( endgroup "Configuring conda" ) 2> /dev/null - echo -e "\n\nMaking the build clobber file" make_build_number ./ ./recipe ./.ci_support/${CONFIG}.yaml -conda mambabuild ./recipe -m ./.ci_support/${CONFIG}.yaml --suppress-variables --clobber-file ./.ci_support/clobber_${CONFIG}.yaml ${EXTRA_CB_OPTIONS:-} -( startgroup "Validating outputs" ) 2> /dev/null +if [[ "${HOST_PLATFORM}" != "${BUILD_PLATFORM}" ]]; then + EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" +fi -validate_recipe_outputs "${FEEDSTOCK_NAME}" -( endgroup "Validating outputs" ) 2> /dev/null +if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then + if [[ "x${BUILD_OUTPUT_ID:-}" != "x" ]]; then + EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --output-id ${BUILD_OUTPUT_ID}" + fi + conda debug ./recipe -m ./.ci_support/${CONFIG}.yaml \ + ${EXTRA_CB_OPTIONS:-} \ + --clobber-file ./.ci_support/clobber_${CONFIG}.yaml -( startgroup "Uploading packages" ) 2> /dev/null + # Drop into an interactive shell + /bin/bash +else + conda mambabuild ./recipe -m ./.ci_support/${CONFIG}.yaml \ + --suppress-variables ${EXTRA_CB_OPTIONS:-} \ + --clobber-file ./.ci_support/clobber_${CONFIG}.yaml + ( startgroup "Validating outputs" ) 2> /dev/null -if [[ "${UPLOAD_PACKAGES}" != "False" ]] && [[ "${IS_PR_BUILD}" == "False" ]]; then - upload_package --validate --feedstock-name="${FEEDSTOCK_NAME}" ./ ./recipe ./.ci_support/${CONFIG}.yaml -fi + validate_recipe_outputs "${FEEDSTOCK_NAME}" + + ( endgroup "Validating outputs" ) 2> /dev/null + + ( startgroup "Uploading packages" ) 2> /dev/null + + if [[ "${UPLOAD_PACKAGES}" != "False" ]] && [[ "${IS_PR_BUILD}" == "False" ]]; then + upload_package --validate --feedstock-name="${FEEDSTOCK_NAME}" ./ ./recipe ./.ci_support/${CONFIG}.yaml + fi -( endgroup "Uploading packages" ) 2> /dev/null \ No newline at end of file + ( endgroup "Uploading packages" ) 2> /dev/null +fi \ No newline at end of file diff --git a/README.md b/README.md index 866ddde..fdc4cf7 100644 --- a/README.md +++ b/README.md @@ -31,59 +31,73 @@ Current build status - + - + - + - + - + - + - + - + + + + + + + diff --git a/build-locally.py b/build-locally.py index 8b74348..eec38a0 100755 --- a/build-locally.py +++ b/build-locally.py @@ -22,10 +22,6 @@ def setup_environment(ns): os.environ["MINIFORGE_HOME"] = os.path.join( os.path.dirname(__file__), "miniforge3" ) - if "OSX_SDK_DIR" not in os.environ: - os.environ["OSX_SDK_DIR"] = os.path.join( - os.path.dirname(__file__), "SDKs" - ) def run_docker_build(ns): @@ -65,11 +61,12 @@ def verify_config(ns): raise ValueError( f"only Linux/macOS configs currently supported, got {ns.config}" ) - elif ns.config.startswith("osx") and platform.system() == "Darwin": + elif ns.config.startswith("osx"): if "OSX_SDK_DIR" not in os.environ: raise RuntimeError( - "Need OSX_SDK_DIR env variable set. Run 'export OSX_SDK_DIR=/opt'" - "to download the SDK automatically to '/opt/MacOSX.sdk'" + "Need OSX_SDK_DIR env variable set. Run 'export OSX_SDK_DIR=SDKs' " + "to download the SDK automatically to 'SDKs/MacOSX.sdk'. " + "Setting this variable implies agreement to the licensing terms of the SDK by Apple." ) diff --git a/conda-forge.yml b/conda-forge.yml index 1c09752..008f394 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -1 +1,4 @@ +build_platform: + osx_arm64: osx_64 conda_forge_output_validation: true +test_on_native_only: true diff --git a/recipe/meta.yaml b/recipe/meta.yaml index ab9734d..45444d0 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -14,6 +14,9 @@ build: requirements: build: + - python # [build_platform != target_platform] + - cross-python_{{ target_platform }} # [build_platform != target_platform] + - numpy # [build_platform != target_platform] - {{ compiler('fortran') }} - {{ compiler('m2w64_fortran') }} # [win] - {{ compiler('c') }} @@ -24,6 +27,7 @@ requirements: - setuptools - pip - numpy + - gfortran # [build_platform != target_platform] run: - python - {{ pin_compatible('numpy') }} @@ -38,7 +42,8 @@ test: imports: - climlab commands: - - pytest -v -m fast --pyargs climlab + - pytest -v -m fast --pyargs climlab # [python_impl != 'pypy'] + - pytest -v -m fast --pyargs climlab.tests.test_bandrc climlab.tests.test_cam3rad climlab.tests.test_domain2D climlab.tests.test_ebm climlab.tests.test_emanuel_convection climlab.tests.test_grey_radiation climlab.tests.test_rcm climlab.tests.test_rrtm climlab.tests.test_thermo climlab.tests.xarray_test # [python_impl == 'pypy'] about: home: https://github.com/brian-rose/climlab
VariantStatus
linux_64_numpy1.18python3.7.____cpythonlinux_64_numpy1.18python3.7.____cpythonpython_implcpython - variant + variant
linux_64_numpy1.18python3.8.____cpythonlinux_64_numpy1.18python3.8.____cpythonpython_implcpython - variant + variant
linux_64_numpy1.19python3.7.____73_pypylinux_64_numpy1.19python3.7.____73_pypypython_implpypy - variant + variant
linux_64_numpy1.19python3.9.____cpythonlinux_64_numpy1.19python3.9.____cpythonpython_implcpython - variant + variant
osx_64_numpy1.18python3.7.____cpythonosx_64_numpy1.18python3.7.____cpythonpython_implcpython - variant + variant
osx_64_numpy1.18python3.8.____cpythonosx_64_numpy1.18python3.8.____cpythonpython_implcpython - variant + variant
osx_64_numpy1.19python3.7.____73_pypyosx_64_numpy1.19python3.7.____73_pypypython_implpypy - variant + variant
osx_64_numpy1.19python3.9.____cpythonosx_64_numpy1.19python3.9.____cpythonpython_implcpython - variant + variant + +
osx_arm64_python3.8.____cpython + + variant + +
osx_arm64_python3.9.____cpython + + variant