diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index caf0952e..a8a91b44 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -81,6 +81,9 @@ jobs: - script: | export CI=azure + export flow_run_id=azure_$(Build.BuildNumber).$(System.JobAttempt) + export remote_url=$(Build.Repository.Uri) + export sha=$(Build.SourceVersion) export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME}) if [[ "${BUILD_REASON:-}" == "PullRequest" ]]; then diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 884cc4b9..b7949df5 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -41,6 +41,9 @@ jobs: # TODO: Fast finish on azure pipelines? - script: | export CI=azure + export flow_run_id=azure_$(Build.BuildNumber).$(System.JobAttempt) + export remote_url=$(Build.Repository.Uri) + export sha=$(Build.SourceVersion) export OSX_FORCE_SDK_DOWNLOAD="1" export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME}) diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 61b58a9e..512f059c 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -55,6 +55,9 @@ jobs: PYTHONUNBUFFERED: 1 CONFIG: $(CONFIG) CI: azure + flow_run_id: azure_$(Build.BuildNumber).$(System.JobAttempt) + remote_url: $(Build.Repository.Uri) + sha: $(Build.SourceVersion) UPLOAD_PACKAGES: $(UPLOAD_PACKAGES) UPLOAD_TEMP: $(UPLOAD_TEMP) BINSTAR_TOKEN: $(BINSTAR_TOKEN) diff --git a/.ci_support/linux_64_numpy1.22python3.10.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_numpy1.22python3.10.____cpythonpython_implcpython.yaml index 138d437b..fde8762e 100644 --- a/.ci_support/linux_64_numpy1.22python3.10.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.10.____cpythonpython_implcpython.yaml @@ -43,4 +43,3 @@ zip_keys: - - python - numpy - python_impl - - channel_sources diff --git a/.ci_support/linux_64_numpy1.22python3.9.____73_pypypython_implpypy.yaml b/.ci_support/linux_64_numpy1.22python3.9.____73_pypypython_implpypy.yaml index 0056d0eb..25056690 100644 --- a/.ci_support/linux_64_numpy1.22python3.9.____73_pypypython_implpypy.yaml +++ b/.ci_support/linux_64_numpy1.22python3.9.____73_pypypython_implpypy.yaml @@ -43,4 +43,3 @@ zip_keys: - - python - numpy - python_impl - - channel_sources diff --git a/.ci_support/linux_64_numpy1.22python3.9.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_numpy1.22python3.9.____cpythonpython_implcpython.yaml index ddebd1e6..e88fa4ea 100644 --- a/.ci_support/linux_64_numpy1.22python3.9.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.9.____cpythonpython_implcpython.yaml @@ -43,4 +43,3 @@ zip_keys: - - python - numpy - python_impl - - channel_sources diff --git a/.ci_support/linux_64_numpy1.23python3.11.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_numpy1.23python3.11.____cpythonpython_implcpython.yaml index 0fda87ef..db909ac3 100644 --- a/.ci_support/linux_64_numpy1.23python3.11.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_64_numpy1.23python3.11.____cpythonpython_implcpython.yaml @@ -43,4 +43,3 @@ zip_keys: - - python - numpy - python_impl - - channel_sources diff --git a/.ci_support/linux_64_numpy1.26python3.12.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_numpy1.26python3.12.____cpythonpython_implcpython.yaml index a67d9853..83d1af30 100644 --- a/.ci_support/linux_64_numpy1.26python3.12.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_64_numpy1.26python3.12.____cpythonpython_implcpython.yaml @@ -5,7 +5,7 @@ c_compiler_version: cdt_name: - cos6 channel_sources: -- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -43,4 +43,3 @@ zip_keys: - - python - numpy - python_impl - - channel_sources diff --git a/.ci_support/linux_aarch64_numpy1.22python3.10.____cpythonpython_implcpython.yaml b/.ci_support/linux_aarch64_numpy1.22python3.10.____cpythonpython_implcpython.yaml index eee5e6a1..79bfc9a4 100644 --- a/.ci_support/linux_aarch64_numpy1.22python3.10.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.10.____cpythonpython_implcpython.yaml @@ -47,4 +47,3 @@ zip_keys: - - python - numpy - python_impl - - channel_sources diff --git a/.ci_support/linux_aarch64_numpy1.22python3.9.____73_pypypython_implpypy.yaml b/.ci_support/linux_aarch64_numpy1.22python3.9.____73_pypypython_implpypy.yaml index cb58a590..2f0c61e6 100644 --- a/.ci_support/linux_aarch64_numpy1.22python3.9.____73_pypypython_implpypy.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.9.____73_pypypython_implpypy.yaml @@ -47,4 +47,3 @@ zip_keys: - - python - numpy - python_impl - - channel_sources diff --git a/.ci_support/linux_aarch64_numpy1.22python3.9.____cpythonpython_implcpython.yaml b/.ci_support/linux_aarch64_numpy1.22python3.9.____cpythonpython_implcpython.yaml index d152ecef..ecaa21b9 100644 --- a/.ci_support/linux_aarch64_numpy1.22python3.9.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.9.____cpythonpython_implcpython.yaml @@ -47,4 +47,3 @@ zip_keys: - - python - numpy - python_impl - - channel_sources diff --git a/.ci_support/linux_aarch64_numpy1.23python3.11.____cpythonpython_implcpython.yaml b/.ci_support/linux_aarch64_numpy1.23python3.11.____cpythonpython_implcpython.yaml index 61d2bc2e..7f19a9e1 100644 --- a/.ci_support/linux_aarch64_numpy1.23python3.11.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.23python3.11.____cpythonpython_implcpython.yaml @@ -47,4 +47,3 @@ zip_keys: - - python - numpy - python_impl - - channel_sources diff --git a/.ci_support/linux_aarch64_numpy1.26python3.12.____cpythonpython_implcpython.yaml b/.ci_support/linux_aarch64_numpy1.26python3.12.____cpythonpython_implcpython.yaml index 1e793b0b..e64febd6 100644 --- a/.ci_support/linux_aarch64_numpy1.26python3.12.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.26python3.12.____cpythonpython_implcpython.yaml @@ -9,7 +9,7 @@ cdt_arch: cdt_name: - cos7 channel_sources: -- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -47,4 +47,3 @@ zip_keys: - - python - numpy - python_impl - - channel_sources diff --git a/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpythonpython_implcpython.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpythonpython_implcpython.yaml index 918c94c6..e9c81a3d 100644 --- a/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpythonpython_implcpython.yaml @@ -43,4 +43,3 @@ zip_keys: - - python - numpy - python_impl - - channel_sources diff --git a/.ci_support/linux_ppc64le_numpy1.22python3.9.____73_pypypython_implpypy.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.9.____73_pypypython_implpypy.yaml index 20b8d059..259e2e94 100644 --- a/.ci_support/linux_ppc64le_numpy1.22python3.9.____73_pypypython_implpypy.yaml +++ b/.ci_support/linux_ppc64le_numpy1.22python3.9.____73_pypypython_implpypy.yaml @@ -43,4 +43,3 @@ zip_keys: - - python - numpy - python_impl - - channel_sources diff --git a/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpythonpython_implcpython.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpythonpython_implcpython.yaml index 62ae766c..6439e4a9 100644 --- a/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpythonpython_implcpython.yaml @@ -43,4 +43,3 @@ zip_keys: - - python - numpy - python_impl - - channel_sources diff --git a/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpythonpython_implcpython.yaml b/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpythonpython_implcpython.yaml index 7b27e6fa..9bae5f05 100644 --- a/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpythonpython_implcpython.yaml @@ -43,4 +43,3 @@ zip_keys: - - python - numpy - python_impl - - channel_sources diff --git a/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpythonpython_implcpython.yaml b/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpythonpython_implcpython.yaml index 36bf71b3..b5f78110 100644 --- a/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpythonpython_implcpython.yaml @@ -5,7 +5,7 @@ c_compiler_version: cdt_name: - cos7 channel_sources: -- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -43,4 +43,3 @@ zip_keys: - - python - numpy - python_impl - - channel_sources diff --git a/.ci_support/migrations/python311.yaml b/.ci_support/migrations/python311.yaml deleted file mode 100644 index a75ff43b..00000000 --- a/.ci_support/migrations/python311.yaml +++ /dev/null @@ -1,37 +0,0 @@ -migrator_ts: 1666686085 -__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.10.* *_cpython - - 3.11.* *_cpython # new entry - - 3.6.* *_73_pypy - - 3.7.* *_73_pypy - - 3.8.* *_73_pypy - - 3.9.* *_73_pypy - paused: false - longterm: True - pr_limit: 5 - max_solver_attempts: 10 # this will make the bot retry "not solvable" stuff 10 times - exclude: - # this shouldn't attempt to modify the python feedstocks - - python - - pypy3.6 - - pypy-meta - - cross-python - - python_abi - exclude_pinned_pkgs: false - -python: - - 3.11.* *_cpython -# additional entries to add for zip_keys -numpy: - - 1.23 -python_impl: - - cpython diff --git a/.ci_support/osx_64_numpy1.22python3.10.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_numpy1.22python3.10.____cpythonpython_implcpython.yaml index 2e45d979..ce52af5a 100644 --- a/.ci_support/osx_64_numpy1.22python3.10.____cpythonpython_implcpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.10.____cpythonpython_implcpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '15' +- '16' channel_sources: - conda-forge channel_targets: @@ -11,7 +11,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' libblas: - 3.9 *netlib libcblas: @@ -38,4 +38,3 @@ zip_keys: - - python - numpy - python_impl - - channel_sources diff --git a/.ci_support/osx_64_numpy1.22python3.9.____73_pypypython_implpypy.yaml b/.ci_support/osx_64_numpy1.22python3.9.____73_pypypython_implpypy.yaml index 3f245af1..b0cdf0c9 100644 --- a/.ci_support/osx_64_numpy1.22python3.9.____73_pypypython_implpypy.yaml +++ b/.ci_support/osx_64_numpy1.22python3.9.____73_pypypython_implpypy.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '15' +- '16' channel_sources: - conda-forge channel_targets: @@ -11,7 +11,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' libblas: - 3.9 *netlib libcblas: @@ -38,4 +38,3 @@ zip_keys: - - python - numpy - python_impl - - channel_sources diff --git a/.ci_support/osx_64_numpy1.22python3.9.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_numpy1.22python3.9.____cpythonpython_implcpython.yaml index dac5ce03..b3aaf70c 100644 --- a/.ci_support/osx_64_numpy1.22python3.9.____cpythonpython_implcpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.9.____cpythonpython_implcpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '15' +- '16' channel_sources: - conda-forge channel_targets: @@ -11,7 +11,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' libblas: - 3.9 *netlib libcblas: @@ -38,4 +38,3 @@ zip_keys: - - python - numpy - python_impl - - channel_sources diff --git a/.ci_support/osx_64_numpy1.23python3.11.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_numpy1.23python3.11.____cpythonpython_implcpython.yaml index db4fcd90..59fe19a9 100644 --- a/.ci_support/osx_64_numpy1.23python3.11.____cpythonpython_implcpython.yaml +++ b/.ci_support/osx_64_numpy1.23python3.11.____cpythonpython_implcpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '15' +- '16' channel_sources: - conda-forge channel_targets: @@ -11,7 +11,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' libblas: - 3.9 *netlib libcblas: @@ -38,4 +38,3 @@ zip_keys: - - python - numpy - python_impl - - channel_sources diff --git a/.ci_support/osx_64_numpy1.26python3.12.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_numpy1.26python3.12.____cpythonpython_implcpython.yaml index 1daba703..0aba1e78 100644 --- a/.ci_support/osx_64_numpy1.26python3.12.____cpythonpython_implcpython.yaml +++ b/.ci_support/osx_64_numpy1.26python3.12.____cpythonpython_implcpython.yaml @@ -3,15 +3,15 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '15' +- '16' channel_sources: -- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' libblas: - 3.9 *netlib libcblas: @@ -38,4 +38,3 @@ zip_keys: - - python - numpy - python_impl - - channel_sources diff --git a/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml index 8205f502..3a4d59c4 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '15' +- '16' channel_sources: - conda-forge channel_targets: @@ -11,7 +11,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' libblas: - 3.9 *netlib libcblas: @@ -38,4 +38,3 @@ zip_keys: - - python - numpy - python_impl - - channel_sources diff --git a/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml index 677ed15f..4498377b 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '15' +- '16' channel_sources: - conda-forge channel_targets: @@ -11,7 +11,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' libblas: - 3.9 *netlib libcblas: @@ -38,4 +38,3 @@ zip_keys: - - python - numpy - python_impl - - channel_sources diff --git a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml index b54fe865..1e997968 100644 --- a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '15' +- '16' channel_sources: - conda-forge channel_targets: @@ -11,7 +11,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' libblas: - 3.9 *netlib libcblas: @@ -38,4 +38,3 @@ zip_keys: - - python - numpy - python_impl - - channel_sources diff --git a/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml b/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml index fefa94ba..1816d642 100644 --- a/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml @@ -3,15 +3,15 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '15' +- '16' channel_sources: -- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' libblas: - 3.9 *netlib libcblas: @@ -38,4 +38,3 @@ zip_keys: - - python - numpy - python_impl - - channel_sources diff --git a/.ci_support/win_64_numpy1.22python3.10.____cpythonpython_implcpython.yaml b/.ci_support/win_64_numpy1.22python3.10.____cpythonpython_implcpython.yaml index 132d2057..0af2b396 100644 --- a/.ci_support/win_64_numpy1.22python3.10.____cpythonpython_implcpython.yaml +++ b/.ci_support/win_64_numpy1.22python3.10.____cpythonpython_implcpython.yaml @@ -28,4 +28,3 @@ zip_keys: - - python - numpy - python_impl - - channel_sources diff --git a/.ci_support/win_64_numpy1.22python3.9.____73_pypypython_implpypy.yaml b/.ci_support/win_64_numpy1.22python3.9.____73_pypypython_implpypy.yaml index 1d4e90d6..557e3c21 100644 --- a/.ci_support/win_64_numpy1.22python3.9.____73_pypypython_implpypy.yaml +++ b/.ci_support/win_64_numpy1.22python3.9.____73_pypypython_implpypy.yaml @@ -28,4 +28,3 @@ zip_keys: - - python - numpy - python_impl - - channel_sources diff --git a/.ci_support/win_64_numpy1.22python3.9.____cpythonpython_implcpython.yaml b/.ci_support/win_64_numpy1.22python3.9.____cpythonpython_implcpython.yaml index b442fc60..6956d563 100644 --- a/.ci_support/win_64_numpy1.22python3.9.____cpythonpython_implcpython.yaml +++ b/.ci_support/win_64_numpy1.22python3.9.____cpythonpython_implcpython.yaml @@ -28,4 +28,3 @@ zip_keys: - - python - numpy - python_impl - - channel_sources diff --git a/.ci_support/win_64_numpy1.23python3.11.____cpythonpython_implcpython.yaml b/.ci_support/win_64_numpy1.23python3.11.____cpythonpython_implcpython.yaml index 870851b3..80330335 100644 --- a/.ci_support/win_64_numpy1.23python3.11.____cpythonpython_implcpython.yaml +++ b/.ci_support/win_64_numpy1.23python3.11.____cpythonpython_implcpython.yaml @@ -28,4 +28,3 @@ zip_keys: - - python - numpy - python_impl - - channel_sources diff --git a/.ci_support/win_64_numpy1.26python3.12.____cpythonpython_implcpython.yaml b/.ci_support/win_64_numpy1.26python3.12.____cpythonpython_implcpython.yaml index 885dbe86..a9553f21 100644 --- a/.ci_support/win_64_numpy1.26python3.12.____cpythonpython_implcpython.yaml +++ b/.ci_support/win_64_numpy1.26python3.12.____cpythonpython_implcpython.yaml @@ -1,7 +1,7 @@ c_compiler: - vs2019 channel_sources: -- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -28,4 +28,3 @@ zip_keys: - - python - numpy - python_impl - - channel_sources diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 322832b9..eba1dfdb 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -28,13 +28,15 @@ conda-build: pkgs_dirs: - ${FEEDSTOCK_ROOT}/build_artifacts/pkg_cache - /opt/conda/pkgs +solver: libmamba CONDARC +export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 mamba install --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=3 + pip mamba conda-build boa conda-forge-ci-setup=4 mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup + pip mamba conda-build boa conda-forge-ci-setup=4 # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" @@ -55,6 +57,12 @@ if [[ -f "${FEEDSTOCK_ROOT}/LICENSE.txt" ]]; then cp "${FEEDSTOCK_ROOT}/LICENSE.txt" "${RECIPE_ROOT}/recipe-scripts-license.txt" fi +if [[ "${sha:-}" == "" ]]; then + pushd ${FEEDSTOCK_ROOT} + sha=$(git rev-parse HEAD) + popd +fi + 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}" @@ -68,7 +76,8 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then else conda mambabuild "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ - --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" + --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" \ + --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh index 92362398..b70ef014 100755 --- a/.scripts/run_docker_build.sh +++ b/.scripts/run_docker_build.sh @@ -91,6 +91,9 @@ docker run ${DOCKER_RUN_ARGS} \ -e CPU_COUNT \ -e BUILD_WITH_CONDA_DEBUG \ -e BUILD_OUTPUT_ID \ + -e flow_run_id \ + -e remote_url \ + -e sha \ -e BINSTAR_TOKEN \ -e FEEDSTOCK_TOKEN \ -e STAGING_BINSTAR_TOKEN \ diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index cd9a88f2..9259eb93 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -22,11 +22,13 @@ bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} source ${MINIFORGE_HOME}/etc/profile.d/conda.sh conda activate base +export CONDA_SOLVER="libmamba" +export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 mamba install --update-specs --quiet --yes --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=3 + pip mamba conda-build boa conda-forge-ci-setup=4 mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup + pip mamba conda-build boa conda-forge-ci-setup=4 @@ -45,6 +47,10 @@ else echo -e "\n\nNot mangling homebrew as we are not running in CI" fi +if [[ "${sha:-}" == "" ]]; then + sha=$(git rev-parse HEAD) +fi + echo -e "\n\nRunning the build setup script." source run_conda_forge_build_setup @@ -77,7 +83,8 @@ else conda mambabuild ./recipe -m ./.ci_support/${CONFIG}.yaml \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ - --clobber-file ./.ci_support/clobber_${CONFIG}.yaml + --clobber-file ./.ci_support/clobber_${CONFIG}.yaml \ + --extra-meta flow_run_id="$flow_run_id" remote_url="$remote_url" sha="$sha" ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat index 07d34456..7d2fdd6b 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -17,10 +17,14 @@ call :start_group "Configuring conda" :: Activate the base conda environment call activate base +:: Configure the solver +set "CONDA_SOLVER=libmamba" +if !errorlevel! neq 0 exit /b !errorlevel! +set "CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1" :: Provision the necessary dependencies to build the recipe later echo Installing dependencies -mamba.exe install "python=3.10" pip mamba conda-build boa conda-forge-ci-setup=3 -c conda-forge --strict-channel-priority --yes +mamba.exe install "python=3.10" pip mamba conda-build boa conda-forge-ci-setup=4 -c conda-forge --strict-channel-priority --yes if !errorlevel! neq 0 exit /b !errorlevel! :: Set basic configuration @@ -41,6 +45,10 @@ if NOT [%HOST_PLATFORM%] == [%BUILD_PLATFORM%] ( set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --no-test" ) +if NOT [%flow_run_id%] == [] ( + set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --extra-meta flow_run_id=%flow_run_id% remote_url=%remote_url% sha=%sha%" +) + call :end_group :: Build the recipe diff --git a/README.md b/README.md index 3a3d806e..8f97d713 100644 --- a/README.md +++ b/README.md @@ -314,7 +314,7 @@ available continuous integration services. Thanks to the awesome service provide [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/) +[conda-forge](https://anaconda.org/conda-forge) [anaconda.org](https://anaconda.org/) channel for Linux, Windows and OSX respectively. To manage the continuous integration and simplify feedstock maintenance diff --git a/recipe/build.sh b/recipe/build.sh index 60f4576b..6b7c80c6 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -32,4 +32,4 @@ $PYTHON -m build -w -n -x \ -Csetup-args=${MESON_ARGS_REDUCED// / -Csetup-args=} \ || (cat builddir/meson-logs/meson-log.txt && exit 1) -pip install dist/numpy*.whl +$PYTHON -m pip install dist/numpy*.whl diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 78b5ba83..d828da53 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "1.26.0" %} +{% set version = "1.26.2" %} package: name: numpy @@ -9,7 +9,7 @@ package: source: - url: https://github.com/numpy/numpy/releases/download/v{{ version }}/numpy-{{ version }}.tar.gz - sha256: f93fc78fe8bf15afe2b8d6b6499f1c73953169fad1e9a8dd086cdff3190e7fdf + sha256: f65738447676ab5777f11e6bbbdb8ce11b785e105f690bc45966574816b6d3ea # the sources by upstream themselves (as opposed to automated by github) contain the # svml submodule (which isn't in github tarball due to dear-github/dear-github#214); # keep this for reference & debugging when necessary; for exact commit, see: @@ -68,6 +68,8 @@ requirements: {% set tests_to_skip = tests_to_skip + " or Test_POWER_Features" %} # [build_platform != target_platform] # test_new_policy reruns part of test suite; including a CPU feature test that fails in emulation {% set tests_to_skip = tests_to_skip + " or test_new_policy" %} # [build_platform != target_platform] +# emulation problems (apparently) on aarch +{% set tests_to_skip = tests_to_skip + " or test_basic_property[float32" %} # [aarch64] test: requires: