diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 66f6835..1443bee 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,14 +8,6 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_numpy1.22python3.8.____cpython: - CONFIG: linux_64_numpy1.22python3.8.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - 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 linux_64_numpy2.0python3.10.____cpython: CONFIG: linux_64_numpy2.0python3.10.____cpython UPLOAD_PACKAGES: 'True' @@ -32,6 +24,50 @@ jobs: CONFIG: linux_64_numpy2.0python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_64_numpy2python3.13.____cp313: + CONFIG: linux_64_numpy2python3.13.____cp313 + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_aarch64_numpy2.0python3.10.____cpython: + CONFIG: linux_aarch64_numpy2.0python3.10.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_aarch64_numpy2.0python3.11.____cpython: + CONFIG: linux_aarch64_numpy2.0python3.11.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_aarch64_numpy2.0python3.12.____cpython: + CONFIG: linux_aarch64_numpy2.0python3.12.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_aarch64_numpy2.0python3.9.____cpython: + CONFIG: linux_aarch64_numpy2.0python3.9.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_aarch64_numpy2python3.13.____cp313: + CONFIG: linux_aarch64_numpy2python3.13.____cp313 + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_ppc64le_numpy2.0python3.10.____cpython: + CONFIG: linux_ppc64le_numpy2.0python3.10.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_ppc64le_numpy2.0python3.11.____cpython: + CONFIG: linux_ppc64le_numpy2.0python3.11.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_ppc64le_numpy2.0python3.12.____cpython: + CONFIG: linux_ppc64le_numpy2.0python3.12.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_ppc64le_numpy2.0python3.9.____cpython: + CONFIG: linux_ppc64le_numpy2.0python3.9.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_ppc64le_numpy2python3.13.____cp313: + CONFIG: linux_ppc64le_numpy2python3.13.____cp313 + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 timeoutInMinutes: 360 variables: {} diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 59e6f8f..f1d5a74 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -8,12 +8,6 @@ jobs: vmImage: macOS-12 strategy: matrix: - osx_64_numpy1.22python3.8.____cpython: - CONFIG: osx_64_numpy1.22python3.8.____cpython - UPLOAD_PACKAGES: 'True' - osx_64_numpy1.22python3.9.____73_pypy: - CONFIG: osx_64_numpy1.22python3.9.____73_pypy - UPLOAD_PACKAGES: 'True' osx_64_numpy2.0python3.10.____cpython: CONFIG: osx_64_numpy2.0python3.10.____cpython UPLOAD_PACKAGES: 'True' @@ -26,8 +20,8 @@ jobs: osx_64_numpy2.0python3.9.____cpython: CONFIG: osx_64_numpy2.0python3.9.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_numpy1.22python3.8.____cpython: - CONFIG: osx_arm64_numpy1.22python3.8.____cpython + osx_64_numpy2python3.13.____cp313: + CONFIG: osx_64_numpy2python3.13.____cp313 UPLOAD_PACKAGES: 'True' osx_arm64_numpy2.0python3.10.____cpython: CONFIG: osx_arm64_numpy2.0python3.10.____cpython @@ -41,6 +35,9 @@ jobs: osx_arm64_numpy2.0python3.9.____cpython: CONFIG: osx_arm64_numpy2.0python3.9.____cpython UPLOAD_PACKAGES: 'True' + osx_arm64_numpy2python3.13.____cp313: + CONFIG: osx_arm64_numpy2python3.13.____cp313 + UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: {} diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 506bba6..900e757 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -8,12 +8,6 @@ jobs: vmImage: windows-2022 strategy: matrix: - win_64_numpy1.22python3.8.____cpython: - CONFIG: win_64_numpy1.22python3.8.____cpython - UPLOAD_PACKAGES: 'True' - win_64_numpy1.22python3.9.____73_pypy: - CONFIG: win_64_numpy1.22python3.9.____73_pypy - UPLOAD_PACKAGES: 'True' win_64_numpy2.0python3.10.____cpython: CONFIG: win_64_numpy2.0python3.10.____cpython UPLOAD_PACKAGES: 'True' @@ -26,6 +20,9 @@ jobs: win_64_numpy2.0python3.9.____cpython: CONFIG: win_64_numpy2.0python3.9.____cpython UPLOAD_PACKAGES: 'True' + win_64_numpy2python3.13.____cp313: + CONFIG: win_64_numpy2python3.13.____cp313 + UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: CONDA_BLD_PATH: D:\\bld\\ diff --git a/.ci_support/linux_64_numpy2.0python3.10.____cpython.yaml b/.ci_support/linux_64_numpy2.0python3.10.____cpython.yaml index 5a70f23..f9ca7b8 100644 --- a/.ci_support/linux_64_numpy2.0python3.10.____cpython.yaml +++ b/.ci_support/linux_64_numpy2.0python3.10.____cpython.yaml @@ -45,3 +45,4 @@ zip_keys: - cdt_name - - python - numpy + - channel_sources diff --git a/.ci_support/linux_64_numpy2.0python3.11.____cpython.yaml b/.ci_support/linux_64_numpy2.0python3.11.____cpython.yaml index 54e7ffc..29ce5d4 100644 --- a/.ci_support/linux_64_numpy2.0python3.11.____cpython.yaml +++ b/.ci_support/linux_64_numpy2.0python3.11.____cpython.yaml @@ -45,3 +45,4 @@ zip_keys: - cdt_name - - python - numpy + - channel_sources diff --git a/.ci_support/linux_64_numpy2.0python3.12.____cpython.yaml b/.ci_support/linux_64_numpy2.0python3.12.____cpython.yaml index 77a9ad2..384d37b 100644 --- a/.ci_support/linux_64_numpy2.0python3.12.____cpython.yaml +++ b/.ci_support/linux_64_numpy2.0python3.12.____cpython.yaml @@ -45,3 +45,4 @@ zip_keys: - cdt_name - - python - numpy + - channel_sources diff --git a/.ci_support/linux_64_numpy2.0python3.9.____cpython.yaml b/.ci_support/linux_64_numpy2.0python3.9.____cpython.yaml index a86bd8f..caf3aff 100644 --- a/.ci_support/linux_64_numpy2.0python3.9.____cpython.yaml +++ b/.ci_support/linux_64_numpy2.0python3.9.____cpython.yaml @@ -45,3 +45,4 @@ zip_keys: - cdt_name - - python - numpy + - channel_sources diff --git a/.ci_support/linux_64_numpy2python3.13.____cp313.yaml b/.ci_support/linux_64_numpy2python3.13.____cp313.yaml new file mode 100644 index 0000000..ae0f7f1 --- /dev/null +++ b/.ci_support/linux_64_numpy2python3.13.____cp313.yaml @@ -0,0 +1,48 @@ +assimp: +- 5.4.2 +c_compiler: +- gcc +c_compiler_version: +- '13' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +cdt_name: +- cos7 +channel_sources: +- conda-forge/label/python_rc,conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '13' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +idyntree: +- '12' +ipopt: +- 3.14.16 +libosqp: +- 0.6.3 +libxml2: +- '2' +numpy: +- '2' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.13.* *_cp313 +target_platform: +- linux-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - c_stdlib_version + - cdt_name +- - python + - numpy + - channel_sources diff --git a/.ci_support/linux_aarch64_numpy2.0python3.10.____cpython.yaml b/.ci_support/linux_aarch64_numpy2.0python3.10.____cpython.yaml index 2e800a1..c910a5f 100644 --- a/.ci_support/linux_aarch64_numpy2.0python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy2.0python3.10.____cpython.yaml @@ -23,7 +23,7 @@ cxx_compiler: cxx_compiler_version: - '13' docker_image: -- quay.io/condaforge/linux-anvil-aarch64 +- quay.io/condaforge/linux-anvil-cos7-x86_64 idyntree: - '12' ipopt: @@ -49,3 +49,4 @@ zip_keys: - cdt_name - - python - numpy + - channel_sources diff --git a/.ci_support/linux_aarch64_numpy2.0python3.11.____cpython.yaml b/.ci_support/linux_aarch64_numpy2.0python3.11.____cpython.yaml index 519c818..bce8e31 100644 --- a/.ci_support/linux_aarch64_numpy2.0python3.11.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy2.0python3.11.____cpython.yaml @@ -23,7 +23,7 @@ cxx_compiler: cxx_compiler_version: - '13' docker_image: -- quay.io/condaforge/linux-anvil-aarch64 +- quay.io/condaforge/linux-anvil-cos7-x86_64 idyntree: - '12' ipopt: @@ -49,3 +49,4 @@ zip_keys: - cdt_name - - python - numpy + - channel_sources diff --git a/.ci_support/linux_aarch64_numpy2.0python3.12.____cpython.yaml b/.ci_support/linux_aarch64_numpy2.0python3.12.____cpython.yaml index f7a5cd3..af51654 100644 --- a/.ci_support/linux_aarch64_numpy2.0python3.12.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy2.0python3.12.____cpython.yaml @@ -23,7 +23,7 @@ cxx_compiler: cxx_compiler_version: - '13' docker_image: -- quay.io/condaforge/linux-anvil-aarch64 +- quay.io/condaforge/linux-anvil-cos7-x86_64 idyntree: - '12' ipopt: @@ -49,3 +49,4 @@ zip_keys: - cdt_name - - python - numpy + - channel_sources diff --git a/.ci_support/linux_aarch64_numpy2.0python3.9.____cpython.yaml b/.ci_support/linux_aarch64_numpy2.0python3.9.____cpython.yaml index f8998e3..58c5bba 100644 --- a/.ci_support/linux_aarch64_numpy2.0python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy2.0python3.9.____cpython.yaml @@ -23,7 +23,7 @@ cxx_compiler: cxx_compiler_version: - '13' docker_image: -- quay.io/condaforge/linux-anvil-aarch64 +- quay.io/condaforge/linux-anvil-cos7-x86_64 idyntree: - '12' ipopt: @@ -49,3 +49,4 @@ zip_keys: - cdt_name - - python - numpy + - channel_sources diff --git a/.ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_aarch64_numpy2python3.13.____cp313.yaml similarity index 81% rename from .ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml rename to .ci_support/linux_aarch64_numpy2python3.13.____cp313.yaml index 7cce55f..34cf4f4 100644 --- a/.ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy2python3.13.____cp313.yaml @@ -15,7 +15,7 @@ cdt_arch: cdt_name: - cos7 channel_sources: -- conda-forge +- conda-forge/label/python_rc,conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -23,7 +23,7 @@ cxx_compiler: cxx_compiler_version: - '13' docker_image: -- quay.io/condaforge/linux-anvil-aarch64 +- quay.io/condaforge/linux-anvil-cos7-x86_64 idyntree: - '12' ipopt: @@ -33,13 +33,13 @@ libosqp: libxml2: - '2' numpy: -- '1.22' +- '2' pin_run_as_build: python: min_pin: x.x max_pin: x.x python: -- 3.8.* *_cpython +- 3.13.* *_cp313 target_platform: - linux-aarch64 zip_keys: @@ -49,3 +49,4 @@ zip_keys: - cdt_name - - python - numpy + - channel_sources diff --git a/.ci_support/linux_64_numpy1.22python3.9.____73_pypy.yaml b/.ci_support/linux_ppc64le_numpy2.0python3.10.____cpython.yaml similarity index 90% rename from .ci_support/linux_64_numpy1.22python3.9.____73_pypy.yaml rename to .ci_support/linux_ppc64le_numpy2.0python3.10.____cpython.yaml index 1b59398..4b9ea69 100644 --- a/.ci_support/linux_64_numpy1.22python3.9.____73_pypy.yaml +++ b/.ci_support/linux_ppc64le_numpy2.0python3.10.____cpython.yaml @@ -29,15 +29,15 @@ libosqp: libxml2: - '2' numpy: -- '1.22' +- '2.0' pin_run_as_build: python: min_pin: x.x max_pin: x.x python: -- 3.9.* *_73_pypy +- 3.10.* *_cpython target_platform: -- linux-64 +- linux-ppc64le zip_keys: - - c_compiler_version - cxx_compiler_version @@ -45,3 +45,4 @@ zip_keys: - cdt_name - - python - numpy + - channel_sources diff --git a/.ci_support/linux_aarch64_numpy1.22python3.9.____73_pypy.yaml b/.ci_support/linux_ppc64le_numpy2.0python3.11.____cpython.yaml similarity index 78% rename from .ci_support/linux_aarch64_numpy1.22python3.9.____73_pypy.yaml rename to .ci_support/linux_ppc64le_numpy2.0python3.11.____cpython.yaml index 2f3a3f7..5c3f835 100644 --- a/.ci_support/linux_aarch64_numpy1.22python3.9.____73_pypy.yaml +++ b/.ci_support/linux_ppc64le_numpy2.0python3.11.____cpython.yaml @@ -1,5 +1,3 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu assimp: - 5.4.2 c_compiler: @@ -10,8 +8,6 @@ c_stdlib: - sysroot c_stdlib_version: - '2.17' -cdt_arch: -- aarch64 cdt_name: - cos7 channel_sources: @@ -23,7 +19,7 @@ cxx_compiler: cxx_compiler_version: - '13' docker_image: -- quay.io/condaforge/linux-anvil-aarch64 +- quay.io/condaforge/linux-anvil-cos7-x86_64 idyntree: - '12' ipopt: @@ -33,15 +29,15 @@ libosqp: libxml2: - '2' numpy: -- '1.22' +- '2.0' pin_run_as_build: python: min_pin: x.x max_pin: x.x python: -- 3.9.* *_73_pypy +- 3.11.* *_cpython target_platform: -- linux-aarch64 +- linux-ppc64le zip_keys: - - c_compiler_version - cxx_compiler_version @@ -49,3 +45,4 @@ zip_keys: - cdt_name - - python - numpy + - channel_sources diff --git a/.ci_support/linux_ppc64le_numpy2.0python3.12.____cpython.yaml b/.ci_support/linux_ppc64le_numpy2.0python3.12.____cpython.yaml new file mode 100644 index 0000000..aa4440b --- /dev/null +++ b/.ci_support/linux_ppc64le_numpy2.0python3.12.____cpython.yaml @@ -0,0 +1,48 @@ +assimp: +- 5.4.2 +c_compiler: +- gcc +c_compiler_version: +- '13' +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: +- '13' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +idyntree: +- '12' +ipopt: +- 3.14.16 +libosqp: +- 0.6.3 +libxml2: +- '2' +numpy: +- '2.0' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +target_platform: +- linux-ppc64le +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - c_stdlib_version + - cdt_name +- - python + - numpy + - channel_sources diff --git a/.ci_support/linux_64_numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_ppc64le_numpy2.0python3.9.____cpython.yaml similarity index 90% rename from .ci_support/linux_64_numpy1.22python3.8.____cpython.yaml rename to .ci_support/linux_ppc64le_numpy2.0python3.9.____cpython.yaml index 76c3a5b..f2c06a0 100644 --- a/.ci_support/linux_64_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy2.0python3.9.____cpython.yaml @@ -29,15 +29,15 @@ libosqp: libxml2: - '2' numpy: -- '1.22' +- '2.0' pin_run_as_build: python: min_pin: x.x max_pin: x.x python: -- 3.8.* *_cpython +- 3.9.* *_cpython target_platform: -- linux-64 +- linux-ppc64le zip_keys: - - c_compiler_version - cxx_compiler_version @@ -45,3 +45,4 @@ zip_keys: - cdt_name - - python - numpy + - channel_sources diff --git a/.ci_support/linux_ppc64le_numpy2python3.13.____cp313.yaml b/.ci_support/linux_ppc64le_numpy2python3.13.____cp313.yaml new file mode 100644 index 0000000..12992fa --- /dev/null +++ b/.ci_support/linux_ppc64le_numpy2python3.13.____cp313.yaml @@ -0,0 +1,48 @@ +assimp: +- 5.4.2 +c_compiler: +- gcc +c_compiler_version: +- '13' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +cdt_name: +- cos7 +channel_sources: +- conda-forge/label/python_rc,conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '13' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +idyntree: +- '12' +ipopt: +- 3.14.16 +libosqp: +- 0.6.3 +libxml2: +- '2' +numpy: +- '2' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.13.* *_cp313 +target_platform: +- linux-ppc64le +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - c_stdlib_version + - cdt_name +- - python + - numpy + - channel_sources diff --git a/.ci_support/migrations/pypy38.yaml b/.ci_support/migrations/pypy38.yaml deleted file mode 100644 index 741fc1e..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.19 # [not (osx and arm64)] - - 1.19 # [not (osx and arm64)] -python_impl: - - pypy # [not (osx and arm64)] - - pypy # [not (osx and arm64)] diff --git a/.ci_support/migrations/python313.yaml b/.ci_support/migrations/python313.yaml new file mode 100644 index 0000000..92cc90b --- /dev/null +++ b/.ci_support/migrations/python313.yaml @@ -0,0 +1,44 @@ +migrator_ts: 1724712607 +__migrator: + commit_message: Rebuild for python 3.13 + 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.11.* *_cpython + - 3.12.* *_cpython + - 3.13.* *_cp313 # new entry + - 3.6.* *_73_pypy + - 3.7.* *_73_pypy + - 3.8.* *_73_pypy + - 3.9.* *_73_pypy + paused: false + longterm: true + pr_limit: 20 + max_solver_attempts: 3 # this will make the bot retry "not solvable" stuff 12 times + exclude: + # this shouldn't attempt to modify the python feedstocks + - python + - pypy3.6 + - pypy-meta + - cross-python + - python_abi + exclude_pinned_pkgs: false + additional_zip_keys: + - channel_sources + +python: +- 3.13.* *_cp313 +channel_sources: +- conda-forge/label/python_rc,conda-forge +# additional entries to add for zip_keys +numpy: +- 2 +python_impl: +- cpython 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 9b2ed96..0000000 --- a/.ci_support/osx_64_numpy1.22python3.9.____73_pypy.yaml +++ /dev/null @@ -1,47 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.13' -MACOSX_SDK_VERSION: -- '10.13' -assimp: -- 5.4.2 -c_compiler: -- clang -c_compiler_version: -- '17' -c_stdlib: -- macosx_deployment_target -c_stdlib_version: -- '10.13' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- clangxx -cxx_compiler_version: -- '17' -idyntree: -- '12' -ipopt: -- 3.14.16 -libosqp: -- 0.6.3 -libxml2: -- '2' -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 -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - python - - numpy diff --git a/.ci_support/osx_64_numpy2.0python3.10.____cpython.yaml b/.ci_support/osx_64_numpy2.0python3.10.____cpython.yaml index 7ca178c..e1a4450 100644 --- a/.ci_support/osx_64_numpy2.0python3.10.____cpython.yaml +++ b/.ci_support/osx_64_numpy2.0python3.10.____cpython.yaml @@ -45,3 +45,4 @@ zip_keys: - cxx_compiler_version - - python - numpy + - channel_sources diff --git a/.ci_support/osx_64_numpy2.0python3.11.____cpython.yaml b/.ci_support/osx_64_numpy2.0python3.11.____cpython.yaml index 0e15696..88ff5ee 100644 --- a/.ci_support/osx_64_numpy2.0python3.11.____cpython.yaml +++ b/.ci_support/osx_64_numpy2.0python3.11.____cpython.yaml @@ -45,3 +45,4 @@ zip_keys: - cxx_compiler_version - - python - numpy + - channel_sources diff --git a/.ci_support/osx_64_numpy2.0python3.12.____cpython.yaml b/.ci_support/osx_64_numpy2.0python3.12.____cpython.yaml index 454c1a0..db43c21 100644 --- a/.ci_support/osx_64_numpy2.0python3.12.____cpython.yaml +++ b/.ci_support/osx_64_numpy2.0python3.12.____cpython.yaml @@ -45,3 +45,4 @@ zip_keys: - cxx_compiler_version - - python - numpy + - channel_sources diff --git a/.ci_support/osx_64_numpy2.0python3.9.____cpython.yaml b/.ci_support/osx_64_numpy2.0python3.9.____cpython.yaml index bf6acf1..80ecb8b 100644 --- a/.ci_support/osx_64_numpy2.0python3.9.____cpython.yaml +++ b/.ci_support/osx_64_numpy2.0python3.9.____cpython.yaml @@ -45,3 +45,4 @@ zip_keys: - cxx_compiler_version - - python - numpy + - channel_sources diff --git a/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml b/.ci_support/osx_64_numpy2python3.13.____cp313.yaml similarity index 87% rename from .ci_support/osx_64_numpy1.22python3.8.____cpython.yaml rename to .ci_support/osx_64_numpy2python3.13.____cp313.yaml index 0305f01..25ff8af 100644 --- a/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/osx_64_numpy2python3.13.____cp313.yaml @@ -13,7 +13,7 @@ c_stdlib: c_stdlib_version: - '10.13' channel_sources: -- conda-forge +- conda-forge/label/python_rc,conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -31,13 +31,13 @@ libxml2: macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.22' +- '2' pin_run_as_build: python: min_pin: x.x max_pin: x.x python: -- 3.8.* *_cpython +- 3.13.* *_cp313 target_platform: - osx-64 zip_keys: @@ -45,3 +45,4 @@ zip_keys: - cxx_compiler_version - - python - numpy + - channel_sources diff --git a/.ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml index efa3bf5..a93d668 100644 --- a/.ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml @@ -45,3 +45,4 @@ zip_keys: - cxx_compiler_version - - python - numpy + - channel_sources diff --git a/.ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml index b5c850c..1db7a16 100644 --- a/.ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml @@ -45,3 +45,4 @@ zip_keys: - cxx_compiler_version - - python - numpy + - channel_sources diff --git a/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml index 06b9dde..7cf1b8d 100644 --- a/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml @@ -45,3 +45,4 @@ zip_keys: - cxx_compiler_version - - python - numpy + - channel_sources diff --git a/.ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml index d417e19..c419ed5 100644 --- a/.ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml @@ -45,3 +45,4 @@ zip_keys: - cxx_compiler_version - - python - numpy + - channel_sources diff --git a/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml b/.ci_support/osx_arm64_numpy2python3.13.____cp313.yaml similarity index 87% rename from .ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml rename to .ci_support/osx_arm64_numpy2python3.13.____cp313.yaml index 2a549d9..22bb216 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy2python3.13.____cp313.yaml @@ -13,7 +13,7 @@ c_stdlib: c_stdlib_version: - '11.0' channel_sources: -- conda-forge +- conda-forge/label/python_rc,conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -31,13 +31,13 @@ libxml2: macos_machine: - arm64-apple-darwin20.0.0 numpy: -- '1.22' +- '2' pin_run_as_build: python: min_pin: x.x max_pin: x.x python: -- 3.8.* *_cpython +- 3.13.* *_cp313 target_platform: - osx-arm64 zip_keys: @@ -45,3 +45,4 @@ zip_keys: - cxx_compiler_version - - python - numpy + - channel_sources diff --git a/.ci_support/win_64_numpy1.22python3.8.____cpython.yaml b/.ci_support/win_64_numpy1.22python3.8.____cpython.yaml deleted file mode 100644 index b9af80f..0000000 --- a/.ci_support/win_64_numpy1.22python3.8.____cpython.yaml +++ /dev/null @@ -1,33 +0,0 @@ -assimp: -- 5.4.2 -c_compiler: -- vs2019 -c_stdlib: -- vs -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- vs2019 -idyntree: -- '12' -ipopt: -- 3.14.16 -libosqp: -- 0.6.3 -libxml2: -- '2' -numpy: -- '1.22' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_cpython -target_platform: -- win-64 -zip_keys: -- - python - - numpy diff --git a/.ci_support/win_64_numpy2.0python3.10.____cpython.yaml b/.ci_support/win_64_numpy2.0python3.10.____cpython.yaml index f378633..27c559e 100644 --- a/.ci_support/win_64_numpy2.0python3.10.____cpython.yaml +++ b/.ci_support/win_64_numpy2.0python3.10.____cpython.yaml @@ -31,3 +31,4 @@ target_platform: zip_keys: - - python - numpy + - channel_sources diff --git a/.ci_support/win_64_numpy2.0python3.11.____cpython.yaml b/.ci_support/win_64_numpy2.0python3.11.____cpython.yaml index e8c0759..ca3a006 100644 --- a/.ci_support/win_64_numpy2.0python3.11.____cpython.yaml +++ b/.ci_support/win_64_numpy2.0python3.11.____cpython.yaml @@ -31,3 +31,4 @@ target_platform: zip_keys: - - python - numpy + - channel_sources diff --git a/.ci_support/win_64_numpy2.0python3.12.____cpython.yaml b/.ci_support/win_64_numpy2.0python3.12.____cpython.yaml index f99d1f1..3299c54 100644 --- a/.ci_support/win_64_numpy2.0python3.12.____cpython.yaml +++ b/.ci_support/win_64_numpy2.0python3.12.____cpython.yaml @@ -31,3 +31,4 @@ target_platform: zip_keys: - - python - numpy + - channel_sources diff --git a/.ci_support/win_64_numpy2.0python3.9.____cpython.yaml b/.ci_support/win_64_numpy2.0python3.9.____cpython.yaml index afd516f..5e5d0a0 100644 --- a/.ci_support/win_64_numpy2.0python3.9.____cpython.yaml +++ b/.ci_support/win_64_numpy2.0python3.9.____cpython.yaml @@ -31,3 +31,4 @@ target_platform: zip_keys: - - python - numpy + - channel_sources diff --git a/.ci_support/win_64_numpy1.22python3.9.____73_pypy.yaml b/.ci_support/win_64_numpy2python3.13.____cp313.yaml similarity index 79% rename from .ci_support/win_64_numpy1.22python3.9.____73_pypy.yaml rename to .ci_support/win_64_numpy2python3.13.____cp313.yaml index 5c75fc9..0ad1a83 100644 --- a/.ci_support/win_64_numpy1.22python3.9.____73_pypy.yaml +++ b/.ci_support/win_64_numpy2python3.13.____cp313.yaml @@ -5,7 +5,7 @@ c_compiler: c_stdlib: - vs channel_sources: -- conda-forge +- conda-forge/label/python_rc,conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -19,15 +19,16 @@ libosqp: libxml2: - '2' numpy: -- '1.22' +- '2' pin_run_as_build: python: min_pin: x.x max_pin: x.x python: -- 3.9.* *_73_pypy +- 3.13.* *_cp313 target_platform: - win-64 zip_keys: - - python - numpy + - channel_sources diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 99aaeaf..0000000 --- a/.travis.yml +++ /dev/null @@ -1,50 +0,0 @@ -# This file was generated automatically from conda-smithy. To update this configuration, -# update the conda-forge.yml and/or the recipe/meta.yaml. - -language: shell - - - -jobs: - include: - - env: CONFIG=linux_aarch64_numpy1.22python3.8.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 - os: linux - arch: arm64 - dist: focal - - - env: CONFIG=linux_aarch64_numpy1.22python3.9.____73_pypy UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 - os: linux - arch: arm64 - dist: focal - - - env: CONFIG=linux_aarch64_numpy2.0python3.10.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 - os: linux - arch: arm64 - dist: focal - - - env: CONFIG=linux_aarch64_numpy2.0python3.11.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 - os: linux - arch: arm64 - dist: focal - - - env: CONFIG=linux_aarch64_numpy2.0python3.12.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 - os: linux - arch: arm64 - dist: focal - - - env: CONFIG=linux_aarch64_numpy2.0python3.9.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 - os: linux - arch: arm64 - dist: focal - -script: - - export CI=travis - - export GIT_BRANCH="$TRAVIS_BRANCH" - - export flow_run_id="travis_$TRAVIS_JOB_ID" - - export sha="$TRAVIS_COMMIT" - - export remote_url="https://github.com/$TRAVIS_REPO_SLUG" - - export FEEDSTOCK_NAME=$(basename ${TRAVIS_REPO_SLUG}) - - if [[ "${TRAVIS_PULL_REQUEST:-}" == "false" ]]; then export IS_PR_BUILD="False"; else export IS_PR_BUILD="True"; fi - - - - if [[ ${PLATFORM} =~ .*linux.* ]]; then CONDA_FORGE_DOCKER_RUN_ARGS="--network=host --security-opt=seccomp=unconfined" ./.scripts/run_docker_build.sh; fi \ No newline at end of file diff --git a/README.md b/README.md index d72767a..15c4349 100644 --- a/README.md +++ b/README.md @@ -13,14 +13,7 @@ Current build status ==================== - - - - +
Travis - - linux - -
@@ -34,20 +27,6 @@ Current build status
Azure
- - - - - - - - - - + @@ -118,17 +90,45 @@ Current build status - + + + + + + + + + + + + + - + @@ -160,10 +160,10 @@ Current build status - + @@ -195,17 +195,10 @@ Current build status - - - - + @@ -236,6 +229,13 @@ Current build status variant + + +
VariantStatus
linux_64_numpy1.22python3.8.____cpython - - variant - -
linux_64_numpy1.22python3.9.____73_pypy - - variant - -
linux_64_numpy2.0python3.10.____cpython @@ -76,17 +55,10 @@ Current build status
linux_aarch64_numpy1.22python3.8.____cpython - - variant - -
linux_aarch64_numpy1.22python3.9.____73_pypylinux_64_numpy2python3.13.____cp313 - variant + variant
osx_64_numpy1.22python3.8.____cpythonlinux_aarch64_numpy2python3.13.____cp313 + + variant + +
linux_ppc64le_numpy2.0python3.10.____cpython + + variant + +
linux_ppc64le_numpy2.0python3.11.____cpython + + variant + +
linux_ppc64le_numpy2.0python3.12.____cpython + + variant + +
linux_ppc64le_numpy2.0python3.9.____cpython - variant + variant
osx_64_numpy1.22python3.9.____73_pypylinux_ppc64le_numpy2python3.13.____cp313 - variant + variant
osx_arm64_numpy1.22python3.8.____cpythonosx_64_numpy2python3.13.____cp313 - variant + variant
win_64_numpy1.22python3.8.____cpython - - variant - -
win_64_numpy1.22python3.9.____73_pypyosx_arm64_numpy2python3.13.____cp313 - variant + variant
win_64_numpy2python3.13.____cp313 + + variant + +
diff --git a/build-locally.py b/build-locally.py index d78427b..8ac9b84 100755 --- a/build-locally.py +++ b/build-locally.py @@ -1,8 +1,11 @@ -#!/usr/bin/env python3 +#!/bin/sh +"""exec' "python3" "$0" "$@" #""" # fmt: off # fmt: on # # This file has been generated by conda-smithy in order to build the recipe # locally. # +# The line above this comment is a bash / sh / zsh guard +# to stop people from running it with the wrong interpreter import glob import os import platform diff --git a/conda-forge.yml b/conda-forge.yml index a986b56..63da301 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -1,8 +1,8 @@ bot: automerge: true build_platform: - linux_aarch64: linux_aarch64 - linux_ppc64le: linux_ppc64le + linux_aarch64: linux_64 + linux_ppc64le: linux_64 osx_arm64: osx_64 conda_build: pkg_format: '2' @@ -12,5 +12,5 @@ github: tooling_branch_name: main provider: linux_aarch64: default - linux_ppc64le: azure + linux_ppc64le: default test: native_and_emulated diff --git a/recipe/build.sh b/recipe/build.sh index 4899a0b..e10fa47 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -1,20 +1,5 @@ #!/bin/sh - -if [[ ${target_platform} == "linux-aarch64" ]]; then - echo "Using 1 thread to build" - export NUM_PARALLEL=-j1 -else - echo "Use all available cores to build" - export NUM_PARALLEL= -fi - -if [[ ${target_platform} == "linux-ppc64le" ]]; then - export BUILD_TESTING=OFF -else - export BUILD_TESTING=ON -fi - mkdir build cd build @@ -31,8 +16,11 @@ cmake ${CMAKE_ARGS} -GNinja .. \ -DIDYNTREE_USES_LUA:BOOL=OFF \ -DIDYNTREE_COMPILES_YARP_TOOLS:BOOL=OFF \ -DPython3_EXECUTABLE:PATH=$PYTHON \ + -DPython3_INCLUDE_DIR:PATH=$PREFIX/include/`ls $PREFIX/include | grep "python\|pypy"` \ + -DPython3_NumPy_INCLUDE_DIR=$SP_DIR/numpy/_core/include \ -DIDYNTREE_DETECT_ACTIVE_PYTHON_SITEPACKAGES:BOOL=ON \ - -DIDYNTREE_PYTHON_PIP_METADATA_INSTALLER=conda + -DIDYNTREE_PYTHON_PIP_METADATA_INSTALLER=conda \ + --debug-find cmake --build . --config Release ${NUM_PARALLEL} cmake --build . --config Release --target install ${NUM_PARALLEL} diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 3c87928..3e61781 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -10,8 +10,7 @@ source: sha256: fd7993741a8e1f79a6b76d31b81d2b9dc9507f0b812508535a75d7df5b7ab15a build: - skip: true # [ppc64le] - number: 3 + number: 4 run_exports: - {{ pin_subpackage(name, max_pin='x') }}