diff --git a/.ci_support/conda_forge_pinnings.yaml b/.ci_support/conda_forge_pinnings.yaml index 18f70fad..927289f1 100644 --- a/.ci_support/conda_forge_pinnings.yaml +++ b/.ci_support/conda_forge_pinnings.yaml @@ -1,72 +1,57 @@ -# This differs from target_platform in that it determines what subdir the compiler -# will target, not what subdir the compiler package will be itself. -# For example, we need a win-64 vs2008_win-32 package, so that we compile win-32 -# code on win-64 miniconda. -cross_compiler_target_platform: # [win] - - win-64 # [win] c_compiler: - gcc # [linux] - clang # [osx] - - vs2019 # [win] + - vs2019 # [win and x86_64] + - vs2022 # [win and arm64] c_compiler_version: # [unix] - - 11 # [linux] - - 14 # [osx] - - 7 # [os.environ.get("CF_CUDA_ENABLED", "False") == "True" and linux64] - - 9 # [os.environ.get("CF_CUDA_ENABLED", "False") == "True" and linux64] - - 10 # [os.environ.get("CF_CUDA_ENABLED", "False") == "True" and linux64] - - 10 # [os.environ.get("CF_CUDA_ENABLED", "False") == "True" and linux64] + - 12 # [linux] + - 16 # [osx] + - 10 # [os.environ.get("CF_CUDA_ENABLED", "False") == "True" and linux] + - 11 # [os.environ.get("CF_CUDA_ENABLED", "False") == "True" and linux] cxx_compiler: - gxx # [linux] - clangxx # [osx] - - vs2019 # [win] + - vs2019 # [win and x86_64] + - vs2022 # [win and arm64] cxx_compiler_version: # [unix] - - 11 # [linux] - - 14 # [osx] - - 7 # [os.environ.get("CF_CUDA_ENABLED", "False") == "True" and linux64] - - 9 # [os.environ.get("CF_CUDA_ENABLED", "False") == "True" and linux64] - - 10 # [os.environ.get("CF_CUDA_ENABLED", "False") == "True" and linux64] - - 10 # [os.environ.get("CF_CUDA_ENABLED", "False") == "True" and linux64] + - 12 # [linux] + - 16 # [osx] + - 10 # [os.environ.get("CF_CUDA_ENABLED", "False") == "True" and linux] + - 11 # [os.environ.get("CF_CUDA_ENABLED", "False") == "True" and linux] llvm_openmp: # [osx] - - 14 # [osx] + - 16 # [osx] fortran_compiler: # [unix or win64] - gfortran # [linux64 or (osx and x86_64)] - gfortran # [aarch64 or ppc64le or armv7l or s390x] - flang # [win64] fortran_compiler_version: # [unix or win64] - - 11 # [linux] - - 11 # [osx] + - 12 # [linux] + - 12 # [osx] - 5 # [win64] - - 7 # [os.environ.get("CF_CUDA_ENABLED", "False") == "True" and linux64] - - 9 # [os.environ.get("CF_CUDA_ENABLED", "False") == "True" and linux64] - - 10 # [os.environ.get("CF_CUDA_ENABLED", "False") == "True" and linux64] - - 10 # [os.environ.get("CF_CUDA_ENABLED", "False") == "True" and linux64] + - 10 # [os.environ.get("CF_CUDA_ENABLED", "False") == "True" and linux] + - 11 # [os.environ.get("CF_CUDA_ENABLED", "False") == "True" and linux] m2w64_c_compiler: # [win] - m2w64-toolchain # [win] m2w64_cxx_compiler: # [win] - m2w64-toolchain # [win] m2w64_fortran_compiler: # [win] - m2w64-toolchain # [win] -CMAKE_GENERATOR: # [win] - - NMake Makefiles # [win] -cuda_compiler: # [linux or win] - - nvcc # [linux or win] +cuda_compiler: + - None + - nvcc # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + - nvcc # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] cuda_compiler_version: - None - - 10.2 # [(linux64 or win) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - 11.0 # [(linux64 or win) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - 11.1 # [(linux64 or win) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - 11.2 # [(linux64 or win) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + - 11.2 # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + - 11.8 # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] cuda_compiler_version_min: - None # [osx] - - 10.2 # [linux64 or win] - - 11.2 # [linux and (ppc64le or aarch64)] -cudnn: - - undefined - - 7 # [(linux64 or win) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - 8 # [(linux64 or win) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - 8 # [(linux64 or win) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - 8 # [(linux64 or win) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + - 11.2 # [linux or win64] + - 11.8 # [linux or win64] + +arm_variant_type: # [aarch64] + - sbsa # [aarch64] _libgcc_mutex: - 0.1 conda_forge @@ -114,8 +99,6 @@ macos_machine: # [osx] MACOSX_DEPLOYMENT_TARGET: # [osx] - 11.0 # [osx and arm64] - 10.9 # [osx and x86_64] -target_platform: # [win] - - win-64 # [win] VERBOSE_AT: - V=1 VERBOSE_CM: @@ -137,39 +120,61 @@ cdt_name: # [linux] - cos7 # [linux and armv7l] - cos7 # [linux and s390x] - - cos6 # [linux64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True" and os.environ.get("DEFAULT_LINUX_VERSION", "cos6") == "cos6"] - - cos7 # [linux64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True" and os.environ.get("DEFAULT_LINUX_VERSION", "cos6") == "cos7"] - - cos7 # [linux64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - cos7 # [linux64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - cos7 # [linux64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + - cos7 # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + - cos7 # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] docker_image: # [os.environ.get("BUILD_PLATFORM", "").startswith("linux-")] + # Native builds - quay.io/condaforge/linux-anvil-cos7-x86_64 # [os.environ.get("BUILD_PLATFORM") == "linux-64"] - quay.io/condaforge/linux-anvil-aarch64 # [os.environ.get("BUILD_PLATFORM") == "linux-aarch64"] - quay.io/condaforge/linux-anvil-ppc64le # [os.environ.get("BUILD_PLATFORM") == "linux-ppc64le"] - quay.io/condaforge/linux-anvil-armv7l # [os.environ.get("BUILD_PLATFORM") == "linux-armv7l"] - - quay.io/condaforge/linux-anvil-cos7-cuda:10.2 # [linux64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True" and os.environ.get("BUILD_PLATFORM") == "linux-64"] - - quay.io/condaforge/linux-anvil-cuda:11.0 # [linux64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True" and os.environ.get("BUILD_PLATFORM") == "linux-64"] - - quay.io/condaforge/linux-anvil-cuda:11.1 # [linux64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True" and os.environ.get("BUILD_PLATFORM") == "linux-64"] - - quay.io/condaforge/linux-anvil-cuda:11.2 # [linux64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True" and os.environ.get("BUILD_PLATFORM") == "linux-64"] + # CUDA 11.2 + - quay.io/condaforge/linux-anvil-cuda:11.2 # [linux64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True" and os.environ.get("BUILD_PLATFORM") == "linux-64"] + # CUDA 11.2 arch: native compilation (build == target) + - quay.io/condaforge/linux-anvil-ppc64le-cuda:11.2 # [ppc64le and os.environ.get("CF_CUDA_ENABLED", "False") == "True" and os.environ.get("BUILD_PLATFORM") == "linux-ppc64le"] + - quay.io/condaforge/linux-anvil-aarch64-cuda:11.2 # [aarch64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True" and os.environ.get("BUILD_PLATFORM") == "linux-aarch64"] + # CUDA 11.2 arch: cross-compilation (build != target) + - quay.io/condaforge/linux-anvil-cuda:11.2 # [ppc64le and os.environ.get("CF_CUDA_ENABLED", "False") == "True" and os.environ.get("BUILD_PLATFORM") == "linux-64"] + - quay.io/condaforge/linux-anvil-cuda:11.2 # [aarch64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True" and os.environ.get("BUILD_PLATFORM") == "linux-64"] + + # CUDA 11.8 + - quay.io/condaforge/linux-anvil-cuda:11.8 # [linux64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True" and os.environ.get("BUILD_PLATFORM") == "linux-64"] + # CUDA 11.8 arch: native compilation (build == target) + - quay.io/condaforge/linux-anvil-ppc64le-cuda:11.8 # [ppc64le and os.environ.get("CF_CUDA_ENABLED", "False") == "True" and os.environ.get("BUILD_PLATFORM") == "linux-ppc64le"] + - quay.io/condaforge/linux-anvil-aarch64-cuda:11.8 # [aarch64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True" and os.environ.get("BUILD_PLATFORM") == "linux-aarch64"] + # CUDA 11.8 arch: cross-compilation (build != target) + - quay.io/condaforge/linux-anvil-cuda:11.8 # [ppc64le and os.environ.get("CF_CUDA_ENABLED", "False") == "True" and os.environ.get("BUILD_PLATFORM") == "linux-64"] + - quay.io/condaforge/linux-anvil-cuda:11.8 # [aarch64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True" and os.environ.get("BUILD_PLATFORM") == "linux-64"] zip_keys: - # [unix] - c_compiler_version # [unix] - cxx_compiler_version # [unix] - fortran_compiler_version # [unix] - - cudnn # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + - cuda_compiler # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - cuda_compiler_version # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - cdt_name # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - docker_image # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True" and os.environ.get("BUILD_PLATFORM", "").startswith("linux-")] - # [win64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - cudnn # [win64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + - cuda_compiler # [win64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - cuda_compiler_version # [win64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - python - numpy - python_impl + # transition until arrow_cpp can be dropped for arrow 13.x + - + - arrow_cpp + - libarrow + - libarrow_all + # as of 4.23.x, libprotobuf requires patch-level run-exports; + # we couple it with grpc (which very roughly releases in sync) + # to reduce the migration pain for these two libs a bit. + - + - libgrpc + - libprotobuf # aarch64 specifics because conda-build sets many things to centos 6 @@ -185,11 +190,6 @@ cdt_arch: armv7l # [armv7l] BUILD: armv7-conda_cos7-linux-gnueabihf # [armv7l] pin_run_as_build: - # boost is special, see https://github.com/conda-forge/boost-cpp-feedstock/pull/82 - boost: - max_pin: x.x.x - boost-cpp: - max_pin: x.x.x # TODO: add run_exports to the following feedstocks flann: max_pin: x.x.x @@ -225,56 +225,61 @@ blas_impl: - mkl # [x86 or x86_64] - blis # [x86 or x86_64] -# keep in sync with libabseil{,_static} +# this output was dropped as of libabseil 20230125 abseil_cpp: - '20220623.0' alsa_lib: - - 1.2.8 + - 1.2.10 antic: - 0.2 aom: - - 3.5 + - '3.7' arb: - '2.23' arpack: - - 3.7 + - '3.8' +# keep in sync with libarrow arrow_cpp: - - 9.0.0 - - 8.0.1 - - 7.0.1 - - 6.0.2 + - 14 # does not exist; switch to libarrow + - 13 + - 12 + - 11.0.0 assimp: - - 5.2.4 + - 5.3.1 attr: - 2.5 aws_c_auth: - - 0.6.21 + - 0.7.11 aws_c_cal: - - 0.5.20 + - 0.6.9 aws_c_common: - - 0.8.5 + - 0.9.12 +aws_c_compression: + - 0.2.17 +# coupled to aws_c_common version bump, see +# https://github.com/conda-forge/aws-c-http-feedstock/pull/109 aws_c_event_stream: - - 0.2.15 + - 0.4.1 aws_c_http: - - 0.6.27 + - 0.8.0 +# the builds got coupled because 0.2.4 landed before the this migrator finished aws_c_io: - - 0.13.11 + - 0.14.1 +# the builds got coupled because 0.2.4 landed before the io migrator aws_c_mqtt: - - 0.7.13 + - 0.10.1 aws_c_s3: - - 0.1.51 + - 0.4.9 aws_c_sdkutils: - - 0.1.7 -aws_checksums: - 0.1.13 +aws_checksums: + - 0.1.17 aws_crt_cpp: - - 0.18.16 + - 0.26.0 aws_sdk_cpp: - - 1.9.375 -boost: - - 1.78.0 -boost_cpp: - - 1.78.0 + - 1.11.210 +bullet_cpp: + - 3.25 bzip2: - 1 c_ares: @@ -286,7 +291,7 @@ capnproto: ccr: - 1.3 cfitsio: - - 4.1.0 + - 4.3.0 coin_or_cbc: - 2.10 coincbc: @@ -301,28 +306,38 @@ coin_or_utils: - 2.11 console_bridge: - 1.0 +cudnn: + - 8 cutensor: - 1 curl: - - 7 + - 8 +dav1d: + - 1.2.1 davix: - '0.8' dbus: - 1 +dcap: + - 2.47 eclib: - - '20221012' + - '20231211' +elfutils: + - 0.189 exiv2: - 0.27 expat: - 2 ffmpeg: - - '4.4' + - '6' fftw: - 3 flann: - - 1.9.1 + - 1.9.2 +flatbuffers: + - 23.5.26 fmt: - - '9' + - '10' fontconfig: - 2 freetype: @@ -334,7 +349,7 @@ gf2x: gdk_pixbuf: - 2 gnuradio_core: - - 3.10.4 + - 3.10.9 gnutls: - 3.7 gsl: @@ -342,13 +357,13 @@ gsl: gsoap: - 2.8.123 gstreamer: - - '1.20' + - '1.22' gst_plugins_base: - - '1.20' + - '1.22' gdal: - - '3.5' + - '3.8' geos: - - 3.11.1 + - 3.12.1 geotiff: - 1.7.1 gfal2: @@ -367,33 +382,35 @@ glpk: - '5.0' gmp: - 6 +# keep google_cloud_cpp in sync with libgoogle_cloud google_cloud_cpp: - - '2.3.0' + - '2.12' google_cloud_cpp_common: - 0.25.0 googleapis_cpp: - '0.10' graphviz: - - '6' -# keep in sync with libgrpc + - '9' +# this has been renamed to libgrpc as of 1.49; dropped as of 1.52. +# IOW, this version is unavailable; makes the renaming more obvious grpc_cpp: - - '1.49' + - '1.52' harfbuzz: - - '5' + - '8' hdf4: - 4.2.15 hdf5: - - 1.12.1 + - 1.14.3 icu: - - '70' + - '73' imath: - - '3.1' + - 3.1.9 ipopt: - - 3.14.10 + - 3.14.13 isl: - - '0.25' + - '0.26' jasper: - - '2' + - 4 jpeg: - 9 lcms: @@ -401,55 +418,83 @@ lcms: lerc: - '4' libjpeg_turbo: - - 2 + - '3' libev: - 4.33 json_c: - - '0.16' + - '0.17' jsoncpp: - 1.9.5 kealib: - '1.5' krb5: - - '1.19' + - '1.20' +ldas_tools_framecpp: + - '2.9' libabseil: - - '20220623.0' + - '20230802' libabseil_static: - '20220623.0' +libaec: + - '1' libarchive: - - 3.5 + - '3.7' +# keep in sync with arrow_cpp (libarrow exists only from 10.x, +# but make sure we have same length for zip as arrow_cpp) +libarrow: + - 14 + - 13 + - 12 + - 11.0.0 +# only exists as of arrow v14, but needs to have same length as libarrow +libarrow_all: + - 14 + - 13 + - 12 + - 11.0.0 libavif: - - 0.11.1 + - '1.0.1' libblitz: - 1.0.2 +libboost_devel: + - '1.82' +libboost_python_devel: + - '1.82' libcint: - - '5.1' + - '5.5' libcurl: - - 7 + - 8 libcrc32c: - 1.1 libdap4: - 3.20.6 libdeflate: - - '1.14' + - '1.19' +libduckdb_devel: + - '0.9.2' libeantic: - 1 libevent: - - 2.1.10 + - 2.1.12 libexactreal: - - 2 + - '4' libffi: - - '3.3' + - '3.4' libflatsurf: - 3 libflint: - '2.9' +libframel: + - '8.41' libgdal: - - '3.5' + - '3.8' libgit2: - - '1.5' + - '1.7' +# Keep in sync with google_cloud_cpp +libgoogle_cloud: + - '2.12' libgrpc: - - '1.49' + - '1.59' libhugetlbfs: - 2 libhwy: @@ -464,28 +509,46 @@ libkml: - 1.3 libiio: - 0 +libmed: + - '4.1' libmatio: - - 1.5.21 + - 1.5.26 +libmatio_cpp: + - 0.2.3 libmicrohttpd: - 0.9 libnetcdf: - - 4.8.1 + - 4.9.2 libopencv: - - 4.6.0 + - 4.9.0 +libopentelemetry_cpp: + - '1.13' +libosqp: + - 0.6.3 +libopenvino_dev: + - 2023.2.0 libpcap: - '1.10' libpng: - 1.6 libprotobuf: - - '3.21' + - 4.24.4 +libpq: + - '16' +libraw: + - '0.21' librdkafka: - - '1.9' + - '2.2' librsvg: - 2 libsecret: - 0.18 +libsentencepiece: + - '0.1.99' libsndfile: - - 1.1 + - '1.2' +libsoup: + - 3 libspatialindex: - 1.9.3 libssh: @@ -493,14 +556,18 @@ libssh: libssh2: - 1 libsvm: - - '325' + - '332' # keep libsqlite in sync with sqlite libsqlite: - 3 +libtensorflow: + - 2.14 +libtensorflow_cc: + - 2.14 libthrift: - - 0.16.0 + - 0.18.1 libtiff: - - 4 + - '4.6' libunwind: - '1.6' libv8: @@ -512,15 +579,17 @@ libwebp: libwebp_base: - 1 libxml2: - - 2.10 + - 2 libxsmm: - 1 libuuid: - 2 libzip: - 1 +lmdb: + - 0.9.29 log4cxx: - - 0.11.0 + - 1.1.0 lz4_c: - '1.9.3' lzo: @@ -528,17 +597,21 @@ lzo: metis: - 5.1 mimalloc: - - 2.0.7 + - 2.1.2 mkl: - - 2022 + - '2023' mkl_devel: - - 2022 + - 2023 mpg123: - - '1.31' + - '1.32' mpich: - 4 mpfr: - 4 +msgpack_c: + - 6 +msgpack_cxx: + - 6 mumps_mpi: - 5.2.1 mumps_seq: @@ -550,13 +623,12 @@ ncurses: netcdf_cxx4: - 4.3 netcdf_fortran: - - 4.5 + - '4.6' nettle: - - '3.8' + - '3.9' nodejs: + - '20' - '18' - - '16' - - '14' # [not (osx and arm64)] nss: - 3 nspr: @@ -566,61 +638,73 @@ nlopt: ntl: - '11.4.3' # we build for the oldest version possible of numpy for forward compatibility +# we roughly follow NEP29 in choosing the oldest version numpy: # part of a zip_keys: python, python_impl, numpy - - 1.20 - - 1.20 - - 1.21 + - 1.22 + - 1.22 + - 1.22 + - 1.23 occt: - - 7.6 + - 7.7.2 openblas: - 0.3.* openexr: - - '3.1' + - '3.2' openh264: - - '2.3.1' + - 2.4.0 openjpeg: - '2' openmpi: - 4 openssl: - '3' -openturns: - - '1.19' orc: - - 1.8.0 + - 1.9.2 pango: - 1.50 pari: - - 2.13.* *_pthread + - 2.15.* *_pthread +pcl: + - 1.13.1 perl: - 5.32.1 petsc: - - '3.17' + - '3.20' petsc4py: - - '3.17' + - '3.20' +pugixml: + - '1.14' slepc: - - '3.17' + - '3.20' slepc4py: - - '3.17' + - '3.20' svt_av1: - - 1.3.0 + - 1.8.0 p11_kit: - '0.24' pcre: - '8' pcre2: - - '10.40' + - '10.42' pixman: - 0 poco: - 1.12.4 poppler: - - '22.04' + - '23.07' +postgresql: + - '16' +postgresql_plpython: + - '16' proj: - - 9.1.0 + - 9.3.1 pulseaudio: - - 14.0 + - '16.1' +pulseaudio_client: + - '16.1' +pulseaudio_daemon: + - '16.1' pybind11_abi: - 4 python: @@ -628,37 +712,56 @@ python: - 3.8.* *_cpython - 3.9.* *_cpython - 3.10.* *_cpython + - 3.11.* *_cpython python_impl: # part of a zip_keys: python, python_impl, numpy - cpython - cpython - cpython + - cpython pytorch: - - '1.12' + - '2.0' +pyqt: + - 5.15 +pyqtwebengine: + - 5.15 +pyqtchart: + - 5.15 qt: - - 5.12 + - 5.15 +qt_main: + - 5.15 +qt6_main: + - '6.6' qtkeychain: - - '0.13' + - '0.14' +rdma_core: + - '49' re2: - - 2022.06.01 + - 2023.06.02 readline: - "8" rocksdb: - - "6.10" + - '8.0' root_base: - - 6.26.8 + - 6.28.10 ruby: - 2.5 - 2.6 r_base: - - 4.1 + - 4.1 # [win] - 4.2 # [not win] + - 4.3 # [not win] +libscotch: + - 7.0.4 +libptscotch: + - 7.0.4 scotch: - - 6.0.9 + - 7.0.4 ptscotch: - - 6.0.9 + - 7.0.4 s2n: - - 1.3.28 + - 1.4.1 sdl2: - '2' sdl2_image: @@ -670,7 +773,7 @@ sdl2_net: sdl2_ttf: - '2' singular: - - 4.2.1.p3 + - 4.3.2.p8 snappy: - 1 soapysdr: @@ -678,44 +781,48 @@ soapysdr: sox: - 14.4.2 spdlog: - - '1.11' + - '1.12' # keep sqlite in sync with libsqlite sqlite: - 3 +srm_ifce: + - 1.24.6 starlink_ast: - '9.2.7' suitesparse: - 5 superlu_dist: - - 7.1.1 + - '8' tbb: - '2021' tbb_devel: - '2021' +tensorflow: + - '2.14' thrift_cpp: - - 0.16.0 + - 0.18.1 tinyxml2: - - 9 + - 10 tk: - 8.6 # [not ppc64le] tiledb: - - '2.11' + - '2.19' ucx: - - 1.12.1 + - '1.15.0' uhd: - - 4.3.0 + - 4.6.0 urdfdom: - - 3.1 + - 4 vc: # [win] - 14 # [win] vlfeat: - 0.9.21 volk: - - '2.5' + - '3.1' vtk: - - 9.1.0 + - 9.2.6 wcslib: - - '7.7' + - '8' wxwidgets: - '3.2' x264: @@ -729,7 +836,7 @@ xrootd: xz: - 5 zeromq: - - 4.3.4 + - '4.3.5' zfp: - 1.0 zlib: diff --git a/conda_build_config.yaml b/conda_build_config.yaml index ffbcabf1..9e80caca 100644 --- a/conda_build_config.yaml +++ b/conda_build_config.yaml @@ -7,21 +7,17 @@ gazebo: libpqxx: - 6 numpy: - - 1.21 + - 1.23 pcl: - 1.12.1 ogre: - 1.12.* -qt: - - 5.15 -qt_main: - - 5.15 cdt_name: # [linux] - cos7 # [linux] python: - - 3.10.* *_cpython + - 3.8.* *_cpython python_impl: - cpython diff --git a/patch/ros-humble-controller-manager.patch b/patch/ros-humble-controller-manager.patch deleted file mode 100644 index 27a8814f..00000000 --- a/patch/ros-humble-controller-manager.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/controller_manager/include/controller_manager/controller_manager.hpp b/controller_manager/include/controller_manager/controller_manager.hpp -index 2850b2be8..5789f0d68 100644 ---- a/controller_manager/include/controller_manager/controller_manager.hpp -+++ b/controller_manager/include/controller_manager/controller_manager.hpp -@@ -58,7 +58,7 @@ namespace controller_manager - { - using ControllersListIterator = std::vector::const_iterator; - --rclcpp::NodeOptions get_cm_node_options(); -+CONTROLLER_MANAGER_PUBLIC rclcpp::NodeOptions get_cm_node_options(); - - class ControllerManager : public rclcpp::Node - { diff --git a/patch/ros-humble-fastrtps.patch b/patch/ros-humble-fastrtps.patch deleted file mode 100644 index c401aef9..00000000 --- a/patch/ros-humble-fastrtps.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/tools/fds/CMakeLists.txt b/tools/fds/CMakeLists.txt -index 1b69eb6838..501a49d793 100644 ---- a/tools/fds/CMakeLists.txt -+++ b/tools/fds/CMakeLists.txt -@@ -124,7 +124,7 @@ if (NOT (CMAKE_VERSION VERSION_LESS "3.14")) - if( WIN32 ) - # Use powershell to generate the link - install( -- CODE "execute_process( COMMAND PowerShell -Command \"if( test-path ${PROJECT_NAME}.exe -PathType Leaf ) { rm ${PROJECT_NAME}.exe } ; New-Item -ItemType SymbolicLink -Target $ -Path ${PROJECT_NAME}.exe \" ERROR_QUIET RESULTS_VARIABLE SYMLINK_FAILED WORKING_DIRECTORY \"${CMAKE_INSTALL_PREFIX}/${BIN_INSTALL_DIR}\") \n if( SYMLINK_FAILED ) \n message(STATUS \"Windows requires admin installation rights to create symlinks. A bat script will be provided instead.\") \n set(FAST_SERVER_BINARY_NAME $) \n configure_file(${CMAKE_CURRENT_LIST_DIR}/fast-discovery-server.bat.in ${CMAKE_INSTALL_PREFIX}/${BIN_INSTALL_DIR}${MSVCARCH_DIR_EXTENSION}/${PROJECT_NAME}.bat @ONLY) \n endif()" -+ CODE "execute_process( COMMAND PowerShell -Command \"if( test-path ${PROJECT_NAME}.exe -PathType Leaf ) { rm ${PROJECT_NAME}.exe } ; New-Item -ItemType HardLink -Target $ -Path ${PROJECT_NAME}.exe \" ERROR_QUIET RESULTS_VARIABLE SYMLINK_FAILED WORKING_DIRECTORY \"${CMAKE_INSTALL_PREFIX}/${BIN_INSTALL_DIR}\") \n if( SYMLINK_FAILED ) \n message(STATUS \"Windows requires admin installation rights to create symlinks. A bat script will be provided instead.\") \n set(FAST_SERVER_BINARY_NAME $) \n configure_file(${CMAKE_CURRENT_LIST_DIR}/fast-discovery-server.bat.in ${CMAKE_INSTALL_PREFIX}/${BIN_INSTALL_DIR}${MSVCARCH_DIR_EXTENSION}/${PROJECT_NAME}.bat @ONLY) \n endif()" - COMPONENT discovery) - else() - # Use ln to create the symbolic link. We remove the version from the file name but keep the debug suffix diff --git a/patch/ros-humble-foxglove-bridge.patch b/patch/ros-humble-foxglove-bridge.patch index 1316d781..47ec00df 100644 --- a/patch/ros-humble-foxglove-bridge.patch +++ b/patch/ros-humble-foxglove-bridge.patch @@ -36,18 +36,3 @@ index efc65dc..994d91b 100644 message(STATUS "ROS_VERSION: " $ENV{ROS_VERSION}) message(STATUS "ROS_DISTRO: " $ENV{ROS_DISTRO}) -diff --git a/ros1_foxglove_bridge/src/ros1_foxglove_bridge_nodelet.cpp b/ros1_foxglove_bridge/src/ros1_foxglove_bridge_nodelet.cpp -index 83a8ab5..4022a8f 100644 ---- a/ros1_foxglove_bridge/src/ros1_foxglove_bridge_nodelet.cpp -+++ b/ros1_foxglove_bridge/src/ros1_foxglove_bridge_nodelet.cpp -@@ -453,8 +453,8 @@ private: - try { - channelPublicationIt->second.publish(msg); - } catch (const std::exception& ex) { -- ROS_ERROR("Failed to publish message on topic '%s'", -- channelPublicationIt->second.getTopic().c_str()); -+ ROS_ERROR("Failed to publish message on topic '%s': %s", -+ channelPublicationIt->second.getTopic().c_str(), ex.what()); - } - } - diff --git a/patch/ros-humble-librealsense2.patch b/patch/ros-humble-librealsense2.patch new file mode 100644 index 00000000..26c3cbae --- /dev/null +++ b/patch/ros-humble-librealsense2.patch @@ -0,0 +1,16 @@ +ndex ce3b560..ffa6612 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -11,10 +11,7 @@ include_directories(${REPO_ROOT}) + include(CMake/lrs_options.cmake) + include(CMake/connectivity_check.cmake) + #Deprecation message, should be removed in future releases +-if(${FORCE_LIBUVC} OR ${FORCE_WINUSB_UVC} OR ${ANDROID_USB_HOST_UVC}) +- MESSAGE(DEPRECATION "FORCE_LIBUVC, FORCE_WINUSB_UVC and ANDROID_USB_HOST_UVC are deprecated, use FORCE_RSUSB_BACKEND instead") +- set(FORCE_RSUSB_BACKEND ON) +-endif() ++set(FORCE_RSUSB_BACKEND ON) + + # Checking Internet connection, as DEPTH CAM needs to download the FW from amazon cloud + if(IMPORT_DEPTH_CAM_FW AND NOT INTERNET_CONNECTION) + diff --git a/patch/ros-humble-rsl.patch b/patch/ros-humble-rsl.patch new file mode 100644 index 00000000..55e64276 --- /dev/null +++ b/patch/ros-humble-rsl.patch @@ -0,0 +1,17 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6d47b08..78ca514 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -9,9 +9,9 @@ find_package(rclcpp REQUIRED) + find_package(tcb_span REQUIRED) + find_package(tl_expected REQUIRED) + +-if(CMAKE_CXX_COMPILER_ID MATCHES "(GNU|Clang)") +- add_compile_options(-Werror -Wall -Wextra -Wpedantic -Wshadow -Wconversion -Wsign-conversion -Wold-style-cast) +-endif() ++# if(CMAKE_CXX_COMPILER_ID MATCHES "(GNU|Clang)") ++# add_compile_options(-Werror -Wall -Wextra -Wpedantic -Wshadow -Wconversion -Wsign-conversion -Wold-style-cast) ++# endif() + + option(BUILD_SHARED_LIBS "Build shared libraries" ON) +