diff --git a/.appveyor.yml b/.appveyor.yml
index 6217844..64176d3 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -18,9 +18,6 @@ environment:
- CONFIG: win_64_python3.12.____cpython
CONDA_INSTALL_LOCN: C:\Miniconda36-x64
- - CONFIG: win_64_python3.8.____cpython
- CONDA_INSTALL_LOCN: C:\Miniconda36-x64
-
- CONFIG: win_64_python3.9.____cpython
CONDA_INSTALL_LOCN: C:\Miniconda36-x64
@@ -48,8 +45,8 @@ install:
- cmd: set PYTHONUNBUFFERED=1
# Configure the VM.
- # Tell conda we want an updated version of conda-build and conda-forge-ci-setup=3
- - cmd: conda.exe install -n root -c conda-forge --quiet --yes conda-build pip conda-forge-ci-setup=3
+ # Tell conda we want an updated version of conda-build and conda-forge-ci-setup=4 "conda-build>=24.1"
+ - cmd: conda.exe install -n root -c conda-forge --quiet --yes conda-build pip conda-forge-ci-setup=4 "conda-build>=24.1"
- cmd: setup_conda_rc .\ .\recipe .\.ci_support\%CONFIG%.yaml
- cmd: CALL run_conda_forge_build_setup
@@ -57,7 +54,10 @@ install:
build: off
test_script:
- - cmd: conda.exe build recipe -m .ci_support\%CONFIG%.yaml
+ - set "flow_run_id=appveyor_%APPVEYOR_BUILD_ID%"
+ - set "remote_url=https://github.com/%APPVEYOR_REPO_NAME%"
+ - set "sha=%APPVEYOR_REPO_COMMIT%"
+ - cmd: conda.exe build recipe -m .ci_support\%CONFIG%.yaml --extra-meta flow_run_id=%flow_run_id% remote_url=%remote_url% sha=%sha%
- set "FEEDSTOCK_NAME=%APPVEYOR_REPO_NAME:*/=%"
- cmd: validate_recipe_outputs "%FEEDSTOCK_NAME%"
deploy_script:
diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml
index 29f1b6a..3db01d7 100755
--- a/.azure-pipelines/azure-pipelines-linux.yml
+++ b/.azure-pipelines/azure-pipelines-linux.yml
@@ -20,15 +20,12 @@ jobs:
CONFIG: linux_64_python3.12.____cpython
UPLOAD_PACKAGES: 'True'
DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64
- linux_64_python3.8.____cpython:
- CONFIG: linux_64_python3.8.____cpython
- UPLOAD_PACKAGES: 'True'
- DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64
linux_64_python3.9.____cpython:
CONFIG: linux_64_python3.9.____cpython
UPLOAD_PACKAGES: 'True'
DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64
timeoutInMinutes: 360
+ variables: {}
steps:
# configure qemu binfmt-misc running. This allows us to run docker containers
@@ -41,6 +38,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 f0c0bbd..b677bd9 100755
--- a/.azure-pipelines/azure-pipelines-osx.yml
+++ b/.azure-pipelines/azure-pipelines-osx.yml
@@ -5,7 +5,7 @@
jobs:
- job: osx
pool:
- vmImage: macOS-11
+ vmImage: macOS-12
strategy:
matrix:
osx_64_python3.10.____cpython:
@@ -17,18 +17,19 @@ jobs:
osx_64_python3.12.____cpython:
CONFIG: osx_64_python3.12.____cpython
UPLOAD_PACKAGES: 'True'
- osx_64_python3.8.____cpython:
- CONFIG: osx_64_python3.8.____cpython
- UPLOAD_PACKAGES: 'True'
osx_64_python3.9.____cpython:
CONFIG: osx_64_python3.9.____cpython
UPLOAD_PACKAGES: 'True'
timeoutInMinutes: 360
+ variables: {}
steps:
# 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/.ci_support/linux_64_python3.10.____cpython.yaml b/.ci_support/linux_64_python3.10.____cpython.yaml
index 36c05c8..d074ee1 100644
--- a/.ci_support/linux_64_python3.10.____cpython.yaml
+++ b/.ci_support/linux_64_python3.10.____cpython.yaml
@@ -1,9 +1,13 @@
c_compiler:
- gcc
c_compiler_version:
-- '12'
+- '13'
+c_stdlib:
+- sysroot
+c_stdlib_version:
+- '2.17'
cdt_name:
-- cos6
+- cos7
channel_sources:
- conda-forge
channel_targets:
@@ -11,13 +15,13 @@ channel_targets:
cxx_compiler:
- gxx
cxx_compiler_version:
-- '12'
+- '13'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
expat:
- '2'
json_c:
-- '0.17'
+- '0.18'
libjpeg_turbo:
- '3'
libuuid:
@@ -35,7 +39,7 @@ target_platform:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
-- - python
- - channel_sources
+- - c_stdlib_version
+ - cdt_name
zlib:
-- '1.2'
+- '1'
diff --git a/.ci_support/linux_64_python3.11.____cpython.yaml b/.ci_support/linux_64_python3.11.____cpython.yaml
index 9fc18c7..a374fc4 100644
--- a/.ci_support/linux_64_python3.11.____cpython.yaml
+++ b/.ci_support/linux_64_python3.11.____cpython.yaml
@@ -1,9 +1,13 @@
c_compiler:
- gcc
c_compiler_version:
-- '12'
+- '13'
+c_stdlib:
+- sysroot
+c_stdlib_version:
+- '2.17'
cdt_name:
-- cos6
+- cos7
channel_sources:
- conda-forge
channel_targets:
@@ -11,13 +15,13 @@ channel_targets:
cxx_compiler:
- gxx
cxx_compiler_version:
-- '12'
+- '13'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
expat:
- '2'
json_c:
-- '0.17'
+- '0.18'
libjpeg_turbo:
- '3'
libuuid:
@@ -35,7 +39,7 @@ target_platform:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
-- - python
- - channel_sources
+- - c_stdlib_version
+ - cdt_name
zlib:
-- '1.2'
+- '1'
diff --git a/.ci_support/linux_64_python3.12.____cpython.yaml b/.ci_support/linux_64_python3.12.____cpython.yaml
index 56b0d99..3193c55 100644
--- a/.ci_support/linux_64_python3.12.____cpython.yaml
+++ b/.ci_support/linux_64_python3.12.____cpython.yaml
@@ -1,23 +1,27 @@
c_compiler:
- gcc
c_compiler_version:
-- '12'
+- '13'
+c_stdlib:
+- sysroot
+c_stdlib_version:
+- '2.17'
cdt_name:
-- cos6
+- cos7
channel_sources:
-- conda-forge/label/python_rc,conda-forge
+- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- gxx
cxx_compiler_version:
-- '12'
+- '13'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
expat:
- '2'
json_c:
-- '0.17'
+- '0.18'
libjpeg_turbo:
- '3'
libuuid:
@@ -35,7 +39,7 @@ target_platform:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
-- - python
- - channel_sources
+- - c_stdlib_version
+ - cdt_name
zlib:
-- '1.2'
+- '1'
diff --git a/.ci_support/linux_64_python3.8.____cpython.yaml b/.ci_support/linux_64_python3.8.____cpython.yaml
deleted file mode 100644
index 8d2570e..0000000
--- a/.ci_support/linux_64_python3.8.____cpython.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
-c_compiler:
-- gcc
-c_compiler_version:
-- '12'
-cdt_name:
-- cos6
-channel_sources:
-- conda-forge
-channel_targets:
-- conda-forge main
-cxx_compiler:
-- gxx
-cxx_compiler_version:
-- '12'
-docker_image:
-- quay.io/condaforge/linux-anvil-cos7-x86_64
-expat:
-- '2'
-json_c:
-- '0.17'
-libjpeg_turbo:
-- '3'
-libuuid:
-- '2'
-openjpeg:
-- '2'
-pin_run_as_build:
- python:
- min_pin: x.x
- max_pin: x.x
-python:
-- 3.8.* *_cpython
-target_platform:
-- linux-64
-zip_keys:
-- - c_compiler_version
- - cxx_compiler_version
-- - python
- - channel_sources
-zlib:
-- '1.2'
diff --git a/.ci_support/linux_64_python3.9.____cpython.yaml b/.ci_support/linux_64_python3.9.____cpython.yaml
index 40abb99..4fc9ac7 100644
--- a/.ci_support/linux_64_python3.9.____cpython.yaml
+++ b/.ci_support/linux_64_python3.9.____cpython.yaml
@@ -1,9 +1,13 @@
c_compiler:
- gcc
c_compiler_version:
-- '12'
+- '13'
+c_stdlib:
+- sysroot
+c_stdlib_version:
+- '2.17'
cdt_name:
-- cos6
+- cos7
channel_sources:
- conda-forge
channel_targets:
@@ -11,13 +15,13 @@ channel_targets:
cxx_compiler:
- gxx
cxx_compiler_version:
-- '12'
+- '13'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
expat:
- '2'
json_c:
-- '0.17'
+- '0.18'
libjpeg_turbo:
- '3'
libuuid:
@@ -35,7 +39,7 @@ target_platform:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
-- - python
- - channel_sources
+- - c_stdlib_version
+ - cdt_name
zlib:
-- '1.2'
+- '1'
diff --git a/.ci_support/migrations/json_c018.yaml b/.ci_support/migrations/json_c018.yaml
new file mode 100644
index 0000000..0ef51d9
--- /dev/null
+++ b/.ci_support/migrations/json_c018.yaml
@@ -0,0 +1,8 @@
+__migrator:
+ build_number: 1
+ commit_message: Rebuild for json_c 0.18
+ kind: version
+ migration_number: 1
+json_c:
+- '0.18'
+migrator_ts: 1726500613.5475526
diff --git a/.ci_support/migrations/libjpeg_turbo3.yaml b/.ci_support/migrations/libjpeg_turbo3.yaml
deleted file mode 100644
index b4e2468..0000000
--- a/.ci_support/migrations/libjpeg_turbo3.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-__migrator:
- build_number: 1
- kind: version
- migration_number: 1
-libjpeg_turbo:
-- '3'
-migrator_ts: 1693842343.429878
diff --git a/.ci_support/osx_64_python3.10.____cpython.yaml b/.ci_support/osx_64_python3.10.____cpython.yaml
index 6adc1bd..8acb59d 100644
--- a/.ci_support/osx_64_python3.10.____cpython.yaml
+++ b/.ci_support/osx_64_python3.10.____cpython.yaml
@@ -1,9 +1,15 @@
MACOSX_DEPLOYMENT_TARGET:
-- '10.9'
+- '10.13'
+MACOSX_SDK_VERSION:
+- '10.13'
c_compiler:
- clang
c_compiler_version:
-- '15'
+- '17'
+c_stdlib:
+- macosx_deployment_target
+c_stdlib_version:
+- '10.13'
channel_sources:
- conda-forge
channel_targets:
@@ -11,11 +17,11 @@ channel_targets:
cxx_compiler:
- clangxx
cxx_compiler_version:
-- '15'
+- '17'
expat:
- '2'
json_c:
-- '0.17'
+- '0.18'
libjpeg_turbo:
- '3'
libuuid:
@@ -35,7 +41,5 @@ target_platform:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
-- - python
- - channel_sources
zlib:
-- '1.2'
+- '1'
diff --git a/.ci_support/osx_64_python3.11.____cpython.yaml b/.ci_support/osx_64_python3.11.____cpython.yaml
index 3949f31..7f69c6d 100644
--- a/.ci_support/osx_64_python3.11.____cpython.yaml
+++ b/.ci_support/osx_64_python3.11.____cpython.yaml
@@ -1,9 +1,15 @@
MACOSX_DEPLOYMENT_TARGET:
-- '10.9'
+- '10.13'
+MACOSX_SDK_VERSION:
+- '10.13'
c_compiler:
- clang
c_compiler_version:
-- '15'
+- '17'
+c_stdlib:
+- macosx_deployment_target
+c_stdlib_version:
+- '10.13'
channel_sources:
- conda-forge
channel_targets:
@@ -11,11 +17,11 @@ channel_targets:
cxx_compiler:
- clangxx
cxx_compiler_version:
-- '15'
+- '17'
expat:
- '2'
json_c:
-- '0.17'
+- '0.18'
libjpeg_turbo:
- '3'
libuuid:
@@ -35,7 +41,5 @@ target_platform:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
-- - python
- - channel_sources
zlib:
-- '1.2'
+- '1'
diff --git a/.ci_support/osx_64_python3.12.____cpython.yaml b/.ci_support/osx_64_python3.12.____cpython.yaml
index 7189657..7900a0e 100644
--- a/.ci_support/osx_64_python3.12.____cpython.yaml
+++ b/.ci_support/osx_64_python3.12.____cpython.yaml
@@ -1,21 +1,27 @@
MACOSX_DEPLOYMENT_TARGET:
-- '10.9'
+- '10.13'
+MACOSX_SDK_VERSION:
+- '10.13'
c_compiler:
- clang
c_compiler_version:
-- '15'
+- '17'
+c_stdlib:
+- macosx_deployment_target
+c_stdlib_version:
+- '10.13'
channel_sources:
-- conda-forge/label/python_rc,conda-forge
+- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- clangxx
cxx_compiler_version:
-- '15'
+- '17'
expat:
- '2'
json_c:
-- '0.17'
+- '0.18'
libjpeg_turbo:
- '3'
libuuid:
@@ -35,7 +41,5 @@ target_platform:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
-- - python
- - channel_sources
zlib:
-- '1.2'
+- '1'
diff --git a/.ci_support/osx_64_python3.8.____cpython.yaml b/.ci_support/osx_64_python3.8.____cpython.yaml
deleted file mode 100644
index 1460da6..0000000
--- a/.ci_support/osx_64_python3.8.____cpython.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
-MACOSX_DEPLOYMENT_TARGET:
-- '10.9'
-c_compiler:
-- clang
-c_compiler_version:
-- '15'
-channel_sources:
-- conda-forge
-channel_targets:
-- conda-forge main
-cxx_compiler:
-- clangxx
-cxx_compiler_version:
-- '15'
-expat:
-- '2'
-json_c:
-- '0.17'
-libjpeg_turbo:
-- '3'
-libuuid:
-- '2'
-macos_machine:
-- x86_64-apple-darwin13.4.0
-openjpeg:
-- '2'
-pin_run_as_build:
- python:
- min_pin: x.x
- max_pin: x.x
-python:
-- 3.8.* *_cpython
-target_platform:
-- osx-64
-zip_keys:
-- - c_compiler_version
- - cxx_compiler_version
-- - python
- - channel_sources
-zlib:
-- '1.2'
diff --git a/.ci_support/osx_64_python3.9.____cpython.yaml b/.ci_support/osx_64_python3.9.____cpython.yaml
index b54b9b6..55a6f14 100644
--- a/.ci_support/osx_64_python3.9.____cpython.yaml
+++ b/.ci_support/osx_64_python3.9.____cpython.yaml
@@ -1,9 +1,15 @@
MACOSX_DEPLOYMENT_TARGET:
-- '10.9'
+- '10.13'
+MACOSX_SDK_VERSION:
+- '10.13'
c_compiler:
- clang
c_compiler_version:
-- '15'
+- '17'
+c_stdlib:
+- macosx_deployment_target
+c_stdlib_version:
+- '10.13'
channel_sources:
- conda-forge
channel_targets:
@@ -11,11 +17,11 @@ channel_targets:
cxx_compiler:
- clangxx
cxx_compiler_version:
-- '15'
+- '17'
expat:
- '2'
json_c:
-- '0.17'
+- '0.18'
libjpeg_turbo:
- '3'
libuuid:
@@ -35,7 +41,5 @@ target_platform:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
-- - python
- - channel_sources
zlib:
-- '1.2'
+- '1'
diff --git a/.ci_support/win_64_python3.10.____cpython.yaml b/.ci_support/win_64_python3.10.____cpython.yaml
index b693ee3..0d1da1a 100644
--- a/.ci_support/win_64_python3.10.____cpython.yaml
+++ b/.ci_support/win_64_python3.10.____cpython.yaml
@@ -5,7 +5,7 @@ channel_targets:
expat:
- '2'
json_c:
-- '0.17'
+- '0.18'
libjpeg_turbo:
- '3'
openjpeg:
@@ -18,8 +18,5 @@ python:
- 3.10.* *_cpython
target_platform:
- win-64
-zip_keys:
-- - python
- - channel_sources
zlib:
-- '1.2'
+- '1'
diff --git a/.ci_support/win_64_python3.11.____cpython.yaml b/.ci_support/win_64_python3.11.____cpython.yaml
index 044e1d5..fd3387b 100644
--- a/.ci_support/win_64_python3.11.____cpython.yaml
+++ b/.ci_support/win_64_python3.11.____cpython.yaml
@@ -5,7 +5,7 @@ channel_targets:
expat:
- '2'
json_c:
-- '0.17'
+- '0.18'
libjpeg_turbo:
- '3'
openjpeg:
@@ -18,8 +18,5 @@ python:
- 3.11.* *_cpython
target_platform:
- win-64
-zip_keys:
-- - python
- - channel_sources
zlib:
-- '1.2'
+- '1'
diff --git a/.ci_support/win_64_python3.12.____cpython.yaml b/.ci_support/win_64_python3.12.____cpython.yaml
index 5a3b0aa..4656a39 100644
--- a/.ci_support/win_64_python3.12.____cpython.yaml
+++ b/.ci_support/win_64_python3.12.____cpython.yaml
@@ -1,11 +1,11 @@
channel_sources:
-- conda-forge/label/python_rc,conda-forge
+- conda-forge
channel_targets:
- conda-forge main
expat:
- '2'
json_c:
-- '0.17'
+- '0.18'
libjpeg_turbo:
- '3'
openjpeg:
@@ -18,8 +18,5 @@ python:
- 3.12.* *_cpython
target_platform:
- win-64
-zip_keys:
-- - python
- - channel_sources
zlib:
-- '1.2'
+- '1'
diff --git a/.ci_support/win_64_python3.8.____cpython.yaml b/.ci_support/win_64_python3.8.____cpython.yaml
deleted file mode 100644
index acf87ca..0000000
--- a/.ci_support/win_64_python3.8.____cpython.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-channel_sources:
-- conda-forge
-channel_targets:
-- conda-forge main
-expat:
-- '2'
-json_c:
-- '0.17'
-libjpeg_turbo:
-- '3'
-openjpeg:
-- '2'
-pin_run_as_build:
- python:
- min_pin: x.x
- max_pin: x.x
-python:
-- 3.8.* *_cpython
-target_platform:
-- win-64
-zip_keys:
-- - python
- - channel_sources
-zlib:
-- '1.2'
diff --git a/.ci_support/win_64_python3.9.____cpython.yaml b/.ci_support/win_64_python3.9.____cpython.yaml
index e69023a..7153dd2 100644
--- a/.ci_support/win_64_python3.9.____cpython.yaml
+++ b/.ci_support/win_64_python3.9.____cpython.yaml
@@ -5,7 +5,7 @@ channel_targets:
expat:
- '2'
json_c:
-- '0.17'
+- '0.18'
libjpeg_turbo:
- '3'
openjpeg:
@@ -18,8 +18,5 @@ python:
- 3.9.* *_cpython
target_platform:
- win-64
-zip_keys:
-- - python
- - channel_sources
zlib:
-- '1.2'
+- '1'
diff --git a/.gitattributes b/.gitattributes
index 7f32763..18f114a 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -20,8 +20,8 @@ bld.bat text eol=crlf
.travis.yml linguist-generated=true
.scripts/* linguist-generated=true
.woodpecker.yml linguist-generated=true
-LICENSE.txt linguist-generated=true
-README.md linguist-generated=true
+/LICENSE.txt linguist-generated=true
+/README.md linguist-generated=true
azure-pipelines.yml linguist-generated=true
build-locally.py linguist-generated=true
shippable.yml linguist-generated=true
diff --git a/.gitignore b/.gitignore
index c89ecb7..179afe5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,24 @@
-*.pyc
+# User content belongs under recipe/.
+# Feedstock configuration goes in `conda-forge.yml`
+# Everything else is managed by the conda-smithy rerender process.
+# Please do not modify
+
+# Ignore all files and folders in root
+*
+!/conda-forge.yml
+
+# Don't ignore any files/folders if the parent folder is 'un-ignored'
+# This also avoids warnings when adding an already-checked file with an ignored parent.
+!/**/
+# Don't ignore any files/folders recursively in the following folders
+!/recipe/**
+!/.ci_support/**
-build_artifacts
+# Since we ignore files/folders recursively, any folders inside
+# build_artifacts gets ignored which trips some build systems.
+# To avoid that we 'un-ignore' all files/folders recursively
+# and only ignore the root build_artifacts folder.
+!/build_artifacts/**
+/build_artifacts
+
+*.pyc
diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
index 438ed2b..af0b9ac 100755
--- a/.scripts/build_steps.sh
+++ b/.scripts/build_steps.sh
@@ -28,19 +28,23 @@ 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 conda-forge-ci-setup=4 "conda-build>=24.1"
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 conda-forge-ci-setup=4 "conda-build>=24.1"
# set up the condarc
setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}"
source run_conda_forge_build_setup
+
+
# make the build number clobber
make_build_number "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}"
@@ -63,9 +67,16 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then
# Drop into an interactive shell
/bin/bash
else
- conda mambabuild "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \
+ conda-build "${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 "Inspecting artifacts" ) 2> /dev/null
+
+ # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0
+ command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0"
+
+ ( endgroup "Inspecting artifacts" ) 2> /dev/null
( 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 9236239..00f377a 100755
--- a/.scripts/run_docker_build.sh
+++ b/.scripts/run_docker_build.sh
@@ -21,6 +21,12 @@ if [ -z ${FEEDSTOCK_NAME} ]; then
export FEEDSTOCK_NAME=$(basename ${FEEDSTOCK_ROOT})
fi
+if [[ "${sha:-}" == "" ]]; then
+ pushd "${FEEDSTOCK_ROOT}"
+ sha=$(git rev-parse HEAD)
+ popd
+fi
+
docker info
# In order for the conda-build process in the container to write to the mounted
@@ -91,6 +97,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 0f0ee70..4ebc38f 100755
--- a/.scripts/run_osx_build.sh
+++ b/.scripts/run_osx_build.sh
@@ -11,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="Mambaforge-MacOSX-$(uname -m).sh"
+MINIFORGE_FILE="Miniforge3-MacOSX-$(uname -m).sh"
curl -L -O "${MINIFORGE_URL}/${MINIFORGE_FILE}"
rm -rf ${MINIFORGE_HOME}
bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME}
@@ -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 conda-forge-ci-setup=4 "conda-build>=24.1"
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 conda-forge-ci-setup=4 "conda-build>=24.1"
@@ -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
@@ -71,9 +77,17 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then
/bin/bash
else
- conda mambabuild ./recipe -m ./.ci_support/${CONFIG}.yaml \
+ conda-build ./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 "Inspecting artifacts" ) 2> /dev/null
+
+ # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0
+ command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0"
+
+ ( endgroup "Inspecting artifacts" ) 2> /dev/null
( startgroup "Validating outputs" ) 2> /dev/null
validate_recipe_outputs "${FEEDSTOCK_NAME}"
diff --git a/README.md b/README.md
index ff0c5ee..2385ef0 100644
--- a/README.md
+++ b/README.md
@@ -54,13 +54,6 @@ Current build status
-