diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 23b8d67..79ba6f1 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -18,11 +18,6 @@ jobs: UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 SHORT_CONFIG: linux_64_numpy1.22python3.8.____cpython - linux_64_numpy1.22python3.9.____73_pypy: - CONFIG: linux_64_numpy1.22python3.9.____73_pypy - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - SHORT_CONFIG: linux_64_numpy1.22python3.9.____73_pypy linux_64_numpy1.22python3.9.____cpython: CONFIG: linux_64_numpy1.22python3.9.____cpython UPLOAD_PACKAGES: 'True' @@ -48,11 +43,6 @@ jobs: UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 SHORT_CONFIG: linux_aarch64_numpy1.22python3.8.____cpython - linux_aarch64_numpy1.22python3.9.____73_pypy: - CONFIG: linux_aarch64_numpy1.22python3.9.____73_pypy - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - SHORT_CONFIG: linux_aarch64_numpy1.22python3.9.____73_pypy linux_aarch64_numpy1.22python3.9.____cpython: CONFIG: linux_aarch64_numpy1.22python3.9.____cpython UPLOAD_PACKAGES: 'True' @@ -78,11 +68,6 @@ jobs: UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 SHORT_CONFIG: linux_ppc64le_numpy1.22python3.8.____cpython - linux_ppc64le_numpy1.22python3.9.____73_pypy: - CONFIG: linux_ppc64le_numpy1.22python3.9.____73_pypy - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - SHORT_CONFIG: linux_ppc64le_numpy1.22python3.9.____73_pypy linux_ppc64le_numpy1.22python3.9.____cpython: CONFIG: linux_ppc64le_numpy1.22python3.9.____cpython UPLOAD_PACKAGES: 'True' diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index a671ae4..57e1b1f 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_numpy1.22python3.10.____cpython: @@ -16,10 +16,6 @@ jobs: CONFIG: osx_64_numpy1.22python3.8.____cpython UPLOAD_PACKAGES: 'True' SHORT_CONFIG: osx_64_numpy1.22python3.8.____cpython - osx_64_numpy1.22python3.9.____73_pypy: - CONFIG: osx_64_numpy1.22python3.9.____73_pypy - UPLOAD_PACKAGES: 'True' - SHORT_CONFIG: osx_64_numpy1.22python3.9.____73_pypy osx_64_numpy1.22python3.9.____cpython: CONFIG: osx_64_numpy1.22python3.9.____cpython UPLOAD_PACKAGES: 'True' diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index e39a8d3..c4c8334 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -16,10 +16,6 @@ jobs: CONFIG: win_64_numpy1.22python3.8.____cpython UPLOAD_PACKAGES: 'True' SHORT_CONFIG: win_64_numpy1.22python3.8.____cpython - win_64_numpy1.22python3.9.____73_pypy: - CONFIG: win_64_numpy1.22python3.9.____73_pypy - UPLOAD_PACKAGES: 'True' - SHORT_CONFIG: win_64_numpy1.22python3.9.____73_pypy win_64_numpy1.22python3.9.____cpython: CONFIG: win_64_numpy1.22python3.9.____cpython UPLOAD_PACKAGES: 'True' diff --git a/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml index 33cfaa3..b55fd45 100644 --- a/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml @@ -18,6 +18,8 @@ libboost_devel: - '1.84' libboost_python_devel: - '1.84' +mpfr: +- '4' numpy: - '1.22' pin_run_as_build: diff --git a/.ci_support/linux_64_numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_64_numpy1.22python3.8.____cpython.yaml index c191e43..987cd03 100644 --- a/.ci_support/linux_64_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.8.____cpython.yaml @@ -18,6 +18,8 @@ libboost_devel: - '1.84' libboost_python_devel: - '1.84' +mpfr: +- '4' numpy: - '1.22' pin_run_as_build: diff --git a/.ci_support/linux_64_numpy1.22python3.9.____73_pypy.yaml b/.ci_support/linux_64_numpy1.22python3.9.____73_pypy.yaml deleted file mode 100644 index 8dfc062..0000000 --- a/.ci_support/linux_64_numpy1.22python3.9.____73_pypy.yaml +++ /dev/null @@ -1,37 +0,0 @@ -c_stdlib: -- sysroot -c_stdlib_version: -- '2.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 -libboost_devel: -- '1.84' -libboost_python_devel: -- '1.84' -numpy: -- '1.22' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.9.* *_73_pypy -target_platform: -- linux-64 -urdfdom: -- '4.0' -zip_keys: -- - c_stdlib_version - - cdt_name -- - python - - numpy diff --git a/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml index 31f2955..bb59f30 100644 --- a/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml @@ -18,6 +18,8 @@ libboost_devel: - '1.84' libboost_python_devel: - '1.84' +mpfr: +- '4' numpy: - '1.22' pin_run_as_build: diff --git a/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml index d953056..cbe9a14 100644 --- a/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml @@ -18,6 +18,8 @@ libboost_devel: - '1.84' libboost_python_devel: - '1.84' +mpfr: +- '4' numpy: - '1.23' pin_run_as_build: diff --git a/.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml index 0eb2eec..ba1e736 100644 --- a/.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml @@ -18,6 +18,8 @@ libboost_devel: - '1.84' libboost_python_devel: - '1.84' +mpfr: +- '4' numpy: - '1.26' pin_run_as_build: diff --git a/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml index d3b7311..8bb17cc 100644 --- a/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml @@ -22,6 +22,8 @@ libboost_devel: - '1.84' libboost_python_devel: - '1.84' +mpfr: +- '4' numpy: - '1.22' pin_run_as_build: diff --git a/.ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml index e865c8c..40bae13 100644 --- a/.ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml @@ -22,6 +22,8 @@ libboost_devel: - '1.84' libboost_python_devel: - '1.84' +mpfr: +- '4' numpy: - '1.22' pin_run_as_build: diff --git a/.ci_support/linux_aarch64_numpy1.22python3.9.____73_pypy.yaml b/.ci_support/linux_aarch64_numpy1.22python3.9.____73_pypy.yaml deleted file mode 100644 index 2e77971..0000000 --- a/.ci_support/linux_aarch64_numpy1.22python3.9.____73_pypy.yaml +++ /dev/null @@ -1,41 +0,0 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' -cdt_arch: -- aarch64 -cdt_name: -- cos7 -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 -libboost_devel: -- '1.84' -libboost_python_devel: -- '1.84' -numpy: -- '1.22' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.9.* *_73_pypy -target_platform: -- linux-aarch64 -urdfdom: -- '4.0' -zip_keys: -- - c_stdlib_version - - cdt_name -- - python - - numpy diff --git a/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml index e86681f..568a79b 100644 --- a/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml @@ -22,6 +22,8 @@ libboost_devel: - '1.84' libboost_python_devel: - '1.84' +mpfr: +- '4' numpy: - '1.22' pin_run_as_build: diff --git a/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml index 2c1dd32..1cea6f8 100644 --- a/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml @@ -22,6 +22,8 @@ libboost_devel: - '1.84' libboost_python_devel: - '1.84' +mpfr: +- '4' numpy: - '1.23' pin_run_as_build: diff --git a/.ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml index 409a4e1..c2c7f1d 100644 --- a/.ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml @@ -22,6 +22,8 @@ libboost_devel: - '1.84' libboost_python_devel: - '1.84' +mpfr: +- '4' numpy: - '1.26' pin_run_as_build: diff --git a/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml index 19e33e9..f51a1c4 100644 --- a/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml @@ -18,6 +18,8 @@ libboost_devel: - '1.84' libboost_python_devel: - '1.84' +mpfr: +- '4' numpy: - '1.22' pin_run_as_build: diff --git a/.ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml index 70f30b2..0dcb2f4 100644 --- a/.ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml @@ -18,6 +18,8 @@ libboost_devel: - '1.84' libboost_python_devel: - '1.84' +mpfr: +- '4' numpy: - '1.22' pin_run_as_build: diff --git a/.ci_support/linux_ppc64le_numpy1.22python3.9.____73_pypy.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.9.____73_pypy.yaml deleted file mode 100644 index b6527c1..0000000 --- a/.ci_support/linux_ppc64le_numpy1.22python3.9.____73_pypy.yaml +++ /dev/null @@ -1,37 +0,0 @@ -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' -cdt_name: -- cos7 -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 -libboost_devel: -- '1.84' -libboost_python_devel: -- '1.84' -numpy: -- '1.22' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.9.* *_73_pypy -target_platform: -- linux-ppc64le -urdfdom: -- '4.0' -zip_keys: -- - c_stdlib_version - - cdt_name -- - python - - numpy diff --git a/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml index d4dfe13..aa31286 100644 --- a/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml @@ -18,6 +18,8 @@ libboost_devel: - '1.84' libboost_python_devel: - '1.84' +mpfr: +- '4' numpy: - '1.22' pin_run_as_build: diff --git a/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml index 7941cdb..fdb9407 100644 --- a/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml @@ -18,6 +18,8 @@ libboost_devel: - '1.84' libboost_python_devel: - '1.84' +mpfr: +- '4' numpy: - '1.23' pin_run_as_build: diff --git a/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml index 2d70933..1f1914c 100644 --- a/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml @@ -18,6 +18,8 @@ libboost_devel: - '1.84' libboost_python_devel: - '1.84' +mpfr: +- '4' numpy: - '1.26' pin_run_as_build: diff --git a/.ci_support/migrations/pypy38.yaml b/.ci_support/migrations/pypy38.yaml deleted file mode 100644 index 2dd1ff4..0000000 --- a/.ci_support/migrations/pypy38.yaml +++ /dev/null @@ -1,43 +0,0 @@ -migrator_ts: 1647123563 -__migrator: - migration_number: 1 - operation: key_add - primary_key: python - ordering: - python: - - 3.6.* *_cpython - - 3.7.* *_cpython - - 3.8.* *_cpython - - 3.9.* *_cpython - - 3.10.* *_cpython - - 3.6.* *_73_pypy - - 3.7.* *_73_pypy - - 3.8.* *_73_pypy - - 3.9.* *_73_pypy - paused: False - longterm: True - use_local: False - check_solvable: True - exclude_pinned_pkgs: False - pr_limit: 10 - bump_number: 1 - commit_message: "Rebuild for PyPy3.8 and PyPy3.9" - exclude: - # this shouldn't attempt to modify the python feedstocks - - python - - pypy3.6 - - pypy-meta - ignored_deps_per_node: - matplotlib: - - pyqt - -python: - - 3.8.* *_73_pypy # [not (osx and arm64)] - - 3.9.* *_73_pypy # [not (osx and arm64)] -numpy: - # part of a zip_keys: python, python_impl, numpy - - 1.20 # [not (osx and arm64)] - - 1.20 # [not (osx and arm64)] -python_impl: - - pypy # [not (osx and arm64)] - - pypy # [not (osx and arm64)] diff --git a/.ci_support/migrations/urdfdom40.yaml b/.ci_support/migrations/urdfdom40.yaml deleted file mode 100644 index a1e699a..0000000 --- a/.ci_support/migrations/urdfdom40.yaml +++ /dev/null @@ -1,8 +0,0 @@ -__migrator: - build_number: 1 - commit_message: Rebuild for urdfdom 4.0 - kind: version - migration_number: 1 -migrator_ts: 1703639180.921018 -urdfdom: -- '4.0' diff --git a/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml index 5bec1a7..c3ab383 100644 --- a/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml @@ -1,9 +1,11 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' +- '10.13' +MACOSX_SDK_VERSION: +- '10.13' c_stdlib: - macosx_deployment_target c_stdlib_version: -- '10.9' +- '10.13' channel_sources: - conda-forge channel_targets: @@ -20,6 +22,8 @@ llvm_openmp: - '16' macos_machine: - x86_64-apple-darwin13.4.0 +mpfr: +- '4' numpy: - '1.22' pin_run_as_build: diff --git a/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml index 8976d14..e33cf2b 100644 --- a/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml @@ -1,9 +1,11 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' +- '10.13' +MACOSX_SDK_VERSION: +- '10.13' c_stdlib: - macosx_deployment_target c_stdlib_version: -- '10.9' +- '10.13' channel_sources: - conda-forge channel_targets: @@ -20,6 +22,8 @@ llvm_openmp: - '16' macos_machine: - x86_64-apple-darwin13.4.0 +mpfr: +- '4' numpy: - '1.22' pin_run_as_build: diff --git a/.ci_support/osx_64_numpy1.22python3.9.____73_pypy.yaml b/.ci_support/osx_64_numpy1.22python3.9.____73_pypy.yaml deleted file mode 100644 index b0e8165..0000000 --- a/.ci_support/osx_64_numpy1.22python3.9.____73_pypy.yaml +++ /dev/null @@ -1,37 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.9' -c_stdlib: -- macosx_deployment_target -c_stdlib_version: -- '10.9' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- clangxx -cxx_compiler_version: -- '13' -libboost_devel: -- '1.84' -libboost_python_devel: -- '1.84' -llvm_openmp: -- '16' -macos_machine: -- x86_64-apple-darwin13.4.0 -numpy: -- '1.22' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.9.* *_73_pypy -target_platform: -- osx-64 -urdfdom: -- '4.0' -zip_keys: -- - python - - numpy diff --git a/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml index efbd85c..835089d 100644 --- a/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml @@ -1,9 +1,11 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' +- '10.13' +MACOSX_SDK_VERSION: +- '10.13' c_stdlib: - macosx_deployment_target c_stdlib_version: -- '10.9' +- '10.13' channel_sources: - conda-forge channel_targets: @@ -20,6 +22,8 @@ llvm_openmp: - '16' macos_machine: - x86_64-apple-darwin13.4.0 +mpfr: +- '4' numpy: - '1.22' pin_run_as_build: diff --git a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml index 36db20d..4337a8f 100644 --- a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml @@ -1,9 +1,11 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' +- '10.13' +MACOSX_SDK_VERSION: +- '10.13' c_stdlib: - macosx_deployment_target c_stdlib_version: -- '10.9' +- '10.13' channel_sources: - conda-forge channel_targets: @@ -20,6 +22,8 @@ llvm_openmp: - '16' macos_machine: - x86_64-apple-darwin13.4.0 +mpfr: +- '4' numpy: - '1.23' pin_run_as_build: diff --git a/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml b/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml index 06b9577..19787ee 100644 --- a/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml @@ -1,9 +1,11 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' +- '10.13' +MACOSX_SDK_VERSION: +- '10.13' c_stdlib: - macosx_deployment_target c_stdlib_version: -- '10.9' +- '10.13' channel_sources: - conda-forge channel_targets: @@ -20,6 +22,8 @@ llvm_openmp: - '16' macos_machine: - x86_64-apple-darwin13.4.0 +mpfr: +- '4' numpy: - '1.26' pin_run_as_build: diff --git a/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml index e41a5ce..581eafe 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -20,6 +22,8 @@ llvm_openmp: - '16' macos_machine: - arm64-apple-darwin20.0.0 +mpfr: +- '4' numpy: - '1.22' pin_run_as_build: diff --git a/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml index 9185cad..0476f8e 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -20,6 +22,8 @@ llvm_openmp: - '16' macos_machine: - arm64-apple-darwin20.0.0 +mpfr: +- '4' numpy: - '1.22' pin_run_as_build: diff --git a/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml index d1c2adb..99a2f36 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -20,6 +22,8 @@ llvm_openmp: - '16' macos_machine: - arm64-apple-darwin20.0.0 +mpfr: +- '4' numpy: - '1.22' pin_run_as_build: diff --git a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml index c7a9ee0..18735b6 100644 --- a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -20,6 +22,8 @@ llvm_openmp: - '16' macos_machine: - arm64-apple-darwin20.0.0 +mpfr: +- '4' numpy: - '1.23' pin_run_as_build: diff --git a/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml b/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml index 126e6d8..9fe4a05 100644 --- a/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -20,6 +22,8 @@ llvm_openmp: - '16' macos_machine: - arm64-apple-darwin20.0.0 +mpfr: +- '4' numpy: - '1.26' pin_run_as_build: diff --git a/.ci_support/win_64_numpy1.22python3.10.____cpython.yaml b/.ci_support/win_64_numpy1.22python3.10.____cpython.yaml index 1c7cc4a..1238ee0 100644 --- a/.ci_support/win_64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/win_64_numpy1.22python3.10.____cpython.yaml @@ -10,6 +10,8 @@ libboost_devel: - '1.84' libboost_python_devel: - '1.84' +mpfr: +- '4' numpy: - '1.22' pin_run_as_build: diff --git a/.ci_support/win_64_numpy1.22python3.8.____cpython.yaml b/.ci_support/win_64_numpy1.22python3.8.____cpython.yaml index 373a18c..ab56477 100644 --- a/.ci_support/win_64_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/win_64_numpy1.22python3.8.____cpython.yaml @@ -10,6 +10,8 @@ libboost_devel: - '1.84' libboost_python_devel: - '1.84' +mpfr: +- '4' numpy: - '1.22' pin_run_as_build: diff --git a/.ci_support/win_64_numpy1.22python3.9.____73_pypy.yaml b/.ci_support/win_64_numpy1.22python3.9.____73_pypy.yaml deleted file mode 100644 index e6fe52c..0000000 --- a/.ci_support/win_64_numpy1.22python3.9.____73_pypy.yaml +++ /dev/null @@ -1,27 +0,0 @@ -c_stdlib: -- vs -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- vs2019 -libboost_devel: -- '1.84' -libboost_python_devel: -- '1.84' -numpy: -- '1.22' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.9.* *_73_pypy -target_platform: -- win-64 -urdfdom: -- '4.0' -zip_keys: -- - python - - numpy diff --git a/.ci_support/win_64_numpy1.22python3.9.____cpython.yaml b/.ci_support/win_64_numpy1.22python3.9.____cpython.yaml index 54d58db..9564617 100644 --- a/.ci_support/win_64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/win_64_numpy1.22python3.9.____cpython.yaml @@ -10,6 +10,8 @@ libboost_devel: - '1.84' libboost_python_devel: - '1.84' +mpfr: +- '4' numpy: - '1.22' pin_run_as_build: diff --git a/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml index bc87c61..1ceb30e 100644 --- a/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml @@ -10,6 +10,8 @@ libboost_devel: - '1.84' libboost_python_devel: - '1.84' +mpfr: +- '4' numpy: - '1.23' pin_run_as_build: diff --git a/.ci_support/win_64_numpy1.26python3.12.____cpython.yaml b/.ci_support/win_64_numpy1.26python3.12.____cpython.yaml index 7c516c0..c19e5f0 100644 --- a/.ci_support/win_64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/win_64_numpy1.26python3.12.____cpython.yaml @@ -10,6 +10,8 @@ libboost_devel: - '1.84' libboost_python_devel: - '1.84' +mpfr: +- '4' numpy: - '1.26' pin_run_as_build: 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/.github/CODEOWNERS b/.github/CODEOWNERS index 9e811ee..89be0b5 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +1 @@ -* @jcarpent @jorisv @lesteve @wolfv @ymontmarin \ No newline at end of file +* @jcarpent @jorisv @wolfv @ymontmarin \ No newline at end of file diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 899ba03..a5836e8 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -72,6 +72,13 @@ else --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --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_osx_build.sh b/.scripts/run_osx_build.sh index 07dff21..ba0c879 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -85,6 +85,13 @@ else --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --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_win_build.bat b/.scripts/run_win_build.bat index 6d54697..65650bf 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -58,6 +58,11 @@ echo Building recipe conda-build.exe "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% if !errorlevel! neq 0 exit /b !errorlevel! +call :start_group "Inspecting artifacts" +:: inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 +WHERE inspect_artifacts >nul 2>nul && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" +call :end_group + :: Prepare some environment variables for the upload step if /i "%CI%" == "github_actions" ( set "FEEDSTOCK_NAME=%GITHUB_REPOSITORY:*/=%" diff --git a/README.md b/README.md index c1e8a0d..9ede356 100644 --- a/README.md +++ b/README.md @@ -42,13 +42,6 @@ Current build status variant - - linux_64_numpy1.22python3.9.____73_pypy - - - variant - - linux_64_numpy1.22python3.9.____cpython @@ -84,13 +77,6 @@ Current build status variant - - linux_aarch64_numpy1.22python3.9.____73_pypy - - - variant - - linux_aarch64_numpy1.22python3.9.____cpython @@ -126,13 +112,6 @@ Current build status variant - - linux_ppc64le_numpy1.22python3.9.____73_pypy - - - variant - - linux_ppc64le_numpy1.22python3.9.____cpython @@ -168,13 +147,6 @@ Current build status variant - - osx_64_numpy1.22python3.9.____73_pypy - - - variant - - osx_64_numpy1.22python3.9.____cpython @@ -245,13 +217,6 @@ Current build status variant - - win_64_numpy1.22python3.9.____73_pypy - - - variant - - win_64_numpy1.22python3.9.____cpython @@ -404,7 +369,6 @@ Feedstock Maintainers * [@jcarpent](https://github.com/jcarpent/) * [@jorisv](https://github.com/jorisv/) -* [@lesteve](https://github.com/lesteve/) * [@wolfv](https://github.com/wolfv/) * [@ymontmarin](https://github.com/ymontmarin/) diff --git a/recipe/bld.bat b/recipe/bld.bat index 6b3948e..c5e2217 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -15,15 +15,20 @@ cmake ^ -DPYTHON_SITELIB=%SP_DIR% ^ -DPYTHON_EXECUTABLE=%PYTHON% ^ -DBUILD_PYTHON_INTERFACE=ON ^ - -DBUILD_WITH_COLLISION_SUPPORT=ON ^ -DGENERATE_PYTHON_STUBS=ON ^ - -DBUILD_WITH_URDF_SUPPORT=ON ^ + -DBUILD_WITH_COLLISION_SUPPORT=ON ^ + -DBUILD_WITH_CASADI_SUPPORT=ON ^ + -DBUILD_WITH_AUTODIFF_SUPPORT=OFF ^ + -DBUILD_WITH_CODEGEN_SUPPORT=OFF ^ + -DBUILD_WITH_EXTRA_SUPPORT=ON ^ + -DBUILD_WITH_OPENMP_SUPPORT=ON ^ + -DBUILD_PYTHON_BINDINGS_WITH_BOOST_MPFR_SUPPORT=OFF ^ -DBUILD_TESTING=OFF ^ %SRC_DIR% if errorlevel 1 exit 1 :: Build. -cmake --build . --config Release +cmake --build . --config Release -j2 if errorlevel 1 exit 1 :: Install. diff --git a/recipe/build.sh b/recipe/build.sh index 9046340..6860936 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -19,15 +19,19 @@ fi cmake ${CMAKE_ARGS} .. \ -DCMAKE_BUILD_TYPE=Release \ - -DBUILD_WITH_URDF_SUPPORT=ON \ -DBUILD_WITH_COLLISION_SUPPORT=ON \ - -DPython3_NumPy_INCLUDE_DIR=$TARGET_NUMPY_INCLUDE_DIRS \ + -DBUILD_WITH_CASADI_SUPPORT=ON \ + -DBUILD_WITH_AUTODIFF_SUPPORT=OFF \ + -DBUILD_WITH_CODEGEN_SUPPORT=OFF \ + -DBUILD_WITH_EXTRA_SUPPORT=ON \ -DBUILD_WITH_OPENMP_SUPPORT=ON \ + -DBUILD_PYTHON_BINDINGS_WITH_BOOST_MPFR_SUPPORT=OFF \ + -DPython3_NumPy_INCLUDE_DIR=$TARGET_NUMPY_INCLUDE_DIRS \ -DBUILD_TESTING=OFF \ -DGENERATE_PYTHON_STUBS=$GENERATE_PYTHON_STUBS \ -DPYTHON_EXECUTABLE=$PYTHON -make -j${CPU_COUNT} +make make install if [[ $CONDA_BUILD_CROSS_COMPILATION == 1 ]]; then diff --git a/recipe/meta.yaml b/recipe/meta.yaml index fa8e45d..1fbdb02 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,5 @@ {% set name = "pinocchio" %} -{% set version = "2.7.1" %} +{% set version = "3.0.0" %} package: name: {{ name|lower }} @@ -7,7 +7,12 @@ package: source: url: https://github.com/stack-of-tasks/{{ name }}/releases/download/v{{ version }}/{{ name }}-{{ version }}.tar.gz - sha256: fd50b72f9f32c14c8f9e7712d9abe077c154d2072e780faf12cc132cc198815f + sha256: 0e49f3d92e303fe109bc8b329513708a03cdb734a90cb7734821ed2978de8d10 + patches: + # Fix PyPy support (https://github.com/stack-of-tasks/pinocchio/pull/2274) + - patches/0001-cmake-Turn-BUILD_WITH_LIBPYTHON-OFF-when-building-wi.patch + # Fix cross build with hpp-fcl (https://github.com/stack-of-tasks/pinocchio/pull/2288) + - patches/0002-cmake-Always-suppose-hpp-fcl-Python-binding-are-pres.patch build: number: 0 @@ -35,6 +40,7 @@ requirements: - python - llvm-openmp # [not win] - numpy + - casadi run: - eigen - eigenpy @@ -43,12 +49,13 @@ requirements: - python - llvm-openmp # [not win] - {{ pin_compatible('numpy') }} + - casadi test: requires: - pkg-config commands: - pkg-config --modversion {{ name }} - - test -f $PREFIX/lib/lib{{ name }}${SHLIB_EXT} # [not win] + - test -f $PREFIX/lib/lib{{ name }}_default${SHLIB_EXT} # [not win] imports: - pinocchio diff --git a/recipe/patches/0001-cmake-Turn-BUILD_WITH_LIBPYTHON-OFF-when-building-wi.patch b/recipe/patches/0001-cmake-Turn-BUILD_WITH_LIBPYTHON-OFF-when-building-wi.patch new file mode 100644 index 0000000..9844544 --- /dev/null +++ b/recipe/patches/0001-cmake-Turn-BUILD_WITH_LIBPYTHON-OFF-when-building-wi.patch @@ -0,0 +1,41 @@ +From a11f67fd820c9a9693f7df8a11c3533cbd6b8ee2 Mon Sep 17 00:00:00 2001 +From: Joris Vaillant +Date: Tue, 4 Jun 2024 17:09:40 +0200 +Subject: [PATCH 1/2] cmake: Turn `BUILD_WITH_LIBPYTHON` OFF when building with + PyPy + +This already had been fixed in 4d521ec but had been lost in CMakeLists +refactoring. +--- + CMakeLists.txt | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 048a03b67..99d06a1cf 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -280,15 +280,17 @@ if(BUILD_PYTHON_INTERFACE) + + message(STATUS "Python compiler: ${_python_implementation_value}") + if(_python_implementation_value MATCHES "PyPy") +- set(BUILD_PYTHON_INTERFACE_WITH_PYPY TRUE) ++ set(BUILD_WITH_LIBPYTHON OFF) ++ message( ++ STATUS ++ "PyPy detected, therefore libpython is not available and BUILD_WITH_LIBPYTHON set to OFF.") + endif() +- +-else(BUILD_PYTHON_INTERFACE) ++else() + message( + STATUS + "Pinocchio won't be compiled with its Python bindings. If you want to enable this feature, please set the option BUILD_PYTHON_INTERFACE to ON." + ) +-endif(BUILD_PYTHON_INTERFACE) ++endif() + + if(BUILD_WITH_HPP_FCL_SUPPORT) + list(APPEND CFLAGS_DEPENDENCIES "-DPINOCCHIO_WITH_HPP_FCL") +-- +2.34.1 + diff --git a/recipe/patches/0002-cmake-Always-suppose-hpp-fcl-Python-binding-are-pres.patch b/recipe/patches/0002-cmake-Always-suppose-hpp-fcl-Python-binding-are-pres.patch new file mode 100644 index 0000000..c9f159e --- /dev/null +++ b/recipe/patches/0002-cmake-Always-suppose-hpp-fcl-Python-binding-are-pres.patch @@ -0,0 +1,105 @@ +From 9467f1a60a843c290c383baa5938a6f7099fbf28 Mon Sep 17 00:00:00 2001 +From: Joris Vaillant +Date: Tue, 18 Jun 2024 11:31:07 +0200 +Subject: [PATCH 1/2] =?UTF-8?q?cmake:=C2=A0Always=20suppose=20hpp-fcl=20Py?= + =?UTF-8?q?thon=20binding=20are=20present=20when=20hpp-fcl=20C++=20library?= + =?UTF-8?q?=20is=20found?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Pinocchio Python binding needs hpp-fcl Python binding for +collision/contact related algorithms. + +We allow with the `BUILD_WITH_HPP_FCL_PYTHON_BINDINGS` CMake variable to build +Pinocchio C++ library with hpp-fcl but to ignore hpp-fcl in the Python +bindings if the hpp-fcl Python bindings are not installed. + +This create the following issues: +- To compute `BUILD_WITH_HPP_FCL_PYTHON_BINDINGS` we must call the + Python interpreter. This create some issue when cross compiling. +- We never test this case in our CI, so we don't know if this option is + working. + +This PR remove this option to simplify the build. +In the case an user build Pinocchio Python binding with hpp-fcl +C++ library but without hpp-fcl binding, the Python interpreter will +raise an ImportError. +--- + CMakeLists.txt | 17 +---------------- + bindings/python/CMakeLists.txt | 6 +++--- + unittest/python/CMakeLists.txt | 8 +++----- + 3 files changed, 7 insertions(+), 24 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 99d06a1cf..b4b9875a5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -296,22 +296,7 @@ if(BUILD_WITH_HPP_FCL_SUPPORT) + list(APPEND CFLAGS_DEPENDENCIES "-DPINOCCHIO_WITH_HPP_FCL") + list(APPEND LIBRARIES_DEPENDENCIES "hpp-fcl") + add_project_dependency(hpp-fcl 2.1.2 REQUIRED PKG_CONFIG_REQUIRES "hpp-fcl >= 2.1.2") +- # Check whether hpp-fcl python bindings are available. +- set(BUILD_WITH_HPP_FCL_PYTHON_BINDINGS FALSE) +- if(BUILD_PYTHON_INTERFACE) +- execute_process( +- COMMAND ${PYTHON_EXECUTABLE} -c "import hppfcl" +- RESULT_VARIABLE _hpp_fcl_python_bindings_not_found +- OUTPUT_QUIET ERROR_QUIET) +- if(_hpp_fcl_python_bindings_not_found EQUAL 0) +- set(BUILD_WITH_HPP_FCL_PYTHON_BINDINGS TRUE) +- message(STATUS "Found hpp-fcl Python bindings.") +- else() +- message(STATUS "hpp-fcl Python bindings NOT found.") +- endif() +- unset(_hpp_fcl_python_bindings_not_found) +- endif(BUILD_PYTHON_INTERFACE) +-endif(BUILD_WITH_HPP_FCL_SUPPORT) ++endif() + + if(BUILD_WITH_ACCELERATE_SUPPORT) + if(NOT ${Eigen3_VERSION} VERSION_GREATER_EQUAL "3.4.90") +diff --git a/bindings/python/CMakeLists.txt b/bindings/python/CMakeLists.txt +index 4a829524f..5e01c9850 100644 +--- a/bindings/python/CMakeLists.txt ++++ b/bindings/python/CMakeLists.txt +@@ -83,13 +83,13 @@ function(PINOCCHIO_PYTHON_BINDINGS_SPECIFIC_TYPE scalar_name) + # console_bridge::setLogLevel function. + target_link_libraries(${PYTHON_LIB_NAME} PUBLIC console_bridge::console_bridge) + endif() +- if(BUILD_WITH_HPP_FCL_PYTHON_BINDINGS) ++ if(BUILD_WITH_HPP_FCL_SUPPORT) + target_compile_definitions(${PYTHON_LIB_NAME} + PRIVATE -DPINOCCHIO_PYTHON_INTERFACE_WITH_HPP_FCL_PYTHON_BINDINGS) +- endif(BUILD_WITH_HPP_FCL_PYTHON_BINDINGS) ++ endif() + if(WIN32) + target_link_libraries(${PYTHON_LIB_NAME} PUBLIC ${PYTHON_LIBRARY}) +- endif(WIN32) ++ endif() + + set(${PYWRAP}_INSTALL_DIR ${ABSOLUTE_PYTHON_SITELIB}/${PROJECT_NAME}) + +diff --git a/unittest/python/CMakeLists.txt b/unittest/python/CMakeLists.txt +index abe439fbe..1751fbc4c 100644 +--- a/unittest/python/CMakeLists.txt ++++ b/unittest/python/CMakeLists.txt +@@ -45,12 +45,10 @@ set(${PROJECT_NAME}_PYTHON_TESTS + bindings_std_vector + bindings_std_map) + +-if(hpp-fcl_FOUND) ++if(BUILD_WITH_HPP_FCL_SUPPORT) + set(${PROJECT_NAME}_PYTHON_TESTS ${${PROJECT_NAME}_PYTHON_TESTS} bindings_geometry_object) +- if(BUILD_WITH_HPP_FCL_PYTHON_BINDINGS) +- set(${PROJECT_NAME}_PYTHON_TESTS ${${PROJECT_NAME}_PYTHON_TESTS} bindings_fcl_transform) +- endif(BUILD_WITH_HPP_FCL_PYTHON_BINDINGS) +-endif(hpp-fcl_FOUND) ++ set(${PROJECT_NAME}_PYTHON_TESTS ${${PROJECT_NAME}_PYTHON_TESTS} bindings_fcl_transform) ++endif() + + if(urdfdom_FOUND) + set(${PROJECT_NAME}_PYTHON_TESTS ${${PROJECT_NAME}_PYTHON_TESTS} bindings_urdf +-- +2.34.1 +