diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 69a9c25..1068a43 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,14 +8,6 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_python3.7.____73_pypypython_implpypy: - CONFIG: linux_64_python3.7.____73_pypypython_implpypy - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_python3.7.____cpythonpython_implcpython: - CONFIG: linux_64_python3.7.____cpythonpython_implcpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_64_python3.8.____cpythonpython_implcpython: CONFIG: linux_64_python3.8.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' @@ -24,14 +16,6 @@ jobs: CONFIG: linux_64_python3.9.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_python3.7.____73_pypypython_implpypy: - CONFIG: linux_aarch64_python3.7.____73_pypypython_implpypy - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64 - linux_aarch64_python3.7.____cpythonpython_implcpython: - CONFIG: linux_aarch64_python3.7.____cpythonpython_implcpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64 linux_aarch64_python3.8.____cpythonpython_implcpython: CONFIG: linux_aarch64_python3.8.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' @@ -40,14 +24,6 @@ jobs: CONFIG: linux_aarch64_python3.9.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64 - linux_ppc64le_python3.7.____73_pypypython_implpypy: - CONFIG: linux_ppc64le_python3.7.____73_pypypython_implpypy - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-ppc64le - linux_ppc64le_python3.7.____cpythonpython_implcpython: - CONFIG: linux_ppc64le_python3.7.____cpythonpython_implcpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-ppc64le linux_ppc64le_python3.8.____cpythonpython_implcpython: CONFIG: linux_ppc64le_python3.8.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 3cdec6c..6abac39 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -8,12 +8,6 @@ jobs: vmImage: macOS-10.15 strategy: matrix: - osx_64_python3.7.____73_pypypython_implpypy: - CONFIG: osx_64_python3.7.____73_pypypython_implpypy - UPLOAD_PACKAGES: 'True' - osx_64_python3.7.____cpythonpython_implcpython: - CONFIG: osx_64_python3.7.____cpythonpython_implcpython - UPLOAD_PACKAGES: 'True' osx_64_python3.8.____cpythonpython_implcpython: CONFIG: osx_64_python3.8.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 3e52c5e..09491b2 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -8,12 +8,6 @@ jobs: vmImage: windows-2019 strategy: matrix: - win_64_python3.7.____73_pypypython_implpypy: - CONFIG: win_64_python3.7.____73_pypypython_implpypy - UPLOAD_PACKAGES: 'True' - win_64_python3.7.____cpythonpython_implcpython: - CONFIG: win_64_python3.7.____cpythonpython_implcpython - UPLOAD_PACKAGES: 'True' win_64_python3.8.____cpythonpython_implcpython: CONFIG: win_64_python3.8.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' @@ -58,10 +52,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_python3.7.____73_pypypython_implpypy.yaml b/.ci_support/linux_64_python3.7.____73_pypypython_implpypy.yaml deleted file mode 100644 index fa06293..0000000 --- a/.ci_support/linux_64_python3.7.____73_pypypython_implpypy.yaml +++ /dev/null @@ -1,28 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '9' -cdt_name: -- cos6 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -numpy: -- '1.19' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.7.* *_73_pypy -python_impl: -- pypy -target_platform: -- linux-64 -zip_keys: -- - python - - numpy - - python_impl diff --git a/.ci_support/linux_64_python3.7.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_python3.7.____cpythonpython_implcpython.yaml deleted file mode 100644 index a418ad6..0000000 --- a/.ci_support/linux_64_python3.7.____cpythonpython_implcpython.yaml +++ /dev/null @@ -1,28 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '9' -cdt_name: -- cos6 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -numpy: -- '1.18' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.7.* *_cpython -python_impl: -- cpython -target_platform: -- linux-64 -zip_keys: -- - python - - numpy - - python_impl diff --git a/.ci_support/linux_64_python3.8.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_python3.8.____cpythonpython_implcpython.yaml index eb1cd77..6342653 100644 --- a/.ci_support/linux_64_python3.8.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_64_python3.8.____cpythonpython_implcpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '9' +- '10' cdt_name: - cos6 channel_sources: @@ -11,7 +11,7 @@ channel_targets: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: -- '1.18' +- '1.19' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_64_python3.9.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_python3.9.____cpythonpython_implcpython.yaml index f09456b..5f81b7f 100644 --- a/.ci_support/linux_64_python3.9.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_64_python3.9.____cpythonpython_implcpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '9' +- '10' cdt_name: - cos6 channel_sources: diff --git a/.ci_support/linux_aarch64_python3.7.____73_pypypython_implpypy.yaml b/.ci_support/linux_aarch64_python3.7.____73_pypypython_implpypy.yaml deleted file mode 100644 index 4bb3a35..0000000 --- a/.ci_support/linux_aarch64_python3.7.____73_pypypython_implpypy.yaml +++ /dev/null @@ -1,32 +0,0 @@ -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 -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 -python_impl: -- pypy -target_platform: -- linux-aarch64 -zip_keys: -- - python - - numpy - - python_impl diff --git a/.ci_support/linux_aarch64_python3.7.____cpythonpython_implcpython.yaml b/.ci_support/linux_aarch64_python3.7.____cpythonpython_implcpython.yaml deleted file mode 100644 index c0dfdc1..0000000 --- a/.ci_support/linux_aarch64_python3.7.____cpythonpython_implcpython.yaml +++ /dev/null @@ -1,32 +0,0 @@ -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 -docker_image: -- quay.io/condaforge/linux-anvil-aarch64 -numpy: -- '1.18' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.7.* *_cpython -python_impl: -- cpython -target_platform: -- linux-aarch64 -zip_keys: -- - python - - numpy - - python_impl diff --git a/.ci_support/linux_aarch64_python3.8.____cpythonpython_implcpython.yaml b/.ci_support/linux_aarch64_python3.8.____cpythonpython_implcpython.yaml index 2dfe28b..d6cff71 100644 --- a/.ci_support/linux_aarch64_python3.8.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_aarch64_python3.8.____cpythonpython_implcpython.yaml @@ -3,7 +3,7 @@ BUILD: c_compiler: - gcc c_compiler_version: -- '9' +- '10' cdt_arch: - aarch64 cdt_name: @@ -15,7 +15,7 @@ channel_targets: docker_image: - quay.io/condaforge/linux-anvil-aarch64 numpy: -- '1.18' +- '1.19' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_aarch64_python3.9.____cpythonpython_implcpython.yaml b/.ci_support/linux_aarch64_python3.9.____cpythonpython_implcpython.yaml index aa9030b..26da6aa 100644 --- a/.ci_support/linux_aarch64_python3.9.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_aarch64_python3.9.____cpythonpython_implcpython.yaml @@ -3,7 +3,7 @@ BUILD: c_compiler: - gcc c_compiler_version: -- '9' +- '10' cdt_arch: - aarch64 cdt_name: diff --git a/.ci_support/linux_ppc64le_python3.7.____73_pypypython_implpypy.yaml b/.ci_support/linux_ppc64le_python3.7.____73_pypypython_implpypy.yaml deleted file mode 100644 index 2f86d24..0000000 --- a/.ci_support/linux_ppc64le_python3.7.____73_pypypython_implpypy.yaml +++ /dev/null @@ -1,28 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '9' -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -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 -python_impl: -- pypy -target_platform: -- linux-ppc64le -zip_keys: -- - python - - numpy - - python_impl diff --git a/.ci_support/linux_ppc64le_python3.7.____cpythonpython_implcpython.yaml b/.ci_support/linux_ppc64le_python3.7.____cpythonpython_implcpython.yaml deleted file mode 100644 index d4b9d1a..0000000 --- a/.ci_support/linux_ppc64le_python3.7.____cpythonpython_implcpython.yaml +++ /dev/null @@ -1,28 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '9' -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -docker_image: -- quay.io/condaforge/linux-anvil-ppc64le -numpy: -- '1.18' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.7.* *_cpython -python_impl: -- cpython -target_platform: -- linux-ppc64le -zip_keys: -- - python - - numpy - - python_impl diff --git a/.ci_support/linux_ppc64le_python3.8.____cpythonpython_implcpython.yaml b/.ci_support/linux_ppc64le_python3.8.____cpythonpython_implcpython.yaml index 0b5e6e0..260e55a 100644 --- a/.ci_support/linux_ppc64le_python3.8.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_ppc64le_python3.8.____cpythonpython_implcpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '9' +- '10' cdt_name: - cos7 channel_sources: @@ -11,7 +11,7 @@ channel_targets: docker_image: - quay.io/condaforge/linux-anvil-ppc64le numpy: -- '1.18' +- '1.19' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_ppc64le_python3.9.____cpythonpython_implcpython.yaml b/.ci_support/linux_ppc64le_python3.9.____cpythonpython_implcpython.yaml index c64d459..30e09e1 100644 --- a/.ci_support/linux_ppc64le_python3.9.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_ppc64le_python3.9.____cpythonpython_implcpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '9' +- '10' cdt_name: - cos7 channel_sources: diff --git a/.ci_support/osx_64_python3.7.____73_pypypython_implpypy.yaml b/.ci_support/osx_64_python3.7.____73_pypypython_implpypy.yaml deleted file mode 100644 index 983bc76..0000000 --- a/.ci_support/osx_64_python3.7.____73_pypypython_implpypy.yaml +++ /dev/null @@ -1,28 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.9' -c_compiler: -- clang -c_compiler_version: -- '11' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -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 -python_impl: -- pypy -target_platform: -- osx-64 -zip_keys: -- - python - - numpy - - python_impl diff --git a/.ci_support/osx_64_python3.7.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_python3.7.____cpythonpython_implcpython.yaml deleted file mode 100644 index 4e16c1c..0000000 --- a/.ci_support/osx_64_python3.7.____cpythonpython_implcpython.yaml +++ /dev/null @@ -1,28 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.9' -c_compiler: -- clang -c_compiler_version: -- '11' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -macos_machine: -- x86_64-apple-darwin13.4.0 -numpy: -- '1.18' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.7.* *_cpython -python_impl: -- cpython -target_platform: -- osx-64 -zip_keys: -- - python - - numpy - - python_impl diff --git a/.ci_support/osx_64_python3.8.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_python3.8.____cpythonpython_implcpython.yaml index 4c9308f..8ae8ea1 100644 --- a/.ci_support/osx_64_python3.8.____cpythonpython_implcpython.yaml +++ b/.ci_support/osx_64_python3.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: @@ -11,7 +11,7 @@ channel_targets: macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.18' +- '1.19' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_64_python3.9.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_python3.9.____cpythonpython_implcpython.yaml index a238c5c..87fa16c 100644 --- a/.ci_support/osx_64_python3.9.____cpythonpython_implcpython.yaml +++ b/.ci_support/osx_64_python3.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: diff --git a/.ci_support/osx_arm64_python3.8.____cpython.yaml b/.ci_support/osx_arm64_python3.8.____cpython.yaml index 5c73bd8..66988fd 100644 --- a/.ci_support/osx_arm64_python3.8.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.8.____cpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '11' +- '12' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_arm64_python3.9.____cpython.yaml b/.ci_support/osx_arm64_python3.9.____cpython.yaml index fffa1d3..528c7b7 100644 --- a/.ci_support/osx_arm64_python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.9.____cpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '11' +- '12' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/win_64_python3.7.____73_pypypython_implpypy.yaml b/.ci_support/win_64_python3.7.____73_pypypython_implpypy.yaml deleted file mode 100644 index 9036dd5..0000000 --- a/.ci_support/win_64_python3.7.____73_pypypython_implpypy.yaml +++ /dev/null @@ -1,22 +0,0 @@ -c_compiler: -- vs2017 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -numpy: -- '1.19' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.7.* *_73_pypy -python_impl: -- pypy -target_platform: -- win-64 -zip_keys: -- - python - - numpy - - python_impl diff --git a/.ci_support/win_64_python3.7.____cpythonpython_implcpython.yaml b/.ci_support/win_64_python3.7.____cpythonpython_implcpython.yaml deleted file mode 100644 index 41a0b52..0000000 --- a/.ci_support/win_64_python3.7.____cpythonpython_implcpython.yaml +++ /dev/null @@ -1,22 +0,0 @@ -c_compiler: -- vs2017 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -numpy: -- '1.18' -pin_run_as_build: - python: - min_pin: x.x - 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_python3.8.____cpythonpython_implcpython.yaml b/.ci_support/win_64_python3.8.____cpythonpython_implcpython.yaml index 8a0f25c..631c135 100644 --- a/.ci_support/win_64_python3.8.____cpythonpython_implcpython.yaml +++ b/.ci_support/win_64_python3.8.____cpythonpython_implcpython.yaml @@ -5,7 +5,7 @@ channel_sources: channel_targets: - conda-forge main numpy: -- '1.18' +- '1.19' pin_run_as_build: python: min_pin: x.x 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 b3d5b81..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}" 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 6774b01..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,7 +53,6 @@ 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 @@ -59,17 +60,32 @@ if [[ "${HOST_PLATFORM}" != "${BUILD_PLATFORM}" ]]; then EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" fi -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 -validate_recipe_outputs "${FEEDSTOCK_NAME}" +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 -( endgroup "Validating outputs" ) 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 -( startgroup "Uploading packages" ) 2> /dev/null + validate_recipe_outputs "${FEEDSTOCK_NAME}" -if [[ "${UPLOAD_PACKAGES}" != "False" ]] && [[ "${IS_PR_BUILD}" == "False" ]]; then - upload_package --validate --feedstock-name="${FEEDSTOCK_NAME}" ./ ./recipe ./.ci_support/${CONFIG}.yaml -fi + ( 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 72ad5e9..e4d69ed 100644 --- a/README.md +++ b/README.md @@ -36,20 +36,6 @@ Current build status - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
VariantStatus
linux_64_python3.7.____73_pypypython_implpypy - - variant - -
linux_64_python3.7.____cpythonpython_implcpython - - variant - -
linux_64_python3.8.____cpythonpython_implcpython @@ -63,20 +49,6 @@ Current build status variant
linux_aarch64_python3.7.____73_pypypython_implpypy - - variant - -
linux_aarch64_python3.7.____cpythonpython_implcpython - - variant - -
linux_aarch64_python3.8.____cpythonpython_implcpython @@ -91,20 +63,6 @@ Current build status variant
linux_ppc64le_python3.7.____73_pypypython_implpypy - - variant - -
linux_ppc64le_python3.7.____cpythonpython_implcpython - - variant - -
linux_ppc64le_python3.8.____cpythonpython_implcpython @@ -119,20 +77,6 @@ Current build status variant
osx_64_python3.7.____73_pypypython_implpypy - - variant - -
osx_64_python3.7.____cpythonpython_implcpython - - variant - -
osx_64_python3.8.____cpythonpython_implcpython @@ -161,20 +105,6 @@ Current build status variant
win_64_python3.7.____73_pypypython_implpypy - - variant - -
win_64_python3.7.____cpythonpython_implcpython - - variant - -
win_64_python3.8.____cpythonpython_implcpython 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/recipe/meta.yaml b/recipe/meta.yaml index e8f64a1..aa9083b 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,5 @@ {% set name = "regions" %} -{% set version = "0.5" %} +{% set version = "0.6" %} package: name: {{ name|lower }} @@ -8,19 +8,15 @@ package: source: fn: {{ name }}-{{ version }}.tar.gz url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ version }}.tar.gz - sha256: ac89875ac8b52277322a54e952d3bd7d1f48510aaf342354e07df005996459ae + sha256: 80328580ae254f848db44048bc711365cab8dcfe47fa00b309ed35c27b5f255d build: number: 0 script: {{ PYTHON }} -m pip install . -vv - skip: true # [py<37] + skip: true # [py<38] requirements: build: - - python # [build_platform != target_platform] - - cross-python_{{ target_platform }} # [build_platform != target_platform] - - cython # [build_platform != target_platform] - - numpy # [build_platform != target_platform] - python # [build_platform != target_platform] - cross-python_{{ target_platform }} # [build_platform != target_platform] - cython # [build_platform != target_platform] @@ -33,15 +29,15 @@ requirements: - setuptools_scm - cython >=0.29.22 - extension-helpers - - numpy 1.16.* # [py<39 and build_platform == target_platform and python_impl == 'cpython'] + - numpy 1.18.* # [py<39 and build_platform == target_platform and python_impl == 'cpython'] - numpy # [py>=39 or build_platform != target_platform or python_impl == 'pypy'] - - astropy >=3.2 + - astropy >=5.0 run: - python - {{ pin_compatible('numpy') }} - - numpy >=1.16 - - astropy >=3.2 - - matplotlib-base >=2.0 + - numpy >=1.18 + - astropy >=5.0 + - matplotlib-base >=3.1 - pytest-astropy >=0.4 - pytest-arraydiff >=0.3