From 547009e049ec03eda63a277d411ac70f19d16208 Mon Sep 17 00:00:00 2001 From: Jeongseok Lee Date: Sat, 6 Jul 2024 00:41:26 -0700 Subject: [PATCH] Update clang-format version to 18 --- CMakeLists.txt | 2 +- docker/dev/v6.15/Dockerfile.ubuntu.jammy | 2 +- docker/dev/v6.15/Dockerfile.ubuntu.noble | 2 +- docker/dev/v6.15/Dockerfile.ubuntu.oracular | 2 +- pixi.lock | 309 ++++++++++++-------- pixi.toml | 4 +- 6 files changed, 197 insertions(+), 124 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 84c9c1c7b0fee..c7408972479fe 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -569,7 +569,7 @@ endif() find_program( CLANG_FORMAT_EXECUTABLE - NAMES clang-format-14 + NAMES clang-format-18 ) get_property(formatting_files GLOBAL PROPERTY DART_FORMAT_FILES) diff --git a/docker/dev/v6.15/Dockerfile.ubuntu.jammy b/docker/dev/v6.15/Dockerfile.ubuntu.jammy index 43e1aefdeea3b..78b0450205dde 100644 --- a/docker/dev/v6.15/Dockerfile.ubuntu.jammy +++ b/docker/dev/v6.15/Dockerfile.ubuntu.jammy @@ -15,7 +15,7 @@ RUN apt-get update -qq RUN apt-get install -y --no-install-recommends \ build-essential \ clang \ - clang-format-14 \ + clang-format-15 \ cmake \ curl \ doxygen \ diff --git a/docker/dev/v6.15/Dockerfile.ubuntu.noble b/docker/dev/v6.15/Dockerfile.ubuntu.noble index 0d9072e10ba12..13d8a8e9e9672 100644 --- a/docker/dev/v6.15/Dockerfile.ubuntu.noble +++ b/docker/dev/v6.15/Dockerfile.ubuntu.noble @@ -15,7 +15,7 @@ RUN apt-get update -qq RUN apt-get install -y --no-install-recommends \ build-essential \ clang \ - clang-format-14 \ + clang-format-18 \ cmake \ curl \ doxygen \ diff --git a/docker/dev/v6.15/Dockerfile.ubuntu.oracular b/docker/dev/v6.15/Dockerfile.ubuntu.oracular index 67aafa23c2ea7..a15bd70609e41 100644 --- a/docker/dev/v6.15/Dockerfile.ubuntu.oracular +++ b/docker/dev/v6.15/Dockerfile.ubuntu.oracular @@ -15,7 +15,7 @@ RUN apt-get update -qq RUN apt-get install -y --no-install-recommends \ build-essential \ clang \ - clang-format-14 \ + clang-format-18 \ cmake \ curl \ doxygen \ diff --git a/pixi.lock b/pixi.lock index a855f9b006540..ce119399bca94 100644 --- a/pixi.lock +++ b/pixi.lock @@ -18,7 +18,8 @@ environments: - conda: https://conda.anaconda.org/conda-forge/linux-64/bzip2-1.0.8-hd590300_5.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/c-ares-1.28.1-hd590300_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/ca-certificates-2024.7.4-hbcca054_0.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/clang-format-14-14.0.6-default_h7634d5b_1.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/clang-format-18-18.1.7-default_h9bb3924_0.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/clang-format-18.1.7-default_h9bb3924_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/click-8.1.7-unix_pyh707e725_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/cmake-3.22.3-h5432695_0.tar.bz2 - conda: https://conda.anaconda.org/conda-forge/linux-64/collada-dom-2.5.0-h7820ef8_8.conda @@ -70,7 +71,7 @@ environments: - conda: https://conda.anaconda.org/conda-forge/linux-64/libcap-2.69-h0f662aa_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libcblas-3.9.0-22_linux64_openblas.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libccd-double-2.1-h59595ed_3.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/libclang-cpp14-14.0.6-default_h7634d5b_1.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libclang-cpp18.1-18.1.7-default_h9bb3924_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libcurl-8.8.0-hca28451_1.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libdeflate-1.20-hd590300_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libdrm-2.4.122-h4ab18f5_0.conda @@ -93,7 +94,7 @@ environments: - conda: https://conda.anaconda.org/conda-forge/linux-64/libidn2-2.3.7-hd590300_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libjpeg-turbo-3.0.0-hd590300_1.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/liblapack-3.9.0-22_linux64_openblas.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/libllvm14-14.0.6-hcd5def8_4.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libllvm18-18.1.7-hb77312f_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libnghttp2-1.58.0-h47da74e_1.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libnsl-2.0.1-hd590300_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libode-0.16.2-h30efb56_14.conda @@ -211,7 +212,8 @@ environments: - conda: https://conda.anaconda.org/conda-forge/osx-64/bzip2-1.0.8-h10d778d_5.conda - conda: https://conda.anaconda.org/conda-forge/osx-64/c-ares-1.28.1-h10d778d_0.conda - conda: https://conda.anaconda.org/conda-forge/osx-64/ca-certificates-2024.7.4-h8857fd0_0.conda - - conda: https://conda.anaconda.org/conda-forge/osx-64/clang-format-14-14.0.6-default_hdb78580_1.conda + - conda: https://conda.anaconda.org/conda-forge/osx-64/clang-format-18-18.1.7-default_h4c8afb6_0.conda + - conda: https://conda.anaconda.org/conda-forge/osx-64/clang-format-18.1.7-default_h4c8afb6_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/click-8.1.7-unix_pyh707e725_0.conda - conda: https://conda.anaconda.org/conda-forge/osx-64/cmake-3.22.3-h35a7dd9_0.tar.bz2 - conda: https://conda.anaconda.org/conda-forge/osx-64/collada-dom-2.5.0-h7f246bc_8.conda @@ -258,7 +260,7 @@ environments: - conda: https://conda.anaconda.org/conda-forge/osx-64/libboost-python-devel-1.84.0-py312h0be7463_3.conda - conda: https://conda.anaconda.org/conda-forge/osx-64/libcblas-3.9.0-22_osx64_openblas.conda - conda: https://conda.anaconda.org/conda-forge/osx-64/libccd-double-2.1-he965462_3.conda - - conda: https://conda.anaconda.org/conda-forge/osx-64/libclang-cpp14-14.0.6-default_hdb78580_1.conda + - conda: https://conda.anaconda.org/conda-forge/osx-64/libclang-cpp18.1-18.1.7-default_h4c8afb6_0.conda - conda: https://conda.anaconda.org/conda-forge/osx-64/libcurl-8.8.0-hf9fcc65_1.conda - conda: https://conda.anaconda.org/conda-forge/osx-64/libcxx-17.0.6-heb59cac_3.conda - conda: https://conda.anaconda.org/conda-forge/osx-64/libdeflate-1.20-h49d49c5_0.conda @@ -277,7 +279,7 @@ environments: - conda: https://conda.anaconda.org/conda-forge/osx-64/libintl-devel-0.22.5-h5ff76d1_2.conda - conda: https://conda.anaconda.org/conda-forge/osx-64/libjpeg-turbo-3.0.0-h0dc2134_1.conda - conda: https://conda.anaconda.org/conda-forge/osx-64/liblapack-3.9.0-22_osx64_openblas.conda - - conda: https://conda.anaconda.org/conda-forge/osx-64/libllvm14-14.0.6-hc8e404f_4.conda + - conda: https://conda.anaconda.org/conda-forge/osx-64/libllvm18-18.1.7-hd5e122f_0.conda - conda: https://conda.anaconda.org/conda-forge/osx-64/libnghttp2-1.58.0-h64cf6d3_1.conda - conda: https://conda.anaconda.org/conda-forge/osx-64/libode-0.16.2-hede676d_14.conda - conda: https://conda.anaconda.org/conda-forge/osx-64/libopenblas-0.3.27-openmp_hfef2a42_0.conda @@ -364,7 +366,8 @@ environments: - conda: https://conda.anaconda.org/conda-forge/osx-arm64/bzip2-1.0.8-h93a5062_5.conda - conda: https://conda.anaconda.org/conda-forge/osx-arm64/c-ares-1.28.1-h93a5062_0.conda - conda: https://conda.anaconda.org/conda-forge/osx-arm64/ca-certificates-2024.7.4-hf0a4a13_0.conda - - conda: https://conda.anaconda.org/conda-forge/osx-arm64/clang-format-14-14.0.6-default_h5dc8d65_1.conda + - conda: https://conda.anaconda.org/conda-forge/osx-arm64/clang-format-18-18.1.7-default_hb63da90_0.conda + - conda: https://conda.anaconda.org/conda-forge/osx-arm64/clang-format-18.1.7-default_hb63da90_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/click-8.1.7-unix_pyh707e725_0.conda - conda: https://conda.anaconda.org/conda-forge/osx-arm64/cmake-3.22.3-he7c8c24_0.tar.bz2 - conda: https://conda.anaconda.org/conda-forge/osx-arm64/collada-dom-2.5.0-h39710e1_8.conda @@ -411,7 +414,7 @@ environments: - conda: https://conda.anaconda.org/conda-forge/osx-arm64/libboost-python-devel-1.84.0-py312ha814d7c_3.conda - conda: https://conda.anaconda.org/conda-forge/osx-arm64/libcblas-3.9.0-22_osxarm64_openblas.conda - conda: https://conda.anaconda.org/conda-forge/osx-arm64/libccd-double-2.1-h9a09cb3_2.tar.bz2 - - conda: https://conda.anaconda.org/conda-forge/osx-arm64/libclang-cpp14-14.0.6-default_h5dc8d65_1.conda + - conda: https://conda.anaconda.org/conda-forge/osx-arm64/libclang-cpp18.1-18.1.7-default_hb63da90_0.conda - conda: https://conda.anaconda.org/conda-forge/osx-arm64/libcurl-8.8.0-h7b6f9a7_1.conda - conda: https://conda.anaconda.org/conda-forge/osx-arm64/libcxx-17.0.6-h0812c0d_3.conda - conda: https://conda.anaconda.org/conda-forge/osx-arm64/libdeflate-1.20-h93a5062_0.conda @@ -431,7 +434,7 @@ environments: - conda: https://conda.anaconda.org/conda-forge/osx-arm64/libintl-devel-0.22.5-h8fbad5d_2.conda - conda: https://conda.anaconda.org/conda-forge/osx-arm64/libjpeg-turbo-3.0.0-hb547adb_1.conda - conda: https://conda.anaconda.org/conda-forge/osx-arm64/liblapack-3.9.0-22_osxarm64_openblas.conda - - conda: https://conda.anaconda.org/conda-forge/osx-arm64/libllvm14-14.0.6-hd1a9a77_4.conda + - conda: https://conda.anaconda.org/conda-forge/osx-arm64/libllvm18-18.1.7-hdac5640_0.conda - conda: https://conda.anaconda.org/conda-forge/osx-arm64/libnghttp2-1.58.0-ha4dd798_1.conda - conda: https://conda.anaconda.org/conda-forge/osx-arm64/libode-0.16.2-py312h20a0b95_14.conda - conda: https://conda.anaconda.org/conda-forge/osx-arm64/libopenblas-0.3.27-openmp_h6c19121_0.conda @@ -516,6 +519,7 @@ environments: - conda: https://conda.anaconda.org/conda-forge/win-64/bullet-cpp-3.25-h2ab9e98_2.conda - conda: https://conda.anaconda.org/conda-forge/win-64/bzip2-1.0.8-hcfcfb64_5.conda - conda: https://conda.anaconda.org/conda-forge/win-64/ca-certificates-2024.7.4-h56e8100_0.conda + - conda: https://conda.anaconda.org/conda-forge/win-64/clang-format-18.1.8-default_hec7ea82_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/click-8.1.7-win_pyh7428d3b_0.conda - conda: https://conda.anaconda.org/conda-forge/win-64/cmake-3.22.3-h39d44d4_0.tar.bz2 - conda: https://conda.anaconda.org/conda-forge/win-64/collada-dom-2.5.0-hc0d5731_8.conda @@ -1217,58 +1221,126 @@ packages: size: 154517 timestamp: 1720077468981 - kind: conda - name: clang-format-14 - version: 14.0.6 - build: default_h5dc8d65_1 - build_number: 1 - subdir: osx-arm64 - url: https://conda.anaconda.org/conda-forge/osx-arm64/clang-format-14-14.0.6-default_h5dc8d65_1.conda - sha256: ac72b3cab09a8b700e8e453763769da7e81299ec9bf8465011900c459fac5415 - md5: a8f37d56372617f8b9f6a2b2abbd0bc2 + name: clang-format + version: 18.1.7 + build: default_h4c8afb6_0 + subdir: osx-64 + url: https://conda.anaconda.org/conda-forge/osx-64/clang-format-18.1.7-default_h4c8afb6_0.conda + sha256: 105457f602193cbea41ee3c23d3e0ef76dca0c9fa3fbe3dd24a4c4039802c755 + md5: 28e497580c0c89a619dab901cf3a550a depends: - - libclang-cpp14 >=14.0.6,<14.1.0a0 - - libcxx >=15.0.7 - - libllvm14 >=14.0.6,<14.1.0a0 + - __osx >=10.13 + - clang-format-18 18.1.7 default_h4c8afb6_0 + - libclang-cpp18.1 >=18.1.7,<18.2.0a0 + - libcxx >=16.0.6 + - libllvm18 >=18.1.7,<18.2.0a0 license: Apache-2.0 WITH LLVM-exception license_family: Apache - size: 255444 - timestamp: 1684414159716 + size: 22876 + timestamp: 1717814196419 - kind: conda - name: clang-format-14 - version: 14.0.6 - build: default_h7634d5b_1 - build_number: 1 + name: clang-format + version: 18.1.7 + build: default_h9bb3924_0 subdir: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/clang-format-14-14.0.6-default_h7634d5b_1.conda - sha256: 661e151587a5b022a05a4630f3fac0d4f17675857f18a4036d6f069e2855a49d - md5: ab4b0dcf549899647c1f85013944c73c + url: https://conda.anaconda.org/conda-forge/linux-64/clang-format-18.1.7-default_h9bb3924_0.conda + sha256: 59c3f0e8e60a14c908bd39d7c3f41d8ae0592299b06346f3cf2b9da01f1df31b + md5: 13a578aae81d919f4fba0278b1040946 depends: - - libclang-cpp14 >=14.0.6,<14.1.0a0 + - clang-format-18 18.1.7 default_h9bb3924_0 + - libclang-cpp18.1 >=18.1.7,<18.2.0a0 - libgcc-ng >=12 - - libllvm14 >=14.0.6,<14.1.0a0 + - libllvm18 >=18.1.7,<18.2.0a0 - libstdcxx-ng >=12 - - libzlib >=1.2.13,<2.0.0a0 license: Apache-2.0 WITH LLVM-exception license_family: Apache - size: 260574 - timestamp: 1684407956903 + size: 22637 + timestamp: 1717819242710 - kind: conda - name: clang-format-14 - version: 14.0.6 - build: default_hdb78580_1 - build_number: 1 + name: clang-format + version: 18.1.7 + build: default_hb63da90_0 + subdir: osx-arm64 + url: https://conda.anaconda.org/conda-forge/osx-arm64/clang-format-18.1.7-default_hb63da90_0.conda + sha256: dc7e24c183a46588137b81ac2d2b5b041d17b4316fa24f54adcb1f4225d759cf + md5: a666ec3ec027d547b85fba0ff6b73c5a + depends: + - __osx >=11.0 + - clang-format-18 18.1.7 default_hb63da90_0 + - libclang-cpp18.1 >=18.1.7,<18.2.0a0 + - libcxx >=16.0.6 + - libllvm18 >=18.1.7,<18.2.0a0 + license: Apache-2.0 WITH LLVM-exception + license_family: Apache + size: 22976 + timestamp: 1717814120857 +- kind: conda + name: clang-format + version: 18.1.8 + build: default_hec7ea82_0 + subdir: win-64 + url: https://conda.anaconda.org/conda-forge/win-64/clang-format-18.1.8-default_hec7ea82_0.conda + sha256: 1f54bffb1b1de098d99b163a67d18edb7dcaca48a40536d6208603ed5a7dffbb + md5: f42fbb0ad2d71f28773653a054c3002f + depends: + - ucrt >=10.0.20348.0 + - vc >=14.2,<15 + - vc14_runtime >=14.29.30139 + license: Apache-2.0 WITH LLVM-exception + license_family: Apache + size: 1182109 + timestamp: 1718869440945 +- kind: conda + name: clang-format-18 + version: 18.1.7 + build: default_h4c8afb6_0 subdir: osx-64 - url: https://conda.anaconda.org/conda-forge/osx-64/clang-format-14-14.0.6-default_hdb78580_1.conda - sha256: 2a9abbd2ecaf4560fbe47da650066febfb7ed514391fdf92f8aca4d5d602e4da - md5: 834b35ddaa63417e0dcb5c6f0f4036bd + url: https://conda.anaconda.org/conda-forge/osx-64/clang-format-18-18.1.7-default_h4c8afb6_0.conda + sha256: 185dc3bdd67a438c7760ef446681d46a10ea73c7e8eef7f59c3770d387f73de3 + md5: 8b32920be1534ae49ea54d20bfed0c12 depends: - - libclang-cpp14 >=14.0.6,<14.1.0a0 - - libcxx >=15.0.7 - - libllvm14 >=14.0.6,<14.1.0a0 + - __osx >=10.13 + - libclang-cpp18.1 >=18.1.7,<18.2.0a0 + - libcxx >=16.0.6 + - libllvm18 >=18.1.7,<18.2.0a0 license: Apache-2.0 WITH LLVM-exception license_family: Apache - size: 257680 - timestamp: 1684412695796 + size: 62212 + timestamp: 1717814131492 +- kind: conda + name: clang-format-18 + version: 18.1.7 + build: default_h9bb3924_0 + subdir: linux-64 + url: https://conda.anaconda.org/conda-forge/linux-64/clang-format-18-18.1.7-default_h9bb3924_0.conda + sha256: 47aa360b6a1f488cf3de4e032f30136e27e11029d4e6c583d0af43fbcdf9b9db + md5: 11870f57d7d3ae9415d7df325595b3fa + depends: + - libclang-cpp18.1 >=18.1.7,<18.2.0a0 + - libgcc-ng >=12 + - libllvm18 >=18.1.7,<18.2.0a0 + - libstdcxx-ng >=12 + license: Apache-2.0 WITH LLVM-exception + license_family: Apache + size: 65851 + timestamp: 1717819189499 +- kind: conda + name: clang-format-18 + version: 18.1.7 + build: default_hb63da90_0 + subdir: osx-arm64 + url: https://conda.anaconda.org/conda-forge/osx-arm64/clang-format-18-18.1.7-default_hb63da90_0.conda + sha256: 47eab91ceb1efca0200014cca8da499b398f896c930690b55f769082d5fcb379 + md5: 36710059c92e90b6b424bff18a3116f1 + depends: + - __osx >=11.0 + - libclang-cpp18.1 >=18.1.7,<18.2.0a0 + - libcxx >=16.0.6 + - libllvm18 >=18.1.7,<18.2.0a0 + license: Apache-2.0 WITH LLVM-exception + license_family: Apache + size: 60666 + timestamp: 1717814041421 - kind: conda name: click version: 8.1.7 @@ -3891,55 +3963,53 @@ packages: size: 32554 timestamp: 1687342073593 - kind: conda - name: libclang-cpp14 - version: 14.0.6 - build: default_h5dc8d65_1 - build_number: 1 - subdir: osx-arm64 - url: https://conda.anaconda.org/conda-forge/osx-arm64/libclang-cpp14-14.0.6-default_h5dc8d65_1.conda - sha256: 9cb083dae695cda715e280c2cadd08b625ecc5842f99fb575901990b0e60bf7c - md5: 7caa562f3551c16cd82d0147640091f8 + name: libclang-cpp18.1 + version: 18.1.7 + build: default_h4c8afb6_0 + subdir: osx-64 + url: https://conda.anaconda.org/conda-forge/osx-64/libclang-cpp18.1-18.1.7-default_h4c8afb6_0.conda + sha256: 22b64ad7f04ccee346c043ee6bf44c56c1e489b88788693a82f9ca9f3d39c3ab + md5: 41f0f6a496dfda7a7731005f9120fc08 depends: - - libcxx >=15.0.7 - - libllvm14 >=14.0.6,<14.1.0a0 + - __osx >=10.13 + - libcxx >=16.0.6 + - libllvm18 >=18.1.7,<18.2.0a0 license: Apache-2.0 WITH LLVM-exception license_family: Apache - size: 10930694 - timestamp: 1684413524265 + size: 13773485 + timestamp: 1717813542661 - kind: conda - name: libclang-cpp14 - version: 14.0.6 - build: default_h7634d5b_1 - build_number: 1 + name: libclang-cpp18.1 + version: 18.1.7 + build: default_h9bb3924_0 subdir: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/libclang-cpp14-14.0.6-default_h7634d5b_1.conda - sha256: 698987dc23eeaafdc1e38e4435b70ee4d1e630a71e3ab0df3bcc6fccf45dd572 - md5: 7a0087336af08b6fd00d51c90c455475 + url: https://conda.anaconda.org/conda-forge/linux-64/libclang-cpp18.1-18.1.7-default_h9bb3924_0.conda + sha256: 710556634edf342cbfcb01d454e8644d4a0ac674eed0a9aebfc1fe86ea8c0bf6 + md5: bff3d36fbd1b1a2f1e6d34aa3eb6b58c depends: - libgcc-ng >=12 - - libllvm14 >=14.0.6,<14.1.0a0 + - libllvm18 >=18.1.7,<18.2.0a0 - libstdcxx-ng >=12 - - libzlib >=1.2.13,<2.0.0a0 license: Apache-2.0 WITH LLVM-exception license_family: Apache - size: 16594518 - timestamp: 1684407721622 + size: 19272701 + timestamp: 1717818801492 - kind: conda - name: libclang-cpp14 - version: 14.0.6 - build: default_hdb78580_1 - build_number: 1 - subdir: osx-64 - url: https://conda.anaconda.org/conda-forge/osx-64/libclang-cpp14-14.0.6-default_hdb78580_1.conda - sha256: 5720d4662bd032a1dc07d0ae1368fa5e454c938545bdd93f78dacd25b9f597d3 - md5: 9a235664bf087994aa3acc1a60614964 + name: libclang-cpp18.1 + version: 18.1.7 + build: default_hb63da90_0 + subdir: osx-arm64 + url: https://conda.anaconda.org/conda-forge/osx-arm64/libclang-cpp18.1-18.1.7-default_hb63da90_0.conda + sha256: 77622c6d8d343694f6a74cdaa3fde3fddad704687829be596ca2b13ded9ffcaf + md5: 3b4033faf6520796baffd626ee616831 depends: - - libcxx >=15.0.7 - - libllvm14 >=14.0.6,<14.1.0a0 + - __osx >=11.0 + - libcxx >=16.0.6 + - libllvm18 >=18.1.7,<18.2.0a0 license: Apache-2.0 WITH LLVM-exception license_family: Apache - size: 11897758 - timestamp: 1684412176370 + size: 12913614 + timestamp: 1717813430033 - kind: conda name: libcurl version: 8.8.0 @@ -5054,54 +5124,59 @@ packages: size: 5182500 timestamp: 1712543085027 - kind: conda - name: libllvm14 - version: 14.0.6 - build: hc8e404f_4 - build_number: 4 - subdir: osx-64 - url: https://conda.anaconda.org/conda-forge/osx-64/libllvm14-14.0.6-hc8e404f_4.conda - sha256: 0df3902a300cfe092425f86144d5e00ef67be3cd1cc89fd63084d45262a772ad - md5: ed06753e2ba7c66ed0ca7f19578fcb68 + name: libllvm18 + version: 18.1.7 + build: hb77312f_0 + subdir: linux-64 + url: https://conda.anaconda.org/conda-forge/linux-64/libllvm18-18.1.7-hb77312f_0.conda + sha256: 9a9167b3e8e05abc517671fe45e5d40ae866d3e8195865ddad3c68131d059e25 + md5: bc0ea7e1f75a9b1c8467597fbbd9f86b depends: - - libcxx >=15 - - libzlib >=1.2.13,<2.0.0a0 + - libgcc-ng >=12 + - libstdcxx-ng >=12 + - libxml2 >=2.12.7,<3.0a0 + - libzlib >=1.2.13,<2.0a0 + - zstd >=1.5.6,<1.6.0a0 license: Apache-2.0 WITH LLVM-exception license_family: Apache - size: 22467131 - timestamp: 1690563140552 + size: 38423980 + timestamp: 1717781615068 - kind: conda - name: libllvm14 - version: 14.0.6 - build: hcd5def8_4 - build_number: 4 - subdir: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/libllvm14-14.0.6-hcd5def8_4.conda - sha256: 225cc7c3b20ac1db1bdb37fa18c95bf8aecef4388e984ab2f7540a9f4382106a - md5: 73301c133ded2bf71906aa2104edae8b + name: libllvm18 + version: 18.1.7 + build: hd5e122f_0 + subdir: osx-64 + url: https://conda.anaconda.org/conda-forge/osx-64/libllvm18-18.1.7-hd5e122f_0.conda + sha256: dc9397be88e0b5d0e14765b98ea7bbea79b9110447e43b28a0f1e994514f6350 + md5: bc138883a1fbb4d446b8a5565b1c1bc0 depends: - - libgcc-ng >=12 - - libstdcxx-ng >=12 - - libzlib >=1.2.13,<2.0.0a0 + - __osx >=10.13 + - libcxx >=16 + - libxml2 >=2.12.7,<3.0a0 + - libzlib >=1.2.13,<2.0a0 + - zstd >=1.5.6,<1.6.0a0 license: Apache-2.0 WITH LLVM-exception license_family: Apache - size: 31484415 - timestamp: 1690557554081 + size: 27583991 + timestamp: 1717771655947 - kind: conda - name: libllvm14 - version: 14.0.6 - build: hd1a9a77_4 - build_number: 4 + name: libllvm18 + version: 18.1.7 + build: hdac5640_0 subdir: osx-arm64 - url: https://conda.anaconda.org/conda-forge/osx-arm64/libllvm14-14.0.6-hd1a9a77_4.conda - sha256: 6f603914fe8633a615f0d2f1383978eb279eeb552079a78449c9fbb43f22a349 - md5: 9f3dce5d26ea56a9000cd74c034582bd + url: https://conda.anaconda.org/conda-forge/osx-arm64/libllvm18-18.1.7-hdac5640_0.conda + sha256: 43257397b65120961fe0b922ef56021de9787c3a3226227a69c794a195658791 + md5: 25b48815b00f4309d59bade2d6deb468 depends: - - libcxx >=15 - - libzlib >=1.2.13,<2.0.0a0 + - __osx >=11.0 + - libcxx >=16 + - libxml2 >=2.12.7,<3.0a0 + - libzlib >=1.2.13,<2.0a0 + - zstd >=1.5.6,<1.6.0a0 license: Apache-2.0 WITH LLVM-exception license_family: Apache - size: 20571387 - timestamp: 1690559110016 + size: 25787088 + timestamp: 1717772004969 - kind: conda name: libnghttp2 version: 1.58.0 diff --git a/pixi.toml b/pixi.toml index 39b34fcd67230..78cb28a1f6679 100644 --- a/pixi.toml +++ b/pixi.toml @@ -17,6 +17,7 @@ pipx = ">=1.4.3,<1.5" pkg-config = ">=0.29.2,<0.30" pytest = ">=8.1.1,<8.2" setuptools = ">=69.1.1,<69.2" +clang-format = ">=18.1.7,<18.2" [dependencies] assimp = ">=5.3.1,<5.4" @@ -138,7 +139,6 @@ remove-deps-dir = { cmd = "rm -rf .deps" } ################################################################################ [target.linux-64.build-dependencies] -clang-format-14 = ">=14.0.6,<14.1" [target.linux-64.dependencies] freeglut = ">=3.2.2,<3.3" @@ -151,7 +151,6 @@ tracy = { cmd = "docker run --rm -d -e DISPLAY=$DISPLAY -v /tmp/.X11-unix:/tmp/. ################################################################################ [target.osx-64.build-dependencies] -clang-format-14 = ">=14.0.6,<14.1" [target.osx-64.dependencies] @@ -162,7 +161,6 @@ clang-format-14 = ">=14.0.6,<14.1" ################################################################################ [target.osx-arm64.build-dependencies] -clang-format-14 = ">=14.0.6,<14.1" [target.osx-arm64.dependencies]