From e0593e016cdb8002ec96a0a57cd13c278beb3a24 Mon Sep 17 00:00:00 2001 From: Diego Ferigo Date: Mon, 18 Oct 2021 15:02:19 +0200 Subject: [PATCH 01/33] Install Python resources through pip --- recipe/build.sh | 19 ++++++++++++++++--- recipe/meta.yaml | 8 +++++++- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/recipe/build.sh b/recipe/build.sh index 170a53e..4c4bc3d 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -17,13 +17,26 @@ cmake ${CMAKE_ARGS} -GNinja .. \ -DIDYNTREE_USES_OSQPEIGEN:BOOL=ON \ -DIDYNTREE_USES_IRRLICHT:BOOL=ON \ -DIDYNTREE_USES_MATLAB:BOOL=OFF \ - -DIDYNTREE_USES_PYTHON:BOOL=ON \ + -DIDYNTREE_USES_PYTHON:BOOL=OFF \ -DIDYNTREE_USES_OCTAVE:BOOL=OFF \ -DIDYNTREE_USES_LUA:BOOL=OFF \ -DIDYNTREE_COMPILES_YARP_TOOLS:BOOL=OFF \ - -DPython3_EXECUTABLE:PATH=$PYTHON \ - -DIDYNTREE_DETECT_ACTIVE_PYTHON_SITEPACKAGES:BOOL=ON + -DIDYNTREE_DETECT_ACTIVE_PYTHON_SITEPACKAGES:BOOL=ON cmake --build . --config Release ${NUM_PARALLEL} cmake --build . --config Release --target install ctest --output-on-failure -C Release + +cd .. + +python \ + -m build \ + --wheel \ + --outdir dist \ + --no-isolation \ + --skip-dependency-check \ + "-C--global-option=build_ext" \ + "-C--global-option=-DBUILD_SHARED_LIBS:BOOL=ON" \ + "-C--global-option=--component=python" \ + . +pip install --no-deps dist/*.whl diff --git a/recipe/meta.yaml b/recipe/meta.yaml index a4123e7..1c9b6dc 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -10,7 +10,7 @@ source: sha256: 98d202817500d0440e72fff386a0d0dc94acba0e5aa25bda111be1b50ea9cf67 build: - number: 0 + number: 1 run_exports: - {{ pin_subpackage(name, max_pin='x') }} @@ -38,7 +38,10 @@ requirements: - eigen - irrlicht - swig + - pip + - build - python + - cmake-build-extension - numpy - libosqp - osqp-eigen @@ -59,8 +62,11 @@ test: - if not exist %PREFIX%\\Library\\lib\\idyntree-core.lib exit 1 # [win] - if not exist %PREFIX%\\Library\\bin\\idyntree-core.dll exit 1 # [win] - if not exist %PREFIX%\\Library\\lib\\cmake\\iDynTree\\iDynTreeConfig.cmake exit 1 # [win] + - pip check imports: - idyntree + requires: + - pip about: home: https://github.com/robotology/idyntree From 8fba95d7ccbd1351a7f2aa939b377baf729e692a Mon Sep 17 00:00:00 2001 From: conda-forge-linter Date: Mon, 18 Oct 2021 13:08:22 +0000 Subject: [PATCH 02/33] MNT: Re-rendered with conda-build 3.21.4, conda-smithy 3.12, and conda-forge-pinning 2021.10.18.05.45.34 --- .azure-pipelines/azure-pipelines-linux.yml | 4 -- .azure-pipelines/azure-pipelines-osx.yml | 3 -- .azure-pipelines/azure-pipelines-win.yml | 3 -- ...nux_64_numpy1.18python3.6.____cpython.yaml | 39 ------------------ ...nux_64_numpy1.18python3.7.____cpython.yaml | 2 +- ...nux_64_numpy1.18python3.8.____cpython.yaml | 2 +- ...nux_64_numpy1.19python3.9.____cpython.yaml | 2 +- ...arch64_numpy1.18python3.6.____cpython.yaml | 41 ------------------- ...pc64le_numpy1.18python3.6.____cpython.yaml | 37 ----------------- ...pc64le_numpy1.18python3.7.____cpython.yaml | 2 +- ...pc64le_numpy1.18python3.8.____cpython.yaml | 2 +- ...pc64le_numpy1.19python3.9.____cpython.yaml | 2 +- ...osx_64_numpy1.18python3.6.____cpython.yaml | 37 ----------------- ...osx_64_numpy1.18python3.7.____cpython.yaml | 2 +- ...osx_64_numpy1.18python3.8.____cpython.yaml | 2 +- ...osx_64_numpy1.19python3.9.____cpython.yaml | 2 +- ...win_64_numpy1.18python3.6.____cpython.yaml | 27 ------------ ...win_64_numpy1.18python3.7.____cpython.yaml | 2 +- ...win_64_numpy1.18python3.8.____cpython.yaml | 2 +- ...win_64_numpy1.19python3.9.____cpython.yaml | 2 +- .drone.yml | 31 -------------- .travis.yml | 5 --- README.md | 35 ---------------- 23 files changed, 12 insertions(+), 274 deletions(-) delete mode 100644 .ci_support/linux_64_numpy1.18python3.6.____cpython.yaml delete mode 100644 .ci_support/linux_aarch64_numpy1.18python3.6.____cpython.yaml delete mode 100644 .ci_support/linux_ppc64le_numpy1.18python3.6.____cpython.yaml delete mode 100644 .ci_support/osx_64_numpy1.18python3.6.____cpython.yaml delete mode 100644 .ci_support/win_64_numpy1.18python3.6.____cpython.yaml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 6c7e94b..0a7f757 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,10 +8,6 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_numpy1.18python3.6.____cpython: - CONFIG: linux_64_numpy1.18python3.6.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 linux_64_numpy1.18python3.7.____cpython: CONFIG: linux_64_numpy1.18python3.7.____cpython UPLOAD_PACKAGES: 'True' diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index cb74c32..b703ab9 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -8,9 +8,6 @@ jobs: vmImage: macOS-10.15 strategy: matrix: - osx_64_numpy1.18python3.6.____cpython: - CONFIG: osx_64_numpy1.18python3.6.____cpython - UPLOAD_PACKAGES: 'True' osx_64_numpy1.18python3.7.____cpython: CONFIG: osx_64_numpy1.18python3.7.____cpython UPLOAD_PACKAGES: 'True' diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index d6c5f9e..5fd91a5 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -8,9 +8,6 @@ jobs: vmImage: vs2017-win2016 strategy: matrix: - win_64_numpy1.18python3.6.____cpython: - CONFIG: win_64_numpy1.18python3.6.____cpython - UPLOAD_PACKAGES: 'True' win_64_numpy1.18python3.7.____cpython: CONFIG: win_64_numpy1.18python3.7.____cpython UPLOAD_PACKAGES: 'True' diff --git a/.ci_support/linux_64_numpy1.18python3.6.____cpython.yaml b/.ci_support/linux_64_numpy1.18python3.6.____cpython.yaml deleted file mode 100644 index 1e39151..0000000 --- a/.ci_support/linux_64_numpy1.18python3.6.____cpython.yaml +++ /dev/null @@ -1,39 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '9' -cdt_name: -- cos6 -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '9' -docker_image: -- quay.io/condaforge/linux-anvil-comp7 -ipopt: -- '3.14' -libxml2: -- '2.9' -numpy: -- '1.18' -pin_run_as_build: - libxml2: - max_pin: x.x - python: - min_pin: x.x - max_pin: x.x -python: -- 3.6.* *_cpython -target_platform: -- linux-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - cdt_name - - docker_image -- - python - - numpy diff --git a/.ci_support/linux_64_numpy1.18python3.7.____cpython.yaml b/.ci_support/linux_64_numpy1.18python3.7.____cpython.yaml index 6bc151c..96ecf0d 100644 --- a/.ci_support/linux_64_numpy1.18python3.7.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.18python3.7.____cpython.yaml @@ -5,7 +5,7 @@ c_compiler_version: cdt_name: - cos6 channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main cxx_compiler: diff --git a/.ci_support/linux_64_numpy1.18python3.8.____cpython.yaml b/.ci_support/linux_64_numpy1.18python3.8.____cpython.yaml index 1d4d3cd..4c873d6 100644 --- a/.ci_support/linux_64_numpy1.18python3.8.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.18python3.8.____cpython.yaml @@ -5,7 +5,7 @@ c_compiler_version: cdt_name: - cos6 channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main cxx_compiler: diff --git a/.ci_support/linux_64_numpy1.19python3.9.____cpython.yaml b/.ci_support/linux_64_numpy1.19python3.9.____cpython.yaml index 905abf0..07263d5 100644 --- a/.ci_support/linux_64_numpy1.19python3.9.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.19python3.9.____cpython.yaml @@ -5,7 +5,7 @@ c_compiler_version: cdt_name: - cos6 channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main cxx_compiler: diff --git a/.ci_support/linux_aarch64_numpy1.18python3.6.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.18python3.6.____cpython.yaml deleted file mode 100644 index befd5e8..0000000 --- a/.ci_support/linux_aarch64_numpy1.18python3.6.____cpython.yaml +++ /dev/null @@ -1,41 +0,0 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu -c_compiler: -- gcc -c_compiler_version: -- '9' -cdt_arch: -- aarch64 -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '9' -docker_image: -- quay.io/condaforge/linux-anvil-aarch64 -ipopt: -- '3.14' -libxml2: -- '2.9' -numpy: -- '1.18' -pin_run_as_build: - libxml2: - max_pin: x.x - python: - min_pin: x.x - max_pin: x.x -python: -- 3.6.* *_cpython -target_platform: -- linux-aarch64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - python - - numpy diff --git a/.ci_support/linux_ppc64le_numpy1.18python3.6.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.18python3.6.____cpython.yaml deleted file mode 100644 index 85499a0..0000000 --- a/.ci_support/linux_ppc64le_numpy1.18python3.6.____cpython.yaml +++ /dev/null @@ -1,37 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '9' -cdt_name: -- cos7 -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '9' -docker_image: -- quay.io/condaforge/linux-anvil-ppc64le -ipopt: -- '3.14' -libxml2: -- '2.9' -numpy: -- '1.18' -pin_run_as_build: - libxml2: - max_pin: x.x - python: - min_pin: x.x - max_pin: x.x -python: -- 3.6.* *_cpython -target_platform: -- linux-ppc64le -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - python - - numpy diff --git a/.ci_support/linux_ppc64le_numpy1.18python3.7.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.18python3.7.____cpython.yaml index 9850c89..ee68d81 100644 --- a/.ci_support/linux_ppc64le_numpy1.18python3.7.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.18python3.7.____cpython.yaml @@ -5,7 +5,7 @@ c_compiler_version: cdt_name: - cos7 channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main cxx_compiler: diff --git a/.ci_support/linux_ppc64le_numpy1.18python3.8.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.18python3.8.____cpython.yaml index ff796c3..a66b6e0 100644 --- a/.ci_support/linux_ppc64le_numpy1.18python3.8.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.18python3.8.____cpython.yaml @@ -5,7 +5,7 @@ c_compiler_version: cdt_name: - cos7 channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main cxx_compiler: diff --git a/.ci_support/linux_ppc64le_numpy1.19python3.9.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.19python3.9.____cpython.yaml index e6feb69..9ce30bb 100644 --- a/.ci_support/linux_ppc64le_numpy1.19python3.9.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.19python3.9.____cpython.yaml @@ -5,7 +5,7 @@ c_compiler_version: cdt_name: - cos7 channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main cxx_compiler: diff --git a/.ci_support/osx_64_numpy1.18python3.6.____cpython.yaml b/.ci_support/osx_64_numpy1.18python3.6.____cpython.yaml deleted file mode 100644 index 09274eb..0000000 --- a/.ci_support/osx_64_numpy1.18python3.6.____cpython.yaml +++ /dev/null @@ -1,37 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.9' -c_compiler: -- clang -c_compiler_version: -- '11' -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -cxx_compiler: -- clangxx -cxx_compiler_version: -- '11' -ipopt: -- '3.14' -libxml2: -- '2.9' -macos_machine: -- x86_64-apple-darwin13.4.0 -numpy: -- '1.18' -pin_run_as_build: - libxml2: - max_pin: x.x - python: - min_pin: x.x - max_pin: x.x -python: -- 3.6.* *_cpython -target_platform: -- osx-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - python - - numpy diff --git a/.ci_support/osx_64_numpy1.18python3.7.____cpython.yaml b/.ci_support/osx_64_numpy1.18python3.7.____cpython.yaml index 28fe491..35e1bd5 100644 --- a/.ci_support/osx_64_numpy1.18python3.7.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.18python3.7.____cpython.yaml @@ -5,7 +5,7 @@ c_compiler: c_compiler_version: - '11' channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main cxx_compiler: diff --git a/.ci_support/osx_64_numpy1.18python3.8.____cpython.yaml b/.ci_support/osx_64_numpy1.18python3.8.____cpython.yaml index 0404272..bbedb52 100644 --- a/.ci_support/osx_64_numpy1.18python3.8.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.18python3.8.____cpython.yaml @@ -5,7 +5,7 @@ c_compiler: c_compiler_version: - '11' channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main cxx_compiler: diff --git a/.ci_support/osx_64_numpy1.19python3.9.____cpython.yaml b/.ci_support/osx_64_numpy1.19python3.9.____cpython.yaml index 4470c05..af5d3dc 100644 --- a/.ci_support/osx_64_numpy1.19python3.9.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.19python3.9.____cpython.yaml @@ -5,7 +5,7 @@ c_compiler: c_compiler_version: - '11' channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main cxx_compiler: diff --git a/.ci_support/win_64_numpy1.18python3.6.____cpython.yaml b/.ci_support/win_64_numpy1.18python3.6.____cpython.yaml deleted file mode 100644 index c8c79f0..0000000 --- a/.ci_support/win_64_numpy1.18python3.6.____cpython.yaml +++ /dev/null @@ -1,27 +0,0 @@ -c_compiler: -- vs2017 -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -cxx_compiler: -- vs2017 -ipopt: -- '3.14' -libxml2: -- '2.9' -numpy: -- '1.18' -pin_run_as_build: - libxml2: - max_pin: x.x - python: - min_pin: x.x - max_pin: x.x -python: -- 3.6.* *_cpython -target_platform: -- win-64 -zip_keys: -- - python - - numpy diff --git a/.ci_support/win_64_numpy1.18python3.7.____cpython.yaml b/.ci_support/win_64_numpy1.18python3.7.____cpython.yaml index c37b258..29c094d 100644 --- a/.ci_support/win_64_numpy1.18python3.7.____cpython.yaml +++ b/.ci_support/win_64_numpy1.18python3.7.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - vs2017 channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main cxx_compiler: diff --git a/.ci_support/win_64_numpy1.18python3.8.____cpython.yaml b/.ci_support/win_64_numpy1.18python3.8.____cpython.yaml index a937781..89eca09 100644 --- a/.ci_support/win_64_numpy1.18python3.8.____cpython.yaml +++ b/.ci_support/win_64_numpy1.18python3.8.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - vs2017 channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main cxx_compiler: diff --git a/.ci_support/win_64_numpy1.19python3.9.____cpython.yaml b/.ci_support/win_64_numpy1.19python3.9.____cpython.yaml index a4a621f..52acc4f 100644 --- a/.ci_support/win_64_numpy1.19python3.9.____cpython.yaml +++ b/.ci_support/win_64_numpy1.19python3.9.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - vs2017 channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main cxx_compiler: diff --git a/.drone.yml b/.drone.yml index f28326c..e6e4fbc 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,34 +1,3 @@ ---- -kind: pipeline -name: linux_aarch64_numpy1.18python3.6.____cpython - -platform: - os: linux - arch: arm64 - -steps: -- name: Install and build - image: quay.io/condaforge/linux-anvil-aarch64 - environment: - CONFIG: linux_aarch64_numpy1.18python3.6.____cpython - UPLOAD_PACKAGES: True - PLATFORM: linux-aarch64 - BINSTAR_TOKEN: - from_secret: BINSTAR_TOKEN - FEEDSTOCK_TOKEN: - from_secret: FEEDSTOCK_TOKEN - STAGING_BINSTAR_TOKEN: - from_secret: STAGING_BINSTAR_TOKEN - commands: - - export FEEDSTOCK_ROOT="$DRONE_WORKSPACE" - - export RECIPE_ROOT="$FEEDSTOCK_ROOT/recipe" - - export CI=drone - - export GIT_BRANCH="$DRONE_BRANCH" - - export FEEDSTOCK_NAME=$(basename ${DRONE_REPO_NAME}) - - sed -i '$ichown -R conda:conda "$FEEDSTOCK_ROOT"' /opt/docker/bin/entrypoint - - /opt/docker/bin/entrypoint $FEEDSTOCK_ROOT/.scripts/build_steps.sh - - echo "Done building" - --- kind: pipeline name: linux_aarch64_numpy1.18python3.7.____cpython diff --git a/.travis.yml b/.travis.yml index f5e92fe..896c76e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,11 +7,6 @@ language: generic matrix: include: - - env: CONFIG=linux_ppc64le_numpy1.18python3.6.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le - os: linux - arch: ppc64le - dist: focal - - env: CONFIG=linux_ppc64le_numpy1.18python3.7.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le os: linux arch: ppc64le diff --git a/README.md b/README.md index 28a6530..5f72bfe 100644 --- a/README.md +++ b/README.md @@ -41,13 +41,6 @@ Current build status - - - - - - - - - - - - - - -
VariantStatus
linux_64_numpy1.18python3.6.____cpython - - variant - -
linux_64_numpy1.18python3.7.____cpython @@ -68,13 +61,6 @@ Current build status variant
linux_aarch64_numpy1.18python3.6.____cpython - - variant - -
linux_aarch64_numpy1.18python3.7.____cpython @@ -96,13 +82,6 @@ Current build status variant
linux_ppc64le_numpy1.18python3.6.____cpython - - variant - -
linux_ppc64le_numpy1.18python3.7.____cpython @@ -124,13 +103,6 @@ Current build status variant
osx_64_numpy1.18python3.6.____cpython - - variant - -
osx_64_numpy1.18python3.7.____cpython @@ -152,13 +124,6 @@ Current build status variant
win_64_numpy1.18python3.6.____cpython - - variant - -
win_64_numpy1.18python3.7.____cpython From f126f14291fe664603971e73bd12dc7f0217c6d8 Mon Sep 17 00:00:00 2001 From: Diego Ferigo Date: Tue, 19 Oct 2021 13:59:41 +0200 Subject: [PATCH 03/33] Revert to building Python bindings with CMake --- recipe/build.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipe/build.sh b/recipe/build.sh index 4c4bc3d..10541d2 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -17,10 +17,11 @@ cmake ${CMAKE_ARGS} -GNinja .. \ -DIDYNTREE_USES_OSQPEIGEN:BOOL=ON \ -DIDYNTREE_USES_IRRLICHT:BOOL=ON \ -DIDYNTREE_USES_MATLAB:BOOL=OFF \ - -DIDYNTREE_USES_PYTHON:BOOL=OFF \ + -DIDYNTREE_USES_PYTHON:BOOL=ON \ -DIDYNTREE_USES_OCTAVE:BOOL=OFF \ -DIDYNTREE_USES_LUA:BOOL=OFF \ -DIDYNTREE_COMPILES_YARP_TOOLS:BOOL=OFF \ + -DPython3_EXECUTABLE:PATH=$PYTHON \ -DIDYNTREE_DETECT_ACTIVE_PYTHON_SITEPACKAGES:BOOL=ON cmake --build . --config Release ${NUM_PARALLEL} From 45f3b46281b20fdec5318cf421ae8c2493b0571e Mon Sep 17 00:00:00 2001 From: Diego Ferigo Date: Tue, 19 Oct 2021 14:00:36 +0200 Subject: [PATCH 04/33] Install only the metadata with pip --- recipe/build.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/recipe/build.sh b/recipe/build.sh index 10541d2..49a9023 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -37,7 +37,6 @@ python \ --no-isolation \ --skip-dependency-check \ "-C--global-option=build_ext" \ - "-C--global-option=-DBUILD_SHARED_LIBS:BOOL=ON" \ - "-C--global-option=--component=python" \ + "-C--global-option=--no-cmake-extension=all" \ . pip install --no-deps dist/*.whl From 925d7f68061f993a09e129039789626b36a04ca2 Mon Sep 17 00:00:00 2001 From: Diego Ferigo Date: Tue, 19 Oct 2021 14:01:07 +0200 Subject: [PATCH 05/33] Add replace.py script that works like sed but multiplatform --- recipe/replace.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100755 recipe/replace.py diff --git a/recipe/replace.py b/recipe/replace.py new file mode 100755 index 0000000..842ff11 --- /dev/null +++ b/recipe/replace.py @@ -0,0 +1,14 @@ +#!/usr/bin/env python3 +import argparse +import fileinput + +parser = argparse.ArgumentParser() +parser.add_argument("-f", "--file", type=str) +parser.add_argument("--pre", type=str) +parser.add_argument("--post", type=str) + +args = parser.parse_args() + +with fileinput.FileInput(args.file, inplace=True, backup='.bak') as file: + for line in file: + print(line.replace(args.pre, args.post), end='') From 2c4c578f64a09e50a459b5002dee24ce5584c8b3 Mon Sep 17 00:00:00 2001 From: Diego Ferigo Date: Tue, 19 Oct 2021 14:02:41 +0200 Subject: [PATCH 06/33] Align the wheel version with the conda version --- recipe/build.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/recipe/build.sh b/recipe/build.sh index 49a9023..6bc7226 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -30,7 +30,11 @@ ctest --output-on-failure -C Release cd .. -python \ +# Fix Python package version +$PYTHON replace.py -f setup.py --pre 'use_scm_version=dict(local_scheme="dirty-tag"),' --post 'version=$PKG_VERSION,' + +# Python package +$PYTHON \ -m build \ --wheel \ --outdir dist \ From bcb06eb2d6a56f1958eb340a1c70d7092acab96a Mon Sep 17 00:00:00 2001 From: Diego Ferigo Date: Tue, 19 Oct 2021 14:03:31 +0200 Subject: [PATCH 07/33] Update also bat script to install Python metadata --- recipe/bld.bat | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/recipe/bld.bat b/recipe/bld.bat index 6c02584..22bb15c 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -32,4 +32,17 @@ if errorlevel 1 exit 1 ctest --output-on-failure -C Release if errorlevel 1 exit 1 +:: Fix Python package version +%PYTHON% replace.py -f setup.py --pre 'use_scm_version=dict(local_scheme="dirty-tag"),' --post 'version=$PKG_VERSION,' +:: Python package +%PYTHON% ^ + -m build ^ + --wheel ^ + --outdir dist ^ + --no-isolation ^ + --skip-dependency-check ^ + "-C--global-option=build_ext" ^ + "-C--global-option=--no-cmake-extension=all" ^ + . +pip install --no-deps dist/*.whl From 2c111500fdf34309e61c58cbc3514cab07622b49 Mon Sep 17 00:00:00 2001 From: Diego Ferigo Date: Tue, 19 Oct 2021 14:15:11 +0200 Subject: [PATCH 08/33] Fix quoting --- recipe/bld.bat | 2 +- recipe/build.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index 22bb15c..eba9474 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -33,7 +33,7 @@ ctest --output-on-failure -C Release if errorlevel 1 exit 1 :: Fix Python package version -%PYTHON% replace.py -f setup.py --pre 'use_scm_version=dict(local_scheme="dirty-tag"),' --post 'version=$PKG_VERSION,' +%PYTHON% replace.py -f setup.py --pre 'use_scm_version=dict(local_scheme="dirty-tag"),' --post "version=$PKG_VERSION," :: Python package %PYTHON% ^ diff --git a/recipe/build.sh b/recipe/build.sh index 6bc7226..2072424 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -31,7 +31,7 @@ ctest --output-on-failure -C Release cd .. # Fix Python package version -$PYTHON replace.py -f setup.py --pre 'use_scm_version=dict(local_scheme="dirty-tag"),' --post 'version=$PKG_VERSION,' +$PYTHON replace.py -f setup.py --pre 'use_scm_version=dict(local_scheme="dirty-tag"),' --post "version=$PKG_VERSION," # Python package $PYTHON \ From 566dd6855125f67925d1aea32f03d33afb05f333 Mon Sep 17 00:00:00 2001 From: Diego Ferigo Date: Tue, 19 Oct 2021 15:28:57 +0200 Subject: [PATCH 09/33] Fix path to replace.py script --- recipe/bld.bat | 3 ++- recipe/build.sh | 5 ++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index eba9474..a95bbf4 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -33,7 +33,8 @@ ctest --output-on-failure -C Release if errorlevel 1 exit 1 :: Fix Python package version -%PYTHON% replace.py -f setup.py --pre 'use_scm_version=dict(local_scheme="dirty-tag"),' --post "version=$PKG_VERSION," +cd .. +%PYTHON% %RECIPE_DIR%\replace.py -f setup.py --pre 'use_scm_version=dict(local_scheme="dirty-tag"),' --post "version=$PKG_VERSION," :: Python package %PYTHON% ^ diff --git a/recipe/build.sh b/recipe/build.sh index 2072424..78c3cb4 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -28,10 +28,9 @@ cmake --build . --config Release ${NUM_PARALLEL} cmake --build . --config Release --target install ctest --output-on-failure -C Release -cd .. - # Fix Python package version -$PYTHON replace.py -f setup.py --pre 'use_scm_version=dict(local_scheme="dirty-tag"),' --post "version=$PKG_VERSION," +cd .. +$PYTHON ${RECIPE_DIR}/replace.py -f setup.py --pre 'use_scm_version=dict(local_scheme="dirty-tag"),' --post "version=$PKG_VERSION," # Python package $PYTHON \ From 8137184588be5f5e784f35ce05ba86cb5677d117 Mon Sep 17 00:00:00 2001 From: Diego Ferigo Date: Tue, 19 Oct 2021 15:45:46 +0200 Subject: [PATCH 10/33] Fix quoting (again) --- recipe/bld.bat | 2 +- recipe/build.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index a95bbf4..ea4cf65 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -34,7 +34,7 @@ if errorlevel 1 exit 1 :: Fix Python package version cd .. -%PYTHON% %RECIPE_DIR%\replace.py -f setup.py --pre 'use_scm_version=dict(local_scheme="dirty-tag"),' --post "version=$PKG_VERSION," +%PYTHON% %RECIPE_DIR%\replace.py -f setup.py --pre 'use_scm_version=dict(local_scheme="dirty-tag"),' --post "version=""$PKG_VERSION""," :: Python package %PYTHON% ^ diff --git a/recipe/build.sh b/recipe/build.sh index 78c3cb4..569500c 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -30,7 +30,7 @@ ctest --output-on-failure -C Release # Fix Python package version cd .. -$PYTHON ${RECIPE_DIR}/replace.py -f setup.py --pre 'use_scm_version=dict(local_scheme="dirty-tag"),' --post "version=$PKG_VERSION," +$PYTHON ${RECIPE_DIR}/replace.py -f setup.py --pre 'use_scm_version=dict(local_scheme="dirty-tag"),' --post "version=\"$PKG_VERSION\"," # Python package $PYTHON \ From 87835d0a57cb05225f8d340b400e0b4a6e49ffe8 Mon Sep 17 00:00:00 2001 From: Diego Ferigo Date: Tue, 19 Oct 2021 16:09:44 +0200 Subject: [PATCH 11/33] Check that conda version matches with python package version --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 1c9b6dc..7ff2cc5 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -62,6 +62,7 @@ test: - if not exist %PREFIX%\\Library\\lib\\idyntree-core.lib exit 1 # [win] - if not exist %PREFIX%\\Library\\bin\\idyntree-core.dll exit 1 # [win] - if not exist %PREFIX%\\Library\\lib\\cmake\\iDynTree\\iDynTreeConfig.cmake exit 1 # [win] + - test $(pip list | grep idyntree | tr -s " " | grep $PKG_VERSION | wc -l) -eq 1 # [unix] - pip check imports: - idyntree From d23e2f873f479f8a2e6dc517826570668535fced Mon Sep 17 00:00:00 2001 From: Diego Ferigo Date: Wed, 20 Oct 2021 10:00:43 +0200 Subject: [PATCH 12/33] Fix variable in bld.bat --- recipe/bld.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index ea4cf65..28ac1eb 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -34,7 +34,7 @@ if errorlevel 1 exit 1 :: Fix Python package version cd .. -%PYTHON% %RECIPE_DIR%\replace.py -f setup.py --pre 'use_scm_version=dict(local_scheme="dirty-tag"),' --post "version=""$PKG_VERSION""," +%PYTHON% %RECIPE_DIR%\replace.py -f setup.py --pre 'use_scm_version=dict(local_scheme="dirty-tag"),' --post "version=""%PKG_VERSION%""," :: Python package %PYTHON% ^ From 510ff78a23423d9bf2cbebb0813d7690ced308b7 Mon Sep 17 00:00:00 2001 From: Diego Ferigo Date: Wed, 20 Oct 2021 10:38:24 +0200 Subject: [PATCH 13/33] Trying / instead of \ in bat script --- recipe/bld.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index 28ac1eb..1fccbed 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -34,7 +34,7 @@ if errorlevel 1 exit 1 :: Fix Python package version cd .. -%PYTHON% %RECIPE_DIR%\replace.py -f setup.py --pre 'use_scm_version=dict(local_scheme="dirty-tag"),' --post "version=""%PKG_VERSION%""," +%PYTHON% %RECIPE_DIR%/replace.py -f setup.py --pre 'use_scm_version=dict(local_scheme="dirty-tag"),' --post "version=""%PKG_VERSION%""," :: Python package %PYTHON% ^ From f204d2146d9f3923b5af2756ecfc4ec9c7e59966 Mon Sep 17 00:00:00 2001 From: Diego Ferigo Date: Wed, 20 Oct 2021 12:30:09 +0200 Subject: [PATCH 14/33] Try using m2-sed instead of custom Python script --- recipe/bld.bat | 2 +- recipe/meta.yaml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index 1fccbed..096768b 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -34,7 +34,7 @@ if errorlevel 1 exit 1 :: Fix Python package version cd .. -%PYTHON% %RECIPE_DIR%/replace.py -f setup.py --pre 'use_scm_version=dict(local_scheme="dirty-tag"),' --post "version=""%PKG_VERSION%""," +sed -i "s|use_scm_version=dict(local_scheme=""dirty-tag""),|version=""%PKG_VERSION%"",|g" setup.py :: Python package %PYTHON% ^ diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 7ff2cc5..7bd5f07 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -31,6 +31,7 @@ requirements: - {{ cdt('libxfixes') }} # [linux] - {{ cdt('libxau') }} # [linux] - {{ cdt('expat') }} # [linux] + - m2-sed # [win] host: - libxml2 From c6854f0fa00ef79c277ba7be9a9dd8e274c3cbb4 Mon Sep 17 00:00:00 2001 From: Diego Ferigo Date: Wed, 20 Oct 2021 13:04:05 +0200 Subject: [PATCH 15/33] Use sed also on unix --- recipe/build.sh | 2 +- recipe/replace.py | 14 -------------- 2 files changed, 1 insertion(+), 15 deletions(-) delete mode 100755 recipe/replace.py diff --git a/recipe/build.sh b/recipe/build.sh index 569500c..66508d6 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -30,7 +30,7 @@ ctest --output-on-failure -C Release # Fix Python package version cd .. -$PYTHON ${RECIPE_DIR}/replace.py -f setup.py --pre 'use_scm_version=dict(local_scheme="dirty-tag"),' --post "version=\"$PKG_VERSION\"," +sed -i "s|use_scm_version=dict(local_scheme=\"dirty-tag\"),|version=\"$PKG_VERSION\",|g" setup.py # Python package $PYTHON \ diff --git a/recipe/replace.py b/recipe/replace.py deleted file mode 100755 index 842ff11..0000000 --- a/recipe/replace.py +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env python3 -import argparse -import fileinput - -parser = argparse.ArgumentParser() -parser.add_argument("-f", "--file", type=str) -parser.add_argument("--pre", type=str) -parser.add_argument("--post", type=str) - -args = parser.parse_args() - -with fileinput.FileInput(args.file, inplace=True, backup='.bak') as file: - for line in file: - print(line.replace(args.pre, args.post), end='') From 6a327474f909647a99ae3d2ded883c35213b82f4 Mon Sep 17 00:00:00 2001 From: Diego Ferigo Date: Wed, 20 Oct 2021 13:08:11 +0200 Subject: [PATCH 16/33] Call pip through python in windows --- recipe/bld.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index 096768b..a831a99 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -46,4 +46,4 @@ sed -i "s|use_scm_version=dict(local_scheme=""dirty-tag""),|version=""%PKG_VERSI "-C--global-option=build_ext" ^ "-C--global-option=--no-cmake-extension=all" ^ . -pip install --no-deps dist/*.whl +%PYTHON% -m pip install --no-deps ./dist/idyntree*.whl From ceb14f2210a1d1ac016c1a1e770476d5498eb069 Mon Sep 17 00:00:00 2001 From: Diego Ferigo Date: Wed, 20 Oct 2021 13:08:45 +0200 Subject: [PATCH 17/33] Handle errors in windows --- recipe/bld.bat | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/recipe/bld.bat b/recipe/bld.bat index a831a99..4973c1c 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -35,6 +35,7 @@ if errorlevel 1 exit 1 :: Fix Python package version cd .. sed -i "s|use_scm_version=dict(local_scheme=""dirty-tag""),|version=""%PKG_VERSION%"",|g" setup.py +if errorlevel 1 exit 1 :: Python package %PYTHON% ^ @@ -46,4 +47,7 @@ sed -i "s|use_scm_version=dict(local_scheme=""dirty-tag""),|version=""%PKG_VERSI "-C--global-option=build_ext" ^ "-C--global-option=--no-cmake-extension=all" ^ . +if errorlevel 1 exit 1 + %PYTHON% -m pip install --no-deps ./dist/idyntree*.whl +if errorlevel 1 exit 1 From d6130cab57c78881717094b643639383b0239982 Mon Sep 17 00:00:00 2001 From: Diego Ferigo Date: Wed, 20 Oct 2021 13:39:27 +0200 Subject: [PATCH 18/33] Fix sed call for macOS --- recipe/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/build.sh b/recipe/build.sh index 66508d6..ad0ad95 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -30,7 +30,7 @@ ctest --output-on-failure -C Release # Fix Python package version cd .. -sed -i "s|use_scm_version=dict(local_scheme=\"dirty-tag\"),|version=\"$PKG_VERSION\",|g" setup.py +sed -i.bak "s|use_scm_version=dict(local_scheme=\"dirty-tag\"),|version=\"$PKG_VERSION\",|g" setup.py # Python package $PYTHON \ From 41392d62ca22f6d1cdedf88b64997f5c4fc4baf1 Mon Sep 17 00:00:00 2001 From: Diego Ferigo Date: Wed, 20 Oct 2021 13:45:23 +0200 Subject: [PATCH 19/33] Add sed unix dependency --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 7bd5f07..241472e 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -31,6 +31,7 @@ requirements: - {{ cdt('libxfixes') }} # [linux] - {{ cdt('libxau') }} # [linux] - {{ cdt('expat') }} # [linux] + - sed # [unix] - m2-sed # [win] host: From 1458e9a52a9eee1b9f3115a7282ba4fbe1cb778c Mon Sep 17 00:00:00 2001 From: Diego Ferigo Date: Wed, 20 Oct 2021 14:21:32 +0200 Subject: [PATCH 20/33] Align sed usage also on windows --- recipe/bld.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index 4973c1c..2c631dc 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -34,7 +34,7 @@ if errorlevel 1 exit 1 :: Fix Python package version cd .. -sed -i "s|use_scm_version=dict(local_scheme=""dirty-tag""),|version=""%PKG_VERSION%"",|g" setup.py +sed -i.bak "s|use_scm_version=dict(local_scheme=""dirty-tag""),|version=""%PKG_VERSION%"",|g" setup.py if errorlevel 1 exit 1 :: Python package From ad6df81d39402073093b6c22e9a84934bf8a8230 Mon Sep 17 00:00:00 2001 From: Diego Ferigo Date: Wed, 20 Oct 2021 14:22:06 +0200 Subject: [PATCH 21/33] Inspect diff during conda build --- recipe/bld.bat | 3 +++ recipe/build.sh | 1 + recipe/meta.yaml | 2 ++ 3 files changed, 6 insertions(+) diff --git a/recipe/bld.bat b/recipe/bld.bat index 2c631dc..23ad27c 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -37,6 +37,9 @@ cd .. sed -i.bak "s|use_scm_version=dict(local_scheme=""dirty-tag""),|version=""%PKG_VERSION%"",|g" setup.py if errorlevel 1 exit 1 +:: Inspect diff +diff -u setup.py setup.py.bak + :: Python package %PYTHON% ^ -m build ^ diff --git a/recipe/build.sh b/recipe/build.sh index ad0ad95..b143e31 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -31,6 +31,7 @@ ctest --output-on-failure -C Release # Fix Python package version cd .. sed -i.bak "s|use_scm_version=dict(local_scheme=\"dirty-tag\"),|version=\"$PKG_VERSION\",|g" setup.py +diff -u setup.py setup.py.bak # Python package $PYTHON \ diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 241472e..e70aaa2 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -32,7 +32,9 @@ requirements: - {{ cdt('libxau') }} # [linux] - {{ cdt('expat') }} # [linux] - sed # [unix] + - diffutils [unix] - m2-sed # [win] + - m2-diffutils # [win] host: - libxml2 From fb11453d6105411686fd3c28a2c4dd73b331d42c Mon Sep 17 00:00:00 2001 From: Diego Ferigo Date: Wed, 20 Oct 2021 14:36:02 +0200 Subject: [PATCH 22/33] Fix specifier --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index e70aaa2..f0de622 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -32,7 +32,7 @@ requirements: - {{ cdt('libxau') }} # [linux] - {{ cdt('expat') }} # [linux] - sed # [unix] - - diffutils [unix] + - diffutils # [unix] - m2-sed # [win] - m2-diffutils # [win] From 6f3c5124c3f84d6906ea09b63695ac20d6a0d121 Mon Sep 17 00:00:00 2001 From: Diego Ferigo Date: Wed, 20 Oct 2021 15:03:30 +0200 Subject: [PATCH 23/33] Fix calling diff --- recipe/bld.bat | 2 +- recipe/build.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index 23ad27c..e2da90f 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -38,7 +38,7 @@ sed -i.bak "s|use_scm_version=dict(local_scheme=""dirty-tag""),|version=""%PKG_V if errorlevel 1 exit 1 :: Inspect diff -diff -u setup.py setup.py.bak +diff -u setup.py.bak setup.py :: Python package %PYTHON% ^ diff --git a/recipe/build.sh b/recipe/build.sh index b143e31..30df667 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -31,7 +31,7 @@ ctest --output-on-failure -C Release # Fix Python package version cd .. sed -i.bak "s|use_scm_version=dict(local_scheme=\"dirty-tag\"),|version=\"$PKG_VERSION\",|g" setup.py -diff -u setup.py setup.py.bak +diff -u setup.py.bak setup.py || true # Python package $PYTHON \ From 8bd1e4bc3a4c4be58a80170a3bd914a060cfba5c Mon Sep 17 00:00:00 2001 From: Diego Ferigo Date: Wed, 20 Oct 2021 16:52:25 +0200 Subject: [PATCH 24/33] Use backslashes in the wheel path --- recipe/bld.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index e2da90f..ee3f2dc 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -52,5 +52,5 @@ diff -u setup.py.bak setup.py . if errorlevel 1 exit 1 -%PYTHON% -m pip install --no-deps ./dist/idyntree*.whl +%PYTHON% -m pip install --no-deps .\dist\idyntree*.whl if errorlevel 1 exit 1 From 3b263fef02f240d980a6557148ac9c4e71d2fdf1 Mon Sep 17 00:00:00 2001 From: Diego Ferigo Date: Wed, 20 Oct 2021 17:30:37 +0200 Subject: [PATCH 25/33] Second globbing attempt --- recipe/bld.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index ee3f2dc..9db1125 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -52,5 +52,5 @@ diff -u setup.py.bak setup.py . if errorlevel 1 exit 1 -%PYTHON% -m pip install --no-deps .\dist\idyntree*.whl +%PYTHON% -m pip install --no-deps dist\*.whl if errorlevel 1 exit 1 From 9b41f5bb29ebb5d0d6e3149d28b925221548d71a Mon Sep 17 00:00:00 2001 From: Diego Ferigo Date: Thu, 21 Oct 2021 10:04:56 +0200 Subject: [PATCH 26/33] Update build scripts - restore modified files before finishing - let pip find the wheel without specifying the name of the file --- recipe/bld.bat | 23 ++++++++++++++++++++--- recipe/build.sh | 22 ++++++++++++++++++---- 2 files changed, 38 insertions(+), 7 deletions(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index 9db1125..28e3516 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -39,12 +39,17 @@ if errorlevel 1 exit 1 :: Inspect diff diff -u setup.py.bak setup.py +if errorlevel 1 exit 1 + +:: Delete wheel folder +rmdir /s /q _dist_conda +if errorlevel 1 exit 1 -:: Python package +:: Generate the wheel %PYTHON% ^ -m build ^ --wheel ^ - --outdir dist ^ + --outdir _dist_conda ^ --no-isolation ^ --skip-dependency-check ^ "-C--global-option=build_ext" ^ @@ -52,5 +57,17 @@ diff -u setup.py.bak setup.py . if errorlevel 1 exit 1 -%PYTHON% -m pip install --no-deps dist\*.whl +:: Install Python package +%PYTHON% -m pip install ^ + --no-index --find-links=./_dist_conda/ ^ + --no-build-isolation --no-deps ^ + idyntree +if errorlevel 1 exit 1 + +:: Delete wheel folder +rmdir /s /q _dist_conda +if errorlevel 1 exit 1 + +:: Restore original files +move /y setup.py.bak setup.py if errorlevel 1 exit 1 diff --git a/recipe/build.sh b/recipe/build.sh index 30df667..37cf03c 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -31,16 +31,30 @@ ctest --output-on-failure -C Release # Fix Python package version cd .. sed -i.bak "s|use_scm_version=dict(local_scheme=\"dirty-tag\"),|version=\"$PKG_VERSION\",|g" setup.py -diff -u setup.py.bak setup.py || true +diff -u setup.py{.bak,} || true -# Python package +# Delete wheel folder +rm -rf _dist_conda/ + +# Generate the wheel $PYTHON \ -m build \ --wheel \ - --outdir dist \ + --outdir _dist_conda \ --no-isolation \ --skip-dependency-check \ "-C--global-option=build_ext" \ "-C--global-option=--no-cmake-extension=all" \ . -pip install --no-deps dist/*.whl + +# Install Python package +pip install \ + --no-index --find-links=./_dist_conda/ \ + --no-build-isolation --no-deps \ + idyntree + +# Delete wheel folder +rm -rf _dist_conda/ + +# Restore original files +mv setup.py{.bak,} From a7f8ce0936b0dc3ca2f78970b34d2d59683ef135 Mon Sep 17 00:00:00 2001 From: Diego Ferigo Date: Thu, 21 Oct 2021 10:53:57 +0200 Subject: [PATCH 27/33] Disable checking exit status of diff command it returns 0 only if there's no diff --- recipe/bld.bat | 1 - 1 file changed, 1 deletion(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index 28e3516..b0b59e5 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -39,7 +39,6 @@ if errorlevel 1 exit 1 :: Inspect diff diff -u setup.py.bak setup.py -if errorlevel 1 exit 1 :: Delete wheel folder rmdir /s /q _dist_conda From 6cf9b6947f84815630e9c27b432db07906e8403e Mon Sep 17 00:00:00 2001 From: Diego Ferigo Date: Thu, 21 Oct 2021 11:32:57 +0200 Subject: [PATCH 28/33] rmdir on windows fails if the folder does not exist --- recipe/bld.bat | 1 - 1 file changed, 1 deletion(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index b0b59e5..0477ee1 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -42,7 +42,6 @@ diff -u setup.py.bak setup.py :: Delete wheel folder rmdir /s /q _dist_conda -if errorlevel 1 exit 1 :: Generate the wheel %PYTHON% ^ From 859c2fadf5d68fedfe63ef18fd54ef8a55e33dba Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Thu, 4 Nov 2021 09:01:17 +0100 Subject: [PATCH 29/33] Switch aarch64 and ppc64 build to cross-compilation --- conda-forge.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/conda-forge.yml b/conda-forge.yml index 617a754..f2c3be9 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -1,3 +1,5 @@ bot: {automerge: true} conda_forge_output_validation: true -provider: {linux_aarch64: default, linux_ppc64le: default} +build_platform: + linux_aarch64: linux_64 + linux_ppc64le: linux_64 From 6738c2ccf293b2f3232f19f54eea7fa54d26a3de Mon Sep 17 00:00:00 2001 From: conda-forge-linter Date: Thu, 4 Nov 2021 08:03:59 +0000 Subject: [PATCH 30/33] MNT: Re-rendered with conda-build 3.21.4, conda-smithy 3.14.3, and conda-forge-pinning 2021.11.03.23.52.26 --- .azure-pipelines/azure-pipelines-linux.yml | 29 ++++++ .azure-pipelines/azure-pipelines-osx.yml | 5 + .azure-pipelines/azure-pipelines-win.yml | 6 +- ...arch64_numpy1.18python3.7.____cpython.yaml | 2 +- ...arch64_numpy1.18python3.8.____cpython.yaml | 2 +- ...arch64_numpy1.19python3.9.____cpython.yaml | 2 +- ...pc64le_numpy1.18python3.7.____cpython.yaml | 2 +- ...pc64le_numpy1.18python3.8.____cpython.yaml | 2 +- ...pc64le_numpy1.19python3.9.____cpython.yaml | 2 +- .drone.yml | 93 ------------------- .gitattributes | 1 + .scripts/build_steps.sh | 6 +- .scripts/run_docker_build.sh | 7 +- .scripts/run_osx_build.sh | 8 +- .travis.yml | 31 ------- README.md | 19 +--- build-locally.py | 5 + 17 files changed, 66 insertions(+), 156 deletions(-) delete mode 100644 .drone.yml delete mode 100644 .travis.yml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 0a7f757..7acc62f 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -20,6 +20,30 @@ jobs: CONFIG: linux_64_numpy1.19python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 + linux_aarch64_numpy1.18python3.7.____cpython: + CONFIG: linux_aarch64_numpy1.18python3.7.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 + linux_aarch64_numpy1.18python3.8.____cpython: + CONFIG: linux_aarch64_numpy1.18python3.8.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 + linux_aarch64_numpy1.19python3.9.____cpython: + CONFIG: linux_aarch64_numpy1.19python3.9.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 + linux_ppc64le_numpy1.18python3.7.____cpython: + CONFIG: linux_ppc64le_numpy1.18python3.7.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 + linux_ppc64le_numpy1.18python3.8.____cpython: + CONFIG: linux_ppc64le_numpy1.18python3.8.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 + linux_ppc64le_numpy1.19python3.9.____cpython: + CONFIG: linux_ppc64le_numpy1.19python3.9.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 timeoutInMinutes: 360 steps: @@ -40,6 +64,11 @@ jobs: export CI=azure export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME}) + if [[ "${BUILD_REASON:-}" == "PullRequest" ]]; then + export IS_PR_BUILD="True" + else + export IS_PR_BUILD="False" + fi .scripts/run_docker_build.sh displayName: Run docker build env: diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index b703ab9..ee4bebf 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -26,6 +26,11 @@ jobs: export OSX_FORCE_SDK_DOWNLOAD="1" export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME}) + if [[ "${BUILD_REASON:-}" == "PullRequest" ]]; then + export IS_PR_BUILD="True" + else + export IS_PR_BUILD="False" + fi ./.scripts/run_osx_build.sh displayName: Run OSX build env: diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 5fd91a5..861a0db 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -58,7 +58,7 @@ jobs: - task: CondaEnvironment@1 inputs: - packageSpecs: 'python=3.6 conda-build conda "conda-forge-ci-setup=3" pip' # Optional + packageSpecs: 'python=3.9 conda-build conda "conda-forge-ci-setup=3" pip boa' # Optional installOptions: "-c conda-forge" updateConda: true displayName: Install conda-build and activate environment @@ -92,7 +92,7 @@ jobs: - script: | call activate base - conda.exe build "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables + conda.exe mambabuild "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables displayName: Build recipe env: PYTHONUNBUFFERED: 1 @@ -113,4 +113,4 @@ jobs: BINSTAR_TOKEN: $(BINSTAR_TOKEN) FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) - condition: and(succeeded(), not(eq(variables['UPLOAD_PACKAGES'], 'False'))) \ No newline at end of file + condition: and(succeeded(), not(eq(variables['UPLOAD_PACKAGES'], 'False')), not(eq(variables['Build.Reason'], 'PullRequest'))) \ No newline at end of file diff --git a/.ci_support/linux_aarch64_numpy1.18python3.7.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.18python3.7.____cpython.yaml index b8f8e60..0bbcdee 100644 --- a/.ci_support/linux_aarch64_numpy1.18python3.7.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.18python3.7.____cpython.yaml @@ -17,7 +17,7 @@ cxx_compiler: cxx_compiler_version: - '9' docker_image: -- quay.io/condaforge/linux-anvil-aarch64 +- quay.io/condaforge/linux-anvil-comp7 ipopt: - '3.14' libxml2: diff --git a/.ci_support/linux_aarch64_numpy1.18python3.8.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.18python3.8.____cpython.yaml index 8baf47d..68f8390 100644 --- a/.ci_support/linux_aarch64_numpy1.18python3.8.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.18python3.8.____cpython.yaml @@ -17,7 +17,7 @@ cxx_compiler: cxx_compiler_version: - '9' docker_image: -- quay.io/condaforge/linux-anvil-aarch64 +- quay.io/condaforge/linux-anvil-comp7 ipopt: - '3.14' libxml2: diff --git a/.ci_support/linux_aarch64_numpy1.19python3.9.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.19python3.9.____cpython.yaml index c95c772..3bc3290 100644 --- a/.ci_support/linux_aarch64_numpy1.19python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.19python3.9.____cpython.yaml @@ -17,7 +17,7 @@ cxx_compiler: cxx_compiler_version: - '9' docker_image: -- quay.io/condaforge/linux-anvil-aarch64 +- quay.io/condaforge/linux-anvil-comp7 ipopt: - '3.14' libxml2: diff --git a/.ci_support/linux_ppc64le_numpy1.18python3.7.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.18python3.7.____cpython.yaml index ee68d81..b0ebfdd 100644 --- a/.ci_support/linux_ppc64le_numpy1.18python3.7.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.18python3.7.____cpython.yaml @@ -13,7 +13,7 @@ cxx_compiler: cxx_compiler_version: - '9' docker_image: -- quay.io/condaforge/linux-anvil-ppc64le +- quay.io/condaforge/linux-anvil-comp7 ipopt: - '3.14' libxml2: diff --git a/.ci_support/linux_ppc64le_numpy1.18python3.8.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.18python3.8.____cpython.yaml index a66b6e0..af3045c 100644 --- a/.ci_support/linux_ppc64le_numpy1.18python3.8.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.18python3.8.____cpython.yaml @@ -13,7 +13,7 @@ cxx_compiler: cxx_compiler_version: - '9' docker_image: -- quay.io/condaforge/linux-anvil-ppc64le +- quay.io/condaforge/linux-anvil-comp7 ipopt: - '3.14' libxml2: diff --git a/.ci_support/linux_ppc64le_numpy1.19python3.9.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.19python3.9.____cpython.yaml index 9ce30bb..d80172b 100644 --- a/.ci_support/linux_ppc64le_numpy1.19python3.9.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.19python3.9.____cpython.yaml @@ -13,7 +13,7 @@ cxx_compiler: cxx_compiler_version: - '9' docker_image: -- quay.io/condaforge/linux-anvil-ppc64le +- quay.io/condaforge/linux-anvil-comp7 ipopt: - '3.14' libxml2: diff --git a/.drone.yml b/.drone.yml deleted file mode 100644 index e6e4fbc..0000000 --- a/.drone.yml +++ /dev/null @@ -1,93 +0,0 @@ ---- -kind: pipeline -name: linux_aarch64_numpy1.18python3.7.____cpython - -platform: - os: linux - arch: arm64 - -steps: -- name: Install and build - image: quay.io/condaforge/linux-anvil-aarch64 - environment: - CONFIG: linux_aarch64_numpy1.18python3.7.____cpython - UPLOAD_PACKAGES: True - PLATFORM: linux-aarch64 - BINSTAR_TOKEN: - from_secret: BINSTAR_TOKEN - FEEDSTOCK_TOKEN: - from_secret: FEEDSTOCK_TOKEN - STAGING_BINSTAR_TOKEN: - from_secret: STAGING_BINSTAR_TOKEN - commands: - - export FEEDSTOCK_ROOT="$DRONE_WORKSPACE" - - export RECIPE_ROOT="$FEEDSTOCK_ROOT/recipe" - - export CI=drone - - export GIT_BRANCH="$DRONE_BRANCH" - - export FEEDSTOCK_NAME=$(basename ${DRONE_REPO_NAME}) - - sed -i '$ichown -R conda:conda "$FEEDSTOCK_ROOT"' /opt/docker/bin/entrypoint - - /opt/docker/bin/entrypoint $FEEDSTOCK_ROOT/.scripts/build_steps.sh - - echo "Done building" - ---- -kind: pipeline -name: linux_aarch64_numpy1.18python3.8.____cpython - -platform: - os: linux - arch: arm64 - -steps: -- name: Install and build - image: quay.io/condaforge/linux-anvil-aarch64 - environment: - CONFIG: linux_aarch64_numpy1.18python3.8.____cpython - UPLOAD_PACKAGES: True - PLATFORM: linux-aarch64 - BINSTAR_TOKEN: - from_secret: BINSTAR_TOKEN - FEEDSTOCK_TOKEN: - from_secret: FEEDSTOCK_TOKEN - STAGING_BINSTAR_TOKEN: - from_secret: STAGING_BINSTAR_TOKEN - commands: - - export FEEDSTOCK_ROOT="$DRONE_WORKSPACE" - - export RECIPE_ROOT="$FEEDSTOCK_ROOT/recipe" - - export CI=drone - - export GIT_BRANCH="$DRONE_BRANCH" - - export FEEDSTOCK_NAME=$(basename ${DRONE_REPO_NAME}) - - sed -i '$ichown -R conda:conda "$FEEDSTOCK_ROOT"' /opt/docker/bin/entrypoint - - /opt/docker/bin/entrypoint $FEEDSTOCK_ROOT/.scripts/build_steps.sh - - echo "Done building" - ---- -kind: pipeline -name: linux_aarch64_numpy1.19python3.9.____cpython - -platform: - os: linux - arch: arm64 - -steps: -- name: Install and build - image: quay.io/condaforge/linux-anvil-aarch64 - environment: - CONFIG: linux_aarch64_numpy1.19python3.9.____cpython - UPLOAD_PACKAGES: True - PLATFORM: linux-aarch64 - BINSTAR_TOKEN: - from_secret: BINSTAR_TOKEN - FEEDSTOCK_TOKEN: - from_secret: FEEDSTOCK_TOKEN - STAGING_BINSTAR_TOKEN: - from_secret: STAGING_BINSTAR_TOKEN - commands: - - export FEEDSTOCK_ROOT="$DRONE_WORKSPACE" - - export RECIPE_ROOT="$FEEDSTOCK_ROOT/recipe" - - export CI=drone - - export GIT_BRANCH="$DRONE_BRANCH" - - export FEEDSTOCK_NAME=$(basename ${DRONE_REPO_NAME}) - - sed -i '$ichown -R conda:conda "$FEEDSTOCK_ROOT"' /opt/docker/bin/entrypoint - - /opt/docker/bin/entrypoint $FEEDSTOCK_ROOT/.scripts/build_steps.sh - - echo "Done building" - diff --git a/.gitattributes b/.gitattributes index 9060b27..ce52713 100644 --- a/.gitattributes +++ b/.gitattributes @@ -18,6 +18,7 @@ bld.bat text eol=crlf .gitignore linguist-generated=true .travis.yml linguist-generated=true .scripts/* linguist-generated=true +.woodpecker.yml linguist-generated=true LICENSE.txt linguist-generated=true README.md linguist-generated=true azure-pipelines.yml linguist-generated=true diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 180ff1b..055a72d 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -25,7 +25,8 @@ conda-build: root-dir: ${FEEDSTOCK_ROOT}/build_artifacts CONDARC -BUILD_CMD=build +GET_BOA=boa +BUILD_CMD=mambabuild conda install --yes --quiet "conda-forge-ci-setup=3" conda-build pip ${GET_BOA:-} -c conda-forge @@ -46,6 +47,7 @@ source run_conda_forge_build_setup make_build_number "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" + ( endgroup "Configuring conda" ) 2> /dev/null if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then @@ -70,7 +72,7 @@ else ( startgroup "Uploading packages" ) 2> /dev/null - if [[ "${UPLOAD_PACKAGES}" != "False" ]]; then + if [[ "${UPLOAD_PACKAGES}" != "False" ]] && [[ "${IS_PR_BUILD}" == "False" ]]; then upload_package --validate --feedstock-name="${FEEDSTOCK_NAME}" "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" fi diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh index 244ccd1..0c6515f 100755 --- a/.scripts/run_docker_build.sh +++ b/.scripts/run_docker_build.sh @@ -75,12 +75,15 @@ fi ( startgroup "Start Docker" ) 2> /dev/null export UPLOAD_PACKAGES="${UPLOAD_PACKAGES:-True}" +export IS_PR_BUILD="${IS_PR_BUILD:-False}" +docker pull "${DOCKER_IMAGE}" docker run ${DOCKER_RUN_ARGS} \ -v "${RECIPE_ROOT}":/home/conda/recipe_root:rw,z,delegated \ -v "${FEEDSTOCK_ROOT}":/home/conda/feedstock_root:rw,z,delegated \ -e CONFIG \ -e HOST_USER_ID \ -e UPLOAD_PACKAGES \ + -e IS_PR_BUILD \ -e GIT_BRANCH \ -e UPLOAD_ON_BRANCH \ -e CI \ @@ -91,9 +94,9 @@ docker run ${DOCKER_RUN_ARGS} \ -e BINSTAR_TOKEN \ -e FEEDSTOCK_TOKEN \ -e STAGING_BINSTAR_TOKEN \ - $DOCKER_IMAGE \ + "${DOCKER_IMAGE}" \ bash \ - /home/conda/feedstock_root/${PROVIDER_DIR}/build_steps.sh + "/home/conda/feedstock_root/${PROVIDER_DIR}/build_steps.sh" # verify that the end of the script was reached test -f "$DONE_CANARY" diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 96d0278..d6de123 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -9,15 +9,17 @@ MINIFORGE_HOME=${MINIFORGE_HOME:-${HOME}/miniforge3} ( startgroup "Installing a fresh version of Miniforge" ) 2> /dev/null MINIFORGE_URL="https://github.com/conda-forge/miniforge/releases/latest/download" -MINIFORGE_FILE="Miniforge3-MacOSX-x86_64.sh" +MINIFORGE_FILE="Miniforge3-MacOSX-$(uname -m).sh" curl -L -O "${MINIFORGE_URL}/${MINIFORGE_FILE}" +rm -rf ${MINIFORGE_HOME} bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} ( endgroup "Installing a fresh version of Miniforge" ) 2> /dev/null ( startgroup "Configuring conda" ) 2> /dev/null -BUILD_CMD=build +GET_BOA=boa +BUILD_CMD=mambabuild source ${MINIFORGE_HOME}/etc/profile.d/conda.sh conda activate base @@ -62,7 +64,7 @@ validate_recipe_outputs "${FEEDSTOCK_NAME}" ( startgroup "Uploading packages" ) 2> /dev/null -if [[ "${UPLOAD_PACKAGES}" != "False" ]]; then +if [[ "${UPLOAD_PACKAGES}" != "False" ]] && [[ "${IS_PR_BUILD}" == "False" ]]; then upload_package --validate --feedstock-name="${FEEDSTOCK_NAME}" ./ ./recipe ./.ci_support/${CONFIG}.yaml fi diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 896c76e..0000000 --- a/.travis.yml +++ /dev/null @@ -1,31 +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: generic - - - -matrix: - include: - - env: CONFIG=linux_ppc64le_numpy1.18python3.7.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le - os: linux - arch: ppc64le - dist: focal - - - env: CONFIG=linux_ppc64le_numpy1.18python3.8.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le - os: linux - arch: ppc64le - dist: focal - - - env: CONFIG=linux_ppc64le_numpy1.19python3.9.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le - os: linux - arch: ppc64le - dist: focal - -script: - - export CI=travis - - export GIT_BRANCH="$TRAVIS_BRANCH" - - export FEEDSTOCK_NAME=$(basename ${TRAVIS_REPO_SLUG}) - - - - if [[ ${PLATFORM} =~ .*linux.* ]]; then ./.scripts/run_docker_build.sh; fi \ No newline at end of file diff --git a/README.md b/README.md index 5f72bfe..e94b6be 100644 --- a/README.md +++ b/README.md @@ -13,21 +13,7 @@ Current build status ==================== - - - - - - - +
Travis - - macOS - -
Drone - - linux - -
@@ -186,7 +172,8 @@ conda search idyntree --channel conda-forge About conda-forge ================= -[![Powered by NumFOCUS](https://img.shields.io/badge/powered%20by-NumFOCUS-orange.svg?style=flat&colorA=E1523D&colorB=007D8A)](http://numfocus.org) +[![Powered by +NumFOCUS](https://img.shields.io/badge/powered%20by-NumFOCUS-orange.svg?style=flat&colorA=E1523D&colorB=007D8A)](https://numfocus.org) conda-forge is a community-led conda channel of installable packages. In order to provide high-quality builds, the process has been automated into the diff --git a/build-locally.py b/build-locally.py index 00eeb34..8b74348 100755 --- a/build-locally.py +++ b/build-locally.py @@ -13,6 +13,7 @@ def setup_environment(ns): os.environ["CONFIG"] = ns.config os.environ["UPLOAD_PACKAGES"] = "False" + os.environ["IS_PR_BUILD"] = "True" if ns.debug: os.environ["BUILD_WITH_CONDA_DEBUG"] = "1" if ns.output_id: @@ -21,6 +22,10 @@ def setup_environment(ns): os.environ["MINIFORGE_HOME"] = os.path.join( os.path.dirname(__file__), "miniforge3" ) + if "OSX_SDK_DIR" not in os.environ: + os.environ["OSX_SDK_DIR"] = os.path.join( + os.path.dirname(__file__), "SDKs" + ) def run_docker_build(ns): From 903310fb86cfcc5a1872cb8690113b1d84922630 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Thu, 4 Nov 2021 10:06:42 +0100 Subject: [PATCH 31/33] Update conda-forge.yml --- conda-forge.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conda-forge.yml b/conda-forge.yml index f2c3be9..f40ff41 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -1,5 +1,5 @@ bot: {automerge: true} conda_forge_output_validation: true build_platform: - linux_aarch64: linux_64 - linux_ppc64le: linux_64 + linux_aarch64: azure + linux_ppc64le: azure From dd946074f6b0a979c42454daedc40e5ff0a63ddf Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Thu, 4 Nov 2021 10:13:56 +0100 Subject: [PATCH 32/33] Update conda-forge.yml --- conda-forge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda-forge.yml b/conda-forge.yml index f40ff41..a6b2d96 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -1,5 +1,5 @@ bot: {automerge: true} conda_forge_output_validation: true -build_platform: +provider: linux_aarch64: azure linux_ppc64le: azure From baaaf5b35095e69adccd3d0293d9c6a11046cc7c Mon Sep 17 00:00:00 2001 From: conda-forge-linter Date: Thu, 4 Nov 2021 09:15:52 +0000 Subject: [PATCH 33/33] MNT: Re-rendered with conda-build 3.21.4, conda-smithy 3.14.3, and conda-forge-pinning 2021.11.03.23.52.26 --- .azure-pipelines/azure-pipelines-linux.yml | 12 ++++++------ ...linux_aarch64_numpy1.18python3.7.____cpython.yaml | 2 +- ...linux_aarch64_numpy1.18python3.8.____cpython.yaml | 2 +- ...linux_aarch64_numpy1.19python3.9.____cpython.yaml | 2 +- ...linux_ppc64le_numpy1.18python3.7.____cpython.yaml | 2 +- ...linux_ppc64le_numpy1.18python3.8.____cpython.yaml | 2 +- ...linux_ppc64le_numpy1.19python3.9.____cpython.yaml | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 7acc62f..f15f47e 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -23,27 +23,27 @@ jobs: linux_aarch64_numpy1.18python3.7.____cpython: CONFIG: linux_aarch64_numpy1.18python3.7.____cpython UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64 linux_aarch64_numpy1.18python3.8.____cpython: CONFIG: linux_aarch64_numpy1.18python3.8.____cpython UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64 linux_aarch64_numpy1.19python3.9.____cpython: CONFIG: linux_aarch64_numpy1.19python3.9.____cpython UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64 linux_ppc64le_numpy1.18python3.7.____cpython: CONFIG: linux_ppc64le_numpy1.18python3.7.____cpython UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-ppc64le linux_ppc64le_numpy1.18python3.8.____cpython: CONFIG: linux_ppc64le_numpy1.18python3.8.____cpython UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-ppc64le linux_ppc64le_numpy1.19python3.9.____cpython: CONFIG: linux_ppc64le_numpy1.19python3.9.____cpython UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-ppc64le timeoutInMinutes: 360 steps: diff --git a/.ci_support/linux_aarch64_numpy1.18python3.7.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.18python3.7.____cpython.yaml index 0bbcdee..b8f8e60 100644 --- a/.ci_support/linux_aarch64_numpy1.18python3.7.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.18python3.7.____cpython.yaml @@ -17,7 +17,7 @@ cxx_compiler: cxx_compiler_version: - '9' docker_image: -- quay.io/condaforge/linux-anvil-comp7 +- quay.io/condaforge/linux-anvil-aarch64 ipopt: - '3.14' libxml2: diff --git a/.ci_support/linux_aarch64_numpy1.18python3.8.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.18python3.8.____cpython.yaml index 68f8390..8baf47d 100644 --- a/.ci_support/linux_aarch64_numpy1.18python3.8.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.18python3.8.____cpython.yaml @@ -17,7 +17,7 @@ cxx_compiler: cxx_compiler_version: - '9' docker_image: -- quay.io/condaforge/linux-anvil-comp7 +- quay.io/condaforge/linux-anvil-aarch64 ipopt: - '3.14' libxml2: diff --git a/.ci_support/linux_aarch64_numpy1.19python3.9.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.19python3.9.____cpython.yaml index 3bc3290..c95c772 100644 --- a/.ci_support/linux_aarch64_numpy1.19python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.19python3.9.____cpython.yaml @@ -17,7 +17,7 @@ cxx_compiler: cxx_compiler_version: - '9' docker_image: -- quay.io/condaforge/linux-anvil-comp7 +- quay.io/condaforge/linux-anvil-aarch64 ipopt: - '3.14' libxml2: diff --git a/.ci_support/linux_ppc64le_numpy1.18python3.7.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.18python3.7.____cpython.yaml index b0ebfdd..ee68d81 100644 --- a/.ci_support/linux_ppc64le_numpy1.18python3.7.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.18python3.7.____cpython.yaml @@ -13,7 +13,7 @@ cxx_compiler: cxx_compiler_version: - '9' docker_image: -- quay.io/condaforge/linux-anvil-comp7 +- quay.io/condaforge/linux-anvil-ppc64le ipopt: - '3.14' libxml2: diff --git a/.ci_support/linux_ppc64le_numpy1.18python3.8.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.18python3.8.____cpython.yaml index af3045c..a66b6e0 100644 --- a/.ci_support/linux_ppc64le_numpy1.18python3.8.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.18python3.8.____cpython.yaml @@ -13,7 +13,7 @@ cxx_compiler: cxx_compiler_version: - '9' docker_image: -- quay.io/condaforge/linux-anvil-comp7 +- quay.io/condaforge/linux-anvil-ppc64le ipopt: - '3.14' libxml2: diff --git a/.ci_support/linux_ppc64le_numpy1.19python3.9.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.19python3.9.____cpython.yaml index d80172b..9ce30bb 100644 --- a/.ci_support/linux_ppc64le_numpy1.19python3.9.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.19python3.9.____cpython.yaml @@ -13,7 +13,7 @@ cxx_compiler: cxx_compiler_version: - '9' docker_image: -- quay.io/condaforge/linux-anvil-comp7 +- quay.io/condaforge/linux-anvil-ppc64le ipopt: - '3.14' libxml2:
Azure