diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 7177637..79a0360 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,22 +8,22 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_numpy1.18python3.7.____cpython: - CONFIG: linux_64_numpy1.18python3.7.____cpython + linux_64_numpy1.19python3.7.____cpython: + CONFIG: linux_64_numpy1.19python3.7.____cpython UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 - linux_64_numpy1.18python3.8.____cpython: - CONFIG: linux_64_numpy1.18python3.8.____cpython + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_64_numpy1.19python3.8.____cpython: + CONFIG: linux_64_numpy1.19python3.8.____cpython UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_64_numpy1.19python3.9.____cpython: CONFIG: linux_64_numpy1.19python3.9.____cpython UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_64_numpy1.21python3.10.____cpython: CONFIG: linux_64_numpy1.21python3.10.____cpython UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 timeoutInMinutes: 360 steps: diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 7d1f525..4eff220 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -8,11 +8,11 @@ jobs: vmImage: macOS-10.15 strategy: matrix: - osx_64_numpy1.18python3.7.____cpython: - CONFIG: osx_64_numpy1.18python3.7.____cpython + osx_64_numpy1.19python3.7.____cpython: + CONFIG: osx_64_numpy1.19python3.7.____cpython UPLOAD_PACKAGES: 'True' - osx_64_numpy1.18python3.8.____cpython: - CONFIG: osx_64_numpy1.18python3.8.____cpython + osx_64_numpy1.19python3.8.____cpython: + CONFIG: osx_64_numpy1.19python3.8.____cpython UPLOAD_PACKAGES: 'True' osx_64_numpy1.19python3.9.____cpython: CONFIG: osx_64_numpy1.19python3.9.____cpython diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 7396461..9c4f4f7 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -5,14 +5,14 @@ jobs: - job: win pool: - vmImage: vs2017-win2016 + vmImage: windows-2019 strategy: matrix: - win_64_numpy1.18python3.7.____cpython: - CONFIG: win_64_numpy1.18python3.7.____cpython + win_64_numpy1.19python3.7.____cpython: + CONFIG: win_64_numpy1.19python3.7.____cpython UPLOAD_PACKAGES: 'True' - win_64_numpy1.18python3.8.____cpython: - CONFIG: win_64_numpy1.18python3.8.____cpython + win_64_numpy1.19python3.8.____cpython: + CONFIG: win_64_numpy1.19python3.8.____cpython UPLOAD_PACKAGES: 'True' win_64_numpy1.19python3.9.____cpython: CONFIG: win_64_numpy1.19python3.9.____cpython @@ -58,10 +58,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.19python3.7.____cpython.yaml similarity index 79% rename from .ci_support/linux_64_numpy1.18python3.7.____cpython.yaml rename to .ci_support/linux_64_numpy1.19python3.7.____cpython.yaml index 03e000c..b4240b1 100644 --- a/.ci_support/linux_64_numpy1.18python3.7.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.19python3.7.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '9' +- '10' cdt_name: - cos6 channel_sources: @@ -9,9 +9,9 @@ channel_sources: channel_targets: - conda-forge main docker_image: -- quay.io/condaforge/linux-anvil-comp7 +- quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: -- '1.18' +- '1.19' pin_run_as_build: python: min_pin: x.x @@ -23,8 +23,6 @@ python_impl: target_platform: - linux-64 zip_keys: -- - cdt_name - - docker_image - - python - numpy - python_impl diff --git a/.ci_support/linux_64_numpy1.18python3.8.____cpython.yaml b/.ci_support/linux_64_numpy1.19python3.8.____cpython.yaml similarity index 79% rename from .ci_support/linux_64_numpy1.18python3.8.____cpython.yaml rename to .ci_support/linux_64_numpy1.19python3.8.____cpython.yaml index 39dfd08..6342653 100644 --- a/.ci_support/linux_64_numpy1.18python3.8.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.19python3.8.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '9' +- '10' cdt_name: - cos6 channel_sources: @@ -9,9 +9,9 @@ channel_sources: channel_targets: - conda-forge main docker_image: -- quay.io/condaforge/linux-anvil-comp7 +- quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: -- '1.18' +- '1.19' pin_run_as_build: python: min_pin: x.x @@ -23,8 +23,6 @@ python_impl: target_platform: - linux-64 zip_keys: -- - cdt_name - - docker_image - - python - numpy - python_impl diff --git a/.ci_support/linux_64_numpy1.19python3.9.____cpython.yaml b/.ci_support/linux_64_numpy1.19python3.9.____cpython.yaml index a9205c3..5f81b7f 100644 --- a/.ci_support/linux_64_numpy1.19python3.9.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.19python3.9.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '9' +- '10' cdt_name: - cos6 channel_sources: @@ -9,7 +9,7 @@ channel_sources: channel_targets: - conda-forge main docker_image: -- quay.io/condaforge/linux-anvil-comp7 +- quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: - '1.19' pin_run_as_build: @@ -23,8 +23,6 @@ python_impl: target_platform: - linux-64 zip_keys: -- - cdt_name - - docker_image - - python - numpy - python_impl diff --git a/.ci_support/linux_64_numpy1.21python3.10.____cpython.yaml b/.ci_support/linux_64_numpy1.21python3.10.____cpython.yaml index e902827..bfa07fa 100644 --- a/.ci_support/linux_64_numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.21python3.10.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '9' +- '10' cdt_name: - cos6 channel_sources: @@ -9,7 +9,7 @@ channel_sources: channel_targets: - conda-forge main docker_image: -- quay.io/condaforge/linux-anvil-comp7 +- quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: - '1.21' pin_run_as_build: @@ -23,8 +23,6 @@ python_impl: target_platform: - linux-64 zip_keys: -- - cdt_name - - docker_image - - python - numpy - python_impl diff --git a/.ci_support/osx_64_numpy1.18python3.7.____cpython.yaml b/.ci_support/osx_64_numpy1.19python3.7.____cpython.yaml similarity index 95% rename from .ci_support/osx_64_numpy1.18python3.7.____cpython.yaml rename to .ci_support/osx_64_numpy1.19python3.7.____cpython.yaml index 4e16c1c..ef8c83f 100644 --- a/.ci_support/osx_64_numpy1.18python3.7.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.19python3.7.____cpython.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_numpy1.18python3.8.____cpython.yaml b/.ci_support/osx_64_numpy1.19python3.8.____cpython.yaml similarity index 95% rename from .ci_support/osx_64_numpy1.18python3.8.____cpython.yaml rename to .ci_support/osx_64_numpy1.19python3.8.____cpython.yaml index 4c9308f..8ae8ea1 100644 --- a/.ci_support/osx_64_numpy1.18python3.8.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.19python3.8.____cpython.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_numpy1.19python3.9.____cpython.yaml b/.ci_support/osx_64_numpy1.19python3.9.____cpython.yaml index a238c5c..87fa16c 100644 --- a/.ci_support/osx_64_numpy1.19python3.9.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.19python3.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/osx_64_numpy1.21python3.10.____cpython.yaml b/.ci_support/osx_64_numpy1.21python3.10.____cpython.yaml index 110caf6..59d0a95 100644 --- a/.ci_support/osx_64_numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.21python3.10.____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_numpy1.18python3.7.____cpython.yaml b/.ci_support/win_64_numpy1.19python3.7.____cpython.yaml similarity index 96% rename from .ci_support/win_64_numpy1.18python3.7.____cpython.yaml rename to .ci_support/win_64_numpy1.19python3.7.____cpython.yaml index 41a0b52..c482a8f 100644 --- a/.ci_support/win_64_numpy1.18python3.7.____cpython.yaml +++ b/.ci_support/win_64_numpy1.19python3.7.____cpython.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/.ci_support/win_64_numpy1.18python3.8.____cpython.yaml b/.ci_support/win_64_numpy1.19python3.8.____cpython.yaml similarity index 96% rename from .ci_support/win_64_numpy1.18python3.8.____cpython.yaml rename to .ci_support/win_64_numpy1.19python3.8.____cpython.yaml index 8a0f25c..631c135 100644 --- a/.ci_support/win_64_numpy1.18python3.8.____cpython.yaml +++ b/.ci_support/win_64_numpy1.19python3.8.____cpython.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 92125dd..c9590a3 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -5,6 +5,8 @@ # changes to this script, consider a proposal to conda-smithy so that other feedstocks can also # benefit from the improvement. +# -*- mode: jinja-shell -*- + set -xeuo pipefail export FEEDSTOCK_ROOT="${FEEDSTOCK_ROOT:-/home/conda/feedstock_root}" source ${FEEDSTOCK_ROOT}/.scripts/logging_utils.sh @@ -25,10 +27,12 @@ conda-build: root-dir: ${FEEDSTOCK_ROOT}/build_artifacts CONDARC -GET_BOA=boa -BUILD_CMD=mambabuild -conda install --yes --quiet "conda-forge-ci-setup=3" conda-build pip ${GET_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}" @@ -61,7 +65,7 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then # Drop into an interactive shell /bin/bash else - conda $BUILD_CMD "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ + conda mambabuild "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" ( startgroup "Validating outputs" ) 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 d6de123..19843e0 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +# -*- mode: jinja-shell -*- + source .scripts/logging_utils.sh set -xe @@ -9,7 +11,7 @@ MINIFORGE_HOME=${MINIFORGE_HOME:-${HOME}/miniforge3} ( startgroup "Installing a fresh version of Miniforge" ) 2> /dev/null MINIFORGE_URL="https://github.com/conda-forge/miniforge/releases/latest/download" -MINIFORGE_FILE="Miniforge3-MacOSX-$(uname -m).sh" +MINIFORGE_FILE="Mambaforge-MacOSX-$(uname -m).sh" curl -L -O "${MINIFORGE_URL}/${MINIFORGE_FILE}" rm -rf ${MINIFORGE_HOME} bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} @@ -18,14 +20,14 @@ bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} ( startgroup "Configuring conda" ) 2> /dev/null -GET_BOA=boa -BUILD_CMD=mambabuild - source ${MINIFORGE_HOME}/etc/profile.d/conda.sh conda activate base -echo -e "\n\nInstalling conda-forge-ci-setup=3 and conda-build." -conda install -n base --quiet --yes "conda-forge-ci-setup=3" conda-build pip ${GET_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,35 @@ 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 $BUILD_CMD ./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/LICENSE.txt b/LICENSE.txt index ed3f451..6ec1401 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,5 +1,5 @@ BSD 3-clause license -Copyright (c) 2015-2021, conda-forge contributors +Copyright (c) 2015-2022, conda-forge contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/README.md b/README.md index 6056c2c..930120b 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Home: https://johannesbuchner.github.io/UltraNest/ Package license: AGPL-3.0-or-later -Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/ultranest-feedstock/blob/master/LICENSE.txt) +Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/ultranest-feedstock/blob/main/LICENSE.txt) Summary: Fit and compare complex models reliably and rapidly. Advanced Nested Sampling. @@ -31,94 +31,94 @@ Current build status
- - + + - + - + - + - + - + - + @@ -146,18 +146,43 @@ conda config --add channels conda-forge conda config --set channel_priority strict ``` -Once the `conda-forge` channel has been enabled, `ultranest` can be installed with: +Once the `conda-forge` channel has been enabled, `ultranest` can be installed with `conda`: ``` conda install ultranest ``` -It is possible to list all of the versions of `ultranest` available on your platform with: +or with `mamba`: + +``` +mamba install ultranest +``` + +It is possible to list all of the versions of `ultranest` available on your platform with `conda`: ``` conda search ultranest --channel conda-forge ``` +or with `mamba`: + +``` +mamba search ultranest --channel conda-forge +``` + +Alternatively, `mamba repoquery` may provide more information: + +``` +# Search all versions available on your platform: +mamba repoquery search ultranest --channel conda-forge + +# List packages depending on `ultranest`: +mamba repoquery whoneeds ultranest --channel conda-forge + +# List dependencies of `ultranest`: +mamba repoquery depends ultranest --channel conda-forge +``` + About conda-forge ================= @@ -173,10 +198,12 @@ for each of the installable packages. Such a repository is known as a *feedstock A feedstock is made up of a conda recipe (the instructions on what and how to build the package) and the necessary configurations for automatic building using freely available continuous integration services. Thanks to the awesome service provided by -[CircleCI](https://circleci.com/), [AppVeyor](https://www.appveyor.com/) -and [TravisCI](https://travis-ci.com/) it is possible to build and upload installable -packages to the [conda-forge](https://anaconda.org/conda-forge) -[Anaconda-Cloud](https://anaconda.org/) channel for Linux, Windows and OSX respectively. +[Azure](https://azure.microsoft.com/en-us/services/devops/), [GitHub](https://github.com/), +[CircleCI](https://circleci.com/), [AppVeyor](https://www.appveyor.com/), +[Drone](https://cloud.drone.io/welcome), and [TravisCI](https://travis-ci.com/) +it is possible to build and upload installable packages to the +[conda-forge](https://anaconda.org/conda-forge) [Anaconda-Cloud](https://anaconda.org/) +channel for Linux, Windows and OSX respectively. To manage the continuous integration and simplify feedstock maintenance [conda-smithy](https://github.com/conda-forge/conda-smithy) has been developed. 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 063e5d2..e448cf7 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,5 @@ {% set name = "ultranest" %} -{% set version = "3.3.3" %} +{% set version = "3.4.4" %} package: name: {{ name|lower }} @@ -7,19 +7,18 @@ package: source: url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ version }}.tar.gz - sha256: e66e90ec9e933364ad0dee48a84236186979c663b640d55fdfb758618fd06aa6 + sha256: 1afded4122646a20abce54effdbf442a1a20891b302aeb4a75ac856b0c42a052 build: - number: 1 + number: 0 # may need to later add "skip: True # [win]" to disable Windows. skip: true # [py<30 or python_impl == "pypy"] - script: {{ PYTHON }} -m pip install . -vv + script: + - {{ PYTHON }} -m pip install . -vv requirements: build: - # cython project, so need a compiler - {{ compiler('c') }} - - cython host: - python - pip
VariantStatus
linux_64_numpy1.18python3.7.____cpythonlinux_64_numpy1.19python3.7.____cpython - - variant + + variant
linux_64_numpy1.18python3.8.____cpythonlinux_64_numpy1.19python3.8.____cpython - - variant + + variant
linux_64_numpy1.19python3.9.____cpython - - variant + + variant
linux_64_numpy1.21python3.10.____cpython - - variant + + variant
osx_64_numpy1.18python3.7.____cpythonosx_64_numpy1.19python3.7.____cpython - - variant + + variant
osx_64_numpy1.18python3.8.____cpythonosx_64_numpy1.19python3.8.____cpython - - variant + + variant
osx_64_numpy1.19python3.9.____cpython - - variant + + variant
osx_64_numpy1.21python3.10.____cpython - - variant + + variant
win_64_numpy1.18python3.7.____cpythonwin_64_numpy1.19python3.7.____cpython - - variant + + variant
win_64_numpy1.18python3.8.____cpythonwin_64_numpy1.19python3.8.____cpython - - variant + + variant
win_64_numpy1.19python3.9.____cpython - - variant + + variant
win_64_numpy1.21python3.10.____cpython - - variant + + variant