From 980eac2f5921f96284c92bc758b3a60025d8ae83 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 30 Jun 2023 04:11:03 +0000 Subject: [PATCH 1/2] Rebuild for hdf51141 --- .ci_support/migrations/hdf51141.yaml | 7 +++++++ recipe/meta.yaml | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 .ci_support/migrations/hdf51141.yaml diff --git a/.ci_support/migrations/hdf51141.yaml b/.ci_support/migrations/hdf51141.yaml new file mode 100644 index 00000000..ef6f947d --- /dev/null +++ b/.ci_support/migrations/hdf51141.yaml @@ -0,0 +1,7 @@ +__migrator: + build_number: 1 + kind: version + migration_number: 1 +hdf5: +- 1.14.1 +migrator_ts: 1687165815.3104627 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 240b8088..69fad2e2 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -14,7 +14,7 @@ source: - 3331.patch build: - number: 2 + number: 3 run_exports: - {{ pin_subpackage('gazebo', max_pin='x') }} From 4df104e96e914859642ad0d5bf6d62e243e72ec8 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 30 Jun 2023 04:11:27 +0000 Subject: [PATCH 2/2] MNT: Re-rendered with conda-build 3.25.0, conda-smithy 3.23.1, and conda-forge-pinning 2023.06.29.12.26.26 --- .azure-pipelines/azure-pipelines-linux.yml | 44 ++----- .azure-pipelines/azure-pipelines-osx.yml | 40 ++----- .azure-pipelines/azure-pipelines-win.yml | 20 +--- .../linux_64_ffmpeg5libprotobuf3.21.yaml | 62 ---------- .../linux_64_ffmpeg5libprotobuf4.23.2.yaml | 62 ---------- ....21.yaml => linux_64_libprotobuf3.21.yaml} | 2 +- ...2.yaml => linux_64_libprotobuf4.23.2.yaml} | 2 +- .../linux_aarch64_ffmpeg5libprotobuf3.21.yaml | 66 ----------- ...inux_aarch64_ffmpeg5libprotobuf4.23.2.yaml | 66 ----------- ...aml => linux_aarch64_libprotobuf3.21.yaml} | 2 +- ...l => linux_aarch64_libprotobuf4.23.2.yaml} | 2 +- .ci_support/migrations/hdf51140.yaml | 7 -- .../osx_64_ffmpeg5libprotobuf3.21.yaml | 66 ----------- .../osx_64_ffmpeg5libprotobuf4.23.2.yaml | 66 ----------- ...f3.21.yaml => osx_64_libprotobuf3.21.yaml} | 2 +- ...3.2.yaml => osx_64_libprotobuf4.23.2.yaml} | 2 +- .../osx_arm64_ffmpeg5libprotobuf3.21.yaml | 64 ---------- .../osx_arm64_ffmpeg5libprotobuf4.23.2.yaml | 64 ---------- ...21.yaml => osx_arm64_libprotobuf3.21.yaml} | 2 +- ....yaml => osx_arm64_libprotobuf4.23.2.yaml} | 2 +- .../win_64_ffmpeg5libprotobuf3.21.yaml | 47 -------- .../win_64_ffmpeg5libprotobuf4.23.2.yaml | 47 -------- ...f3.21.yaml => win_64_libprotobuf3.21.yaml} | 2 +- ...3.2.yaml => win_64_libprotobuf4.23.2.yaml} | 2 +- README.md | 110 ++++-------------- 25 files changed, 60 insertions(+), 791 deletions(-) delete mode 100644 .ci_support/linux_64_ffmpeg5libprotobuf3.21.yaml delete mode 100644 .ci_support/linux_64_ffmpeg5libprotobuf4.23.2.yaml rename .ci_support/{linux_64_ffmpeg6libprotobuf3.21.yaml => linux_64_libprotobuf3.21.yaml} (98%) rename .ci_support/{linux_64_ffmpeg6libprotobuf4.23.2.yaml => linux_64_libprotobuf4.23.2.yaml} (98%) delete mode 100644 .ci_support/linux_aarch64_ffmpeg5libprotobuf3.21.yaml delete mode 100644 .ci_support/linux_aarch64_ffmpeg5libprotobuf4.23.2.yaml rename .ci_support/{linux_aarch64_ffmpeg6libprotobuf3.21.yaml => linux_aarch64_libprotobuf3.21.yaml} (98%) rename .ci_support/{linux_aarch64_ffmpeg6libprotobuf4.23.2.yaml => linux_aarch64_libprotobuf4.23.2.yaml} (98%) delete mode 100644 .ci_support/migrations/hdf51140.yaml delete mode 100644 .ci_support/osx_64_ffmpeg5libprotobuf3.21.yaml delete mode 100644 .ci_support/osx_64_ffmpeg5libprotobuf4.23.2.yaml rename .ci_support/{osx_64_ffmpeg6libprotobuf3.21.yaml => osx_64_libprotobuf3.21.yaml} (98%) rename .ci_support/{osx_64_ffmpeg6libprotobuf4.23.2.yaml => osx_64_libprotobuf4.23.2.yaml} (98%) delete mode 100644 .ci_support/osx_arm64_ffmpeg5libprotobuf3.21.yaml delete mode 100644 .ci_support/osx_arm64_ffmpeg5libprotobuf4.23.2.yaml rename .ci_support/{osx_arm64_ffmpeg6libprotobuf3.21.yaml => osx_arm64_libprotobuf3.21.yaml} (98%) rename .ci_support/{osx_arm64_ffmpeg6libprotobuf4.23.2.yaml => osx_arm64_libprotobuf4.23.2.yaml} (98%) delete mode 100644 .ci_support/win_64_ffmpeg5libprotobuf3.21.yaml delete mode 100644 .ci_support/win_64_ffmpeg5libprotobuf4.23.2.yaml rename .ci_support/{win_64_ffmpeg6libprotobuf3.21.yaml => win_64_libprotobuf3.21.yaml} (98%) rename .ci_support/{win_64_ffmpeg6libprotobuf4.23.2.yaml => win_64_libprotobuf4.23.2.yaml} (98%) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index cda89f2e..e00596cb 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,46 +8,26 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_ffmpeg5libprotobuf3.21: - CONFIG: linux_64_ffmpeg5libprotobuf3.21 + linux_64_libprotobuf3.21: + CONFIG: linux_64_libprotobuf3.21 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - SHORT_CONFIG: linux_64_ffmpeg5libprotobuf3.21 - linux_64_ffmpeg5libprotobuf4.23.2: - CONFIG: linux_64_ffmpeg5libprotobuf4.23.2 + SHORT_CONFIG: linux_64_libprotobuf3.21 + linux_64_libprotobuf4.23.2: + CONFIG: linux_64_libprotobuf4.23.2 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - SHORT_CONFIG: linux_64_ffmpeg5libprotobuf4.23.2 - linux_64_ffmpeg6libprotobuf3.21: - CONFIG: linux_64_ffmpeg6libprotobuf3.21 + SHORT_CONFIG: linux_64_libprotobuf4.23.2 + linux_aarch64_libprotobuf3.21: + CONFIG: linux_aarch64_libprotobuf3.21 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - SHORT_CONFIG: linux_64_ffmpeg6libprotobuf3.21 - linux_64_ffmpeg6libprotobuf4.23.2: - CONFIG: linux_64_ffmpeg6libprotobuf4.23.2 + SHORT_CONFIG: linux_aarch64_libprotobuf3.21 + linux_aarch64_libprotobuf4.23.2: + CONFIG: linux_aarch64_libprotobuf4.23.2 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - SHORT_CONFIG: linux_64_ffmpeg6libprotobuf4.23.2 - linux_aarch64_ffmpeg5libprotobuf3.21: - CONFIG: linux_aarch64_ffmpeg5libprotobuf3.21 - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - SHORT_CONFIG: linux_aarch64_ffmpeg5libprotobuf3.21 - linux_aarch64_ffmpeg5libprotobuf4.23.2: - CONFIG: linux_aarch64_ffmpeg5libprotobuf4.23.2 - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - SHORT_CONFIG: linux_aarch64_ffmpeg5libprotobuf4.23.2 - linux_aarch64_ffmpeg6libprotobuf3.21: - CONFIG: linux_aarch64_ffmpeg6libprotobuf3.21 - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - SHORT_CONFIG: linux_aarch64_ffmpeg6libprotobuf3.21 - linux_aarch64_ffmpeg6libprotobuf4.23.2: - CONFIG: linux_aarch64_ffmpeg6libprotobuf4.23.2 - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - SHORT_CONFIG: linux_aarch64_ffmpeg6libprotobuf4.23.2 + SHORT_CONFIG: linux_aarch64_libprotobuf4.23.2 timeoutInMinutes: 360 steps: diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index d6a17578..c61e7df8 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -8,38 +8,22 @@ jobs: vmImage: macOS-11 strategy: matrix: - osx_64_ffmpeg5libprotobuf3.21: - CONFIG: osx_64_ffmpeg5libprotobuf3.21 + osx_64_libprotobuf3.21: + CONFIG: osx_64_libprotobuf3.21 UPLOAD_PACKAGES: 'True' - SHORT_CONFIG: osx_64_ffmpeg5libprotobuf3.21 - osx_64_ffmpeg5libprotobuf4.23.2: - CONFIG: osx_64_ffmpeg5libprotobuf4.23.2 + SHORT_CONFIG: osx_64_libprotobuf3.21 + osx_64_libprotobuf4.23.2: + CONFIG: osx_64_libprotobuf4.23.2 UPLOAD_PACKAGES: 'True' - SHORT_CONFIG: osx_64_ffmpeg5libprotobuf4.23.2 - osx_64_ffmpeg6libprotobuf3.21: - CONFIG: osx_64_ffmpeg6libprotobuf3.21 + SHORT_CONFIG: osx_64_libprotobuf4.23.2 + osx_arm64_libprotobuf3.21: + CONFIG: osx_arm64_libprotobuf3.21 UPLOAD_PACKAGES: 'True' - SHORT_CONFIG: osx_64_ffmpeg6libprotobuf3.21 - osx_64_ffmpeg6libprotobuf4.23.2: - CONFIG: osx_64_ffmpeg6libprotobuf4.23.2 + SHORT_CONFIG: osx_arm64_libprotobuf3.21 + osx_arm64_libprotobuf4.23.2: + CONFIG: osx_arm64_libprotobuf4.23.2 UPLOAD_PACKAGES: 'True' - SHORT_CONFIG: osx_64_ffmpeg6libprotobuf4.23.2 - osx_arm64_ffmpeg5libprotobuf3.21: - CONFIG: osx_arm64_ffmpeg5libprotobuf3.21 - UPLOAD_PACKAGES: 'True' - SHORT_CONFIG: osx_arm64_ffmpeg5libprotobuf3.21 - osx_arm64_ffmpeg5libprotobuf4.23.2: - CONFIG: osx_arm64_ffmpeg5libprotobuf4.23.2 - UPLOAD_PACKAGES: 'True' - SHORT_CONFIG: osx_arm64_ffmpeg5libprotobuf4.23.2 - osx_arm64_ffmpeg6libprotobuf3.21: - CONFIG: osx_arm64_ffmpeg6libprotobuf3.21 - UPLOAD_PACKAGES: 'True' - SHORT_CONFIG: osx_arm64_ffmpeg6libprotobuf3.21 - osx_arm64_ffmpeg6libprotobuf4.23.2: - CONFIG: osx_arm64_ffmpeg6libprotobuf4.23.2 - UPLOAD_PACKAGES: 'True' - SHORT_CONFIG: osx_arm64_ffmpeg6libprotobuf4.23.2 + SHORT_CONFIG: osx_arm64_libprotobuf4.23.2 timeoutInMinutes: 360 steps: diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index fa53de60..dea8e86f 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -8,22 +8,14 @@ jobs: vmImage: windows-2022 strategy: matrix: - win_64_ffmpeg5libprotobuf3.21: - CONFIG: win_64_ffmpeg5libprotobuf3.21 + win_64_libprotobuf3.21: + CONFIG: win_64_libprotobuf3.21 UPLOAD_PACKAGES: 'True' - SHORT_CONFIG: win_64_ffmpeg5libprotobuf3.21 - win_64_ffmpeg5libprotobuf4.23.2: - CONFIG: win_64_ffmpeg5libprotobuf4.23.2 + SHORT_CONFIG: win_64_libprotobuf3.21 + win_64_libprotobuf4.23.2: + CONFIG: win_64_libprotobuf4.23.2 UPLOAD_PACKAGES: 'True' - SHORT_CONFIG: win_64_ffmpeg5libprotobuf4.23.2 - win_64_ffmpeg6libprotobuf3.21: - CONFIG: win_64_ffmpeg6libprotobuf3.21 - UPLOAD_PACKAGES: 'True' - SHORT_CONFIG: win_64_ffmpeg6libprotobuf3.21 - win_64_ffmpeg6libprotobuf4.23.2: - CONFIG: win_64_ffmpeg6libprotobuf4.23.2 - UPLOAD_PACKAGES: 'True' - SHORT_CONFIG: win_64_ffmpeg6libprotobuf4.23.2 + SHORT_CONFIG: win_64_libprotobuf4.23.2 timeoutInMinutes: 360 variables: CONDA_BLD_PATH: D:\\bld\\ diff --git a/.ci_support/linux_64_ffmpeg5libprotobuf3.21.yaml b/.ci_support/linux_64_ffmpeg5libprotobuf3.21.yaml deleted file mode 100644 index 316cf556..00000000 --- a/.ci_support/linux_64_ffmpeg5libprotobuf3.21.yaml +++ /dev/null @@ -1,62 +0,0 @@ -assimp: -- 5.2.5 -boost_cpp: -- 1.78.0 -c_compiler: -- gcc -c_compiler_version: -- '12' -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -curl: -- '8' -cxx_compiler: -- gxx -cxx_compiler_version: -- '12' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -ffmpeg: -- '5' -graphviz: -- '8' -hdf5: -- 1.14.0 -libabseil: -- '20230125' -libblas: -- 3.9 *netlib -libcblas: -- 3.9 *netlib -libcurl: -- '8' -libgdal: -- '3.7' -libprotobuf: -- '3.21' -libuuid: -- '2' -libxcb: -- '1.15' -pin_run_as_build: - boost-cpp: - max_pin: x.x.x - graphviz: - max_pin: x -qt_main: -- '5.15' -target_platform: -- linux-64 -tbb_devel: -- '2021' -tinyxml2: -- '9' -urdfdom: -- '3.1' -zip_keys: -- - c_compiler_version - - cxx_compiler_version diff --git a/.ci_support/linux_64_ffmpeg5libprotobuf4.23.2.yaml b/.ci_support/linux_64_ffmpeg5libprotobuf4.23.2.yaml deleted file mode 100644 index 5a0c55b8..00000000 --- a/.ci_support/linux_64_ffmpeg5libprotobuf4.23.2.yaml +++ /dev/null @@ -1,62 +0,0 @@ -assimp: -- 5.2.5 -boost_cpp: -- 1.78.0 -c_compiler: -- gcc -c_compiler_version: -- '12' -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -curl: -- '8' -cxx_compiler: -- gxx -cxx_compiler_version: -- '12' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -ffmpeg: -- '5' -graphviz: -- '8' -hdf5: -- 1.14.0 -libabseil: -- '20230125' -libblas: -- 3.9 *netlib -libcblas: -- 3.9 *netlib -libcurl: -- '8' -libgdal: -- '3.7' -libprotobuf: -- 4.23.2 -libuuid: -- '2' -libxcb: -- '1.15' -pin_run_as_build: - boost-cpp: - max_pin: x.x.x - graphviz: - max_pin: x -qt_main: -- '5.15' -target_platform: -- linux-64 -tbb_devel: -- '2021' -tinyxml2: -- '9' -urdfdom: -- '3.1' -zip_keys: -- - c_compiler_version - - cxx_compiler_version diff --git a/.ci_support/linux_64_ffmpeg6libprotobuf3.21.yaml b/.ci_support/linux_64_libprotobuf3.21.yaml similarity index 98% rename from .ci_support/linux_64_ffmpeg6libprotobuf3.21.yaml rename to .ci_support/linux_64_libprotobuf3.21.yaml index 55b5a7c9..e4ad077e 100644 --- a/.ci_support/linux_64_ffmpeg6libprotobuf3.21.yaml +++ b/.ci_support/linux_64_libprotobuf3.21.yaml @@ -25,7 +25,7 @@ ffmpeg: graphviz: - '8' hdf5: -- 1.14.0 +- 1.14.1 libabseil: - '20230125' libblas: diff --git a/.ci_support/linux_64_ffmpeg6libprotobuf4.23.2.yaml b/.ci_support/linux_64_libprotobuf4.23.2.yaml similarity index 98% rename from .ci_support/linux_64_ffmpeg6libprotobuf4.23.2.yaml rename to .ci_support/linux_64_libprotobuf4.23.2.yaml index dbcc4e63..2545a821 100644 --- a/.ci_support/linux_64_ffmpeg6libprotobuf4.23.2.yaml +++ b/.ci_support/linux_64_libprotobuf4.23.2.yaml @@ -25,7 +25,7 @@ ffmpeg: graphviz: - '8' hdf5: -- 1.14.0 +- 1.14.1 libabseil: - '20230125' libblas: diff --git a/.ci_support/linux_aarch64_ffmpeg5libprotobuf3.21.yaml b/.ci_support/linux_aarch64_ffmpeg5libprotobuf3.21.yaml deleted file mode 100644 index 6ddbcad7..00000000 --- a/.ci_support/linux_aarch64_ffmpeg5libprotobuf3.21.yaml +++ /dev/null @@ -1,66 +0,0 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu -assimp: -- 5.2.5 -boost_cpp: -- 1.78.0 -c_compiler: -- gcc -c_compiler_version: -- '12' -cdt_arch: -- aarch64 -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -curl: -- '8' -cxx_compiler: -- gxx -cxx_compiler_version: -- '12' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -ffmpeg: -- '5' -graphviz: -- '8' -hdf5: -- 1.14.0 -libabseil: -- '20230125' -libblas: -- 3.9 *netlib -libcblas: -- 3.9 *netlib -libcurl: -- '8' -libgdal: -- '3.7' -libprotobuf: -- '3.21' -libuuid: -- '2' -libxcb: -- '1.15' -pin_run_as_build: - boost-cpp: - max_pin: x.x.x - graphviz: - max_pin: x -qt_main: -- '5.15' -target_platform: -- linux-aarch64 -tbb_devel: -- '2021' -tinyxml2: -- '9' -urdfdom: -- '3.1' -zip_keys: -- - c_compiler_version - - cxx_compiler_version diff --git a/.ci_support/linux_aarch64_ffmpeg5libprotobuf4.23.2.yaml b/.ci_support/linux_aarch64_ffmpeg5libprotobuf4.23.2.yaml deleted file mode 100644 index d0f487c5..00000000 --- a/.ci_support/linux_aarch64_ffmpeg5libprotobuf4.23.2.yaml +++ /dev/null @@ -1,66 +0,0 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu -assimp: -- 5.2.5 -boost_cpp: -- 1.78.0 -c_compiler: -- gcc -c_compiler_version: -- '12' -cdt_arch: -- aarch64 -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -curl: -- '8' -cxx_compiler: -- gxx -cxx_compiler_version: -- '12' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -ffmpeg: -- '5' -graphviz: -- '8' -hdf5: -- 1.14.0 -libabseil: -- '20230125' -libblas: -- 3.9 *netlib -libcblas: -- 3.9 *netlib -libcurl: -- '8' -libgdal: -- '3.7' -libprotobuf: -- 4.23.2 -libuuid: -- '2' -libxcb: -- '1.15' -pin_run_as_build: - boost-cpp: - max_pin: x.x.x - graphviz: - max_pin: x -qt_main: -- '5.15' -target_platform: -- linux-aarch64 -tbb_devel: -- '2021' -tinyxml2: -- '9' -urdfdom: -- '3.1' -zip_keys: -- - c_compiler_version - - cxx_compiler_version diff --git a/.ci_support/linux_aarch64_ffmpeg6libprotobuf3.21.yaml b/.ci_support/linux_aarch64_libprotobuf3.21.yaml similarity index 98% rename from .ci_support/linux_aarch64_ffmpeg6libprotobuf3.21.yaml rename to .ci_support/linux_aarch64_libprotobuf3.21.yaml index 95826fa4..42f4bcf7 100644 --- a/.ci_support/linux_aarch64_ffmpeg6libprotobuf3.21.yaml +++ b/.ci_support/linux_aarch64_libprotobuf3.21.yaml @@ -29,7 +29,7 @@ ffmpeg: graphviz: - '8' hdf5: -- 1.14.0 +- 1.14.1 libabseil: - '20230125' libblas: diff --git a/.ci_support/linux_aarch64_ffmpeg6libprotobuf4.23.2.yaml b/.ci_support/linux_aarch64_libprotobuf4.23.2.yaml similarity index 98% rename from .ci_support/linux_aarch64_ffmpeg6libprotobuf4.23.2.yaml rename to .ci_support/linux_aarch64_libprotobuf4.23.2.yaml index c8deb273..06b543e0 100644 --- a/.ci_support/linux_aarch64_ffmpeg6libprotobuf4.23.2.yaml +++ b/.ci_support/linux_aarch64_libprotobuf4.23.2.yaml @@ -29,7 +29,7 @@ ffmpeg: graphviz: - '8' hdf5: -- 1.14.0 +- 1.14.1 libabseil: - '20230125' libblas: diff --git a/.ci_support/migrations/hdf51140.yaml b/.ci_support/migrations/hdf51140.yaml deleted file mode 100644 index 75219e7b..00000000 --- a/.ci_support/migrations/hdf51140.yaml +++ /dev/null @@ -1,7 +0,0 @@ -__migrator: - build_number: 1 - kind: version - migration_number: 1 -hdf5: -- 1.14.0 -migrator_ts: 1675622758 diff --git a/.ci_support/osx_64_ffmpeg5libprotobuf3.21.yaml b/.ci_support/osx_64_ffmpeg5libprotobuf3.21.yaml deleted file mode 100644 index 477095c3..00000000 --- a/.ci_support/osx_64_ffmpeg5libprotobuf3.21.yaml +++ /dev/null @@ -1,66 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.15' -assimp: -- 5.2.5 -boost_cpp: -- 1.78.0 -bzip2: -- '1' -c_compiler: -- clang -c_compiler_version: -- '15' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -curl: -- '8' -cxx_compiler: -- clangxx -cxx_compiler_version: -- '15' -ffmpeg: -- '5' -graphviz: -- '8' -hdf5: -- 1.14.0 -libabseil: -- '20230125' -libblas: -- 3.9 *netlib -libcblas: -- 3.9 *netlib -libcurl: -- '8' -libgdal: -- '3.7' -libprotobuf: -- '3.21' -libxcb: -- '1.15' -macos_machine: -- x86_64-apple-darwin13.4.0 -macos_min_version: -- '10.15' -pin_run_as_build: - boost-cpp: - max_pin: x.x.x - graphviz: - max_pin: x -qt_main: -- '5.15' -target_platform: -- osx-64 -tbb_devel: -- '2021' -tinyxml2: -- '9' -urdfdom: -- '3.1' -zip_keys: -- - c_compiler_version - - cxx_compiler_version -zlib: -- '1.2' diff --git a/.ci_support/osx_64_ffmpeg5libprotobuf4.23.2.yaml b/.ci_support/osx_64_ffmpeg5libprotobuf4.23.2.yaml deleted file mode 100644 index e86e305b..00000000 --- a/.ci_support/osx_64_ffmpeg5libprotobuf4.23.2.yaml +++ /dev/null @@ -1,66 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.15' -assimp: -- 5.2.5 -boost_cpp: -- 1.78.0 -bzip2: -- '1' -c_compiler: -- clang -c_compiler_version: -- '15' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -curl: -- '8' -cxx_compiler: -- clangxx -cxx_compiler_version: -- '15' -ffmpeg: -- '5' -graphviz: -- '8' -hdf5: -- 1.14.0 -libabseil: -- '20230125' -libblas: -- 3.9 *netlib -libcblas: -- 3.9 *netlib -libcurl: -- '8' -libgdal: -- '3.7' -libprotobuf: -- 4.23.2 -libxcb: -- '1.15' -macos_machine: -- x86_64-apple-darwin13.4.0 -macos_min_version: -- '10.15' -pin_run_as_build: - boost-cpp: - max_pin: x.x.x - graphviz: - max_pin: x -qt_main: -- '5.15' -target_platform: -- osx-64 -tbb_devel: -- '2021' -tinyxml2: -- '9' -urdfdom: -- '3.1' -zip_keys: -- - c_compiler_version - - cxx_compiler_version -zlib: -- '1.2' diff --git a/.ci_support/osx_64_ffmpeg6libprotobuf3.21.yaml b/.ci_support/osx_64_libprotobuf3.21.yaml similarity index 98% rename from .ci_support/osx_64_ffmpeg6libprotobuf3.21.yaml rename to .ci_support/osx_64_libprotobuf3.21.yaml index 0ccb332f..b94822e2 100644 --- a/.ci_support/osx_64_ffmpeg6libprotobuf3.21.yaml +++ b/.ci_support/osx_64_libprotobuf3.21.yaml @@ -25,7 +25,7 @@ ffmpeg: graphviz: - '8' hdf5: -- 1.14.0 +- 1.14.1 libabseil: - '20230125' libblas: diff --git a/.ci_support/osx_64_ffmpeg6libprotobuf4.23.2.yaml b/.ci_support/osx_64_libprotobuf4.23.2.yaml similarity index 98% rename from .ci_support/osx_64_ffmpeg6libprotobuf4.23.2.yaml rename to .ci_support/osx_64_libprotobuf4.23.2.yaml index d65b9845..5c764be4 100644 --- a/.ci_support/osx_64_ffmpeg6libprotobuf4.23.2.yaml +++ b/.ci_support/osx_64_libprotobuf4.23.2.yaml @@ -25,7 +25,7 @@ ffmpeg: graphviz: - '8' hdf5: -- 1.14.0 +- 1.14.1 libabseil: - '20230125' libblas: diff --git a/.ci_support/osx_arm64_ffmpeg5libprotobuf3.21.yaml b/.ci_support/osx_arm64_ffmpeg5libprotobuf3.21.yaml deleted file mode 100644 index 504d37b4..00000000 --- a/.ci_support/osx_arm64_ffmpeg5libprotobuf3.21.yaml +++ /dev/null @@ -1,64 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '11.0' -assimp: -- 5.2.5 -boost_cpp: -- 1.78.0 -bzip2: -- '1' -c_compiler: -- clang -c_compiler_version: -- '15' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -curl: -- '8' -cxx_compiler: -- clangxx -cxx_compiler_version: -- '15' -ffmpeg: -- '5' -graphviz: -- '8' -hdf5: -- 1.14.0 -libabseil: -- '20230125' -libblas: -- 3.9 *netlib -libcblas: -- 3.9 *netlib -libcurl: -- '8' -libgdal: -- '3.7' -libprotobuf: -- '3.21' -libxcb: -- '1.15' -macos_machine: -- arm64-apple-darwin20.0.0 -pin_run_as_build: - boost-cpp: - max_pin: x.x.x - graphviz: - max_pin: x -qt_main: -- '5.15' -target_platform: -- osx-arm64 -tbb_devel: -- '2021' -tinyxml2: -- '9' -urdfdom: -- '3.1' -zip_keys: -- - c_compiler_version - - cxx_compiler_version -zlib: -- '1.2' diff --git a/.ci_support/osx_arm64_ffmpeg5libprotobuf4.23.2.yaml b/.ci_support/osx_arm64_ffmpeg5libprotobuf4.23.2.yaml deleted file mode 100644 index 99c38857..00000000 --- a/.ci_support/osx_arm64_ffmpeg5libprotobuf4.23.2.yaml +++ /dev/null @@ -1,64 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '11.0' -assimp: -- 5.2.5 -boost_cpp: -- 1.78.0 -bzip2: -- '1' -c_compiler: -- clang -c_compiler_version: -- '15' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -curl: -- '8' -cxx_compiler: -- clangxx -cxx_compiler_version: -- '15' -ffmpeg: -- '5' -graphviz: -- '8' -hdf5: -- 1.14.0 -libabseil: -- '20230125' -libblas: -- 3.9 *netlib -libcblas: -- 3.9 *netlib -libcurl: -- '8' -libgdal: -- '3.7' -libprotobuf: -- 4.23.2 -libxcb: -- '1.15' -macos_machine: -- arm64-apple-darwin20.0.0 -pin_run_as_build: - boost-cpp: - max_pin: x.x.x - graphviz: - max_pin: x -qt_main: -- '5.15' -target_platform: -- osx-arm64 -tbb_devel: -- '2021' -tinyxml2: -- '9' -urdfdom: -- '3.1' -zip_keys: -- - c_compiler_version - - cxx_compiler_version -zlib: -- '1.2' diff --git a/.ci_support/osx_arm64_ffmpeg6libprotobuf3.21.yaml b/.ci_support/osx_arm64_libprotobuf3.21.yaml similarity index 98% rename from .ci_support/osx_arm64_ffmpeg6libprotobuf3.21.yaml rename to .ci_support/osx_arm64_libprotobuf3.21.yaml index ccba2328..6ce7e8f1 100644 --- a/.ci_support/osx_arm64_ffmpeg6libprotobuf3.21.yaml +++ b/.ci_support/osx_arm64_libprotobuf3.21.yaml @@ -25,7 +25,7 @@ ffmpeg: graphviz: - '8' hdf5: -- 1.14.0 +- 1.14.1 libabseil: - '20230125' libblas: diff --git a/.ci_support/osx_arm64_ffmpeg6libprotobuf4.23.2.yaml b/.ci_support/osx_arm64_libprotobuf4.23.2.yaml similarity index 98% rename from .ci_support/osx_arm64_ffmpeg6libprotobuf4.23.2.yaml rename to .ci_support/osx_arm64_libprotobuf4.23.2.yaml index f871f0db..16dabbe8 100644 --- a/.ci_support/osx_arm64_ffmpeg6libprotobuf4.23.2.yaml +++ b/.ci_support/osx_arm64_libprotobuf4.23.2.yaml @@ -25,7 +25,7 @@ ffmpeg: graphviz: - '8' hdf5: -- 1.14.0 +- 1.14.1 libabseil: - '20230125' libblas: diff --git a/.ci_support/win_64_ffmpeg5libprotobuf3.21.yaml b/.ci_support/win_64_ffmpeg5libprotobuf3.21.yaml deleted file mode 100644 index 29d805f1..00000000 --- a/.ci_support/win_64_ffmpeg5libprotobuf3.21.yaml +++ /dev/null @@ -1,47 +0,0 @@ -assimp: -- 5.2.5 -boost_cpp: -- 1.78.0 -c_compiler: -- vs2019 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -curl: -- '8' -cxx_compiler: -- vs2019 -ffmpeg: -- '5' -graphviz: -- '8' -hdf5: -- 1.14.0 -libabseil: -- '20230125' -libblas: -- 3.9 *netlib -libcblas: -- 3.9 *netlib -libcurl: -- '8' -libgdal: -- '3.7' -libprotobuf: -- '3.21' -pin_run_as_build: - boost-cpp: - max_pin: x.x.x - graphviz: - max_pin: x -qt_main: -- '5.15' -target_platform: -- win-64 -tbb_devel: -- '2021' -tinyxml2: -- '9' -urdfdom: -- '3.1' diff --git a/.ci_support/win_64_ffmpeg5libprotobuf4.23.2.yaml b/.ci_support/win_64_ffmpeg5libprotobuf4.23.2.yaml deleted file mode 100644 index c00d66c1..00000000 --- a/.ci_support/win_64_ffmpeg5libprotobuf4.23.2.yaml +++ /dev/null @@ -1,47 +0,0 @@ -assimp: -- 5.2.5 -boost_cpp: -- 1.78.0 -c_compiler: -- vs2019 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -curl: -- '8' -cxx_compiler: -- vs2019 -ffmpeg: -- '5' -graphviz: -- '8' -hdf5: -- 1.14.0 -libabseil: -- '20230125' -libblas: -- 3.9 *netlib -libcblas: -- 3.9 *netlib -libcurl: -- '8' -libgdal: -- '3.7' -libprotobuf: -- 4.23.2 -pin_run_as_build: - boost-cpp: - max_pin: x.x.x - graphviz: - max_pin: x -qt_main: -- '5.15' -target_platform: -- win-64 -tbb_devel: -- '2021' -tinyxml2: -- '9' -urdfdom: -- '3.1' diff --git a/.ci_support/win_64_ffmpeg6libprotobuf3.21.yaml b/.ci_support/win_64_libprotobuf3.21.yaml similarity index 98% rename from .ci_support/win_64_ffmpeg6libprotobuf3.21.yaml rename to .ci_support/win_64_libprotobuf3.21.yaml index 138efdcb..cce4b53e 100644 --- a/.ci_support/win_64_ffmpeg6libprotobuf3.21.yaml +++ b/.ci_support/win_64_libprotobuf3.21.yaml @@ -17,7 +17,7 @@ ffmpeg: graphviz: - '8' hdf5: -- 1.14.0 +- 1.14.1 libabseil: - '20230125' libblas: diff --git a/.ci_support/win_64_ffmpeg6libprotobuf4.23.2.yaml b/.ci_support/win_64_libprotobuf4.23.2.yaml similarity index 98% rename from .ci_support/win_64_ffmpeg6libprotobuf4.23.2.yaml rename to .ci_support/win_64_libprotobuf4.23.2.yaml index ab976a43..a4b7b182 100644 --- a/.ci_support/win_64_ffmpeg6libprotobuf4.23.2.yaml +++ b/.ci_support/win_64_libprotobuf4.23.2.yaml @@ -17,7 +17,7 @@ ffmpeg: graphviz: - '8' hdf5: -- 1.14.0 +- 1.14.1 libabseil: - '20230125' libblas: diff --git a/README.md b/README.md index 7651d495..67877a0d 100644 --- a/README.md +++ b/README.md @@ -27,143 +27,73 @@ Current build status - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
VariantStatus
linux_64_ffmpeg5libprotobuf3.21linux_64_libprotobuf3.21 - variant + variant
linux_64_ffmpeg5libprotobuf4.23.2linux_64_libprotobuf4.23.2 - variant + variant
linux_64_ffmpeg6libprotobuf3.21linux_aarch64_libprotobuf3.21 - variant + variant
linux_64_ffmpeg6libprotobuf4.23.2linux_aarch64_libprotobuf4.23.2 - variant + variant
linux_aarch64_ffmpeg5libprotobuf3.21osx_64_libprotobuf3.21 - variant + variant
linux_aarch64_ffmpeg5libprotobuf4.23.2osx_64_libprotobuf4.23.2 - variant + variant
linux_aarch64_ffmpeg6libprotobuf3.21osx_arm64_libprotobuf3.21 - variant + variant
linux_aarch64_ffmpeg6libprotobuf4.23.2osx_arm64_libprotobuf4.23.2 - variant + variant
osx_64_ffmpeg5libprotobuf3.21win_64_libprotobuf3.21 - variant + variant
osx_64_ffmpeg5libprotobuf4.23.2win_64_libprotobuf4.23.2 - variant - -
osx_64_ffmpeg6libprotobuf3.21 - - variant - -
osx_64_ffmpeg6libprotobuf4.23.2 - - variant - -
osx_arm64_ffmpeg5libprotobuf3.21 - - variant - -
osx_arm64_ffmpeg5libprotobuf4.23.2 - - variant - -
osx_arm64_ffmpeg6libprotobuf3.21 - - variant - -
osx_arm64_ffmpeg6libprotobuf4.23.2 - - variant - -
win_64_ffmpeg5libprotobuf3.21 - - variant - -
win_64_ffmpeg5libprotobuf4.23.2 - - variant - -
win_64_ffmpeg6libprotobuf3.21 - - variant - -
win_64_ffmpeg6libprotobuf4.23.2 - - variant + variant