diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index ded8bde..cc5e8ac 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -1,5 +1,5 @@ assimp: -- 5.4.2 +- 5.4.3 bullet_cpp: - '3.25' c_compiler: diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml index 9523835..cbf501e 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_.yaml @@ -1,7 +1,7 @@ BUILD: - aarch64-conda_cos7-linux-gnu assimp: -- 5.4.2 +- 5.4.3 bullet_cpp: - '3.25' c_compiler: diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml index fd0467d..836e464 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.ci_support/linux_ppc64le_.yaml @@ -1,5 +1,5 @@ assimp: -- 5.4.2 +- 5.4.3 bullet_cpp: - '3.25' c_compiler: diff --git a/.ci_support/migrations/assimp543.yaml b/.ci_support/migrations/assimp543.yaml new file mode 100644 index 0000000..e0f94ce --- /dev/null +++ b/.ci_support/migrations/assimp543.yaml @@ -0,0 +1,8 @@ +__migrator: + build_number: 1 + commit_message: Rebuild for assimp 5.4.3 + kind: version + migration_number: 1 +assimp: +- 5.4.3 +migrator_ts: 1725100349.1005585 diff --git a/.ci_support/migrations/nlopt28.yaml b/.ci_support/migrations/nlopt28.yaml deleted file mode 100644 index 510a44d..0000000 --- a/.ci_support/migrations/nlopt28.yaml +++ /dev/null @@ -1,8 +0,0 @@ -__migrator: - build_number: 1 - commit_message: Rebuild for nlopt 2.8 - kind: version - migration_number: 1 -migrator_ts: 1725279582.425862 -nlopt: -- '2.8' diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 62de0e0..c074f3e 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: MACOSX_SDK_VERSION: - '10.15' assimp: -- 5.4.2 +- 5.4.3 bullet_cpp: - '3.25' c_compiler: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index d3283a6..b7bf5f0 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: MACOSX_SDK_VERSION: - '11.0' assimp: -- 5.4.2 +- 5.4.3 bullet_cpp: - '3.25' c_compiler: diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml index 862b782..fbd40a7 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_.yaml @@ -1,5 +1,5 @@ assimp: -- 5.4.2 +- 5.4.3 bullet_cpp: - '3.25' c_compiler: diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index ba4b251..856f469 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -43,6 +43,8 @@ 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}" diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat index 65650bf..a45c34f 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -24,7 +24,7 @@ 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 conda-forge-ci-setup=4 "conda-build>=24.1" -c conda-forge --strict-channel-priority --yes +mamba.exe install pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" -c conda-forge --strict-channel-priority --yes if !errorlevel! neq 0 exit /b !errorlevel! :: Set basic configuration @@ -48,7 +48,7 @@ if NOT [%HOST_PLATFORM%] == [%BUILD_PLATFORM%] ( ) 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%" + set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --extra-meta flow_run_id=%flow_run_id% remote_url=%remote_url% sha=%sha%" ) call :end_group diff --git a/build-locally.py b/build-locally.py index 8ac9b84..6788aea 100755 --- a/build-locally.py +++ b/build-locally.py @@ -1,5 +1,5 @@ #!/bin/sh -"""exec' "python3" "$0" "$@" #""" # fmt: off # fmt: on +"""exec" "python3" "$0" "$@" #""" # fmt: off # fmt: on # # This file has been generated by conda-smithy in order to build the recipe # locally. diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 004f132..dbe577e 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -12,7 +12,7 @@ source: - remove-opencl.patch build: - number: 4 + number: 5 outputs: - name: dartsim-cpp