From efd8c5a4b64a4c5242b1e453bd21023430814900 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 10 May 2024 11:15:42 +0000 Subject: [PATCH 1/2] Rebuild for ffmpeg 7 --- .ci_support/migrations/ffmpeg7.yaml | 9 +++++++++ recipe/meta.yaml | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 .ci_support/migrations/ffmpeg7.yaml diff --git a/.ci_support/migrations/ffmpeg7.yaml b/.ci_support/migrations/ffmpeg7.yaml new file mode 100644 index 0000000..ba8f6e9 --- /dev/null +++ b/.ci_support/migrations/ffmpeg7.yaml @@ -0,0 +1,9 @@ +__migrator: + build_number: 1 + commit_message: Rebuild for ffmpeg 7 + kind: version + migration_number: 1 +ffmpeg: +- '6' +- '7' +migrator_ts: 1714879707.672227 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 9ee6f95..98601f8 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -12,13 +12,14 @@ source: sha256: {{ sha256 }} build: - number: 9 + number: 10 script: "{{ PYTHON }} -m pip install --no-deps --ignore-installed . -vvv" requirements: build: - pkg-config # [not win] - {{ compiler('c') }} + - {{ stdlib("c") }} host: - python - setuptools From bed8aea5e09b0b8d71bbdab75c4d8d385cdd18b9 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 10 May 2024 11:17:54 +0000 Subject: [PATCH 2/2] MNT: Re-rendered with conda-build 24.3.0, conda-smithy 3.35.0, and conda-forge-pinning 2024.05.10.10.52.49 --- .azure-pipelines/azure-pipelines-linux.yml | 41 +++-- .azure-pipelines/azure-pipelines-osx.yml | 34 +++-- .azure-pipelines/azure-pipelines-win.yml | 84 ++++------- ...mpeg6numpy1.22python3.10.____cpython.yaml} | 12 +- ...fmpeg6numpy1.22python3.8.____cpython.yaml} | 12 +- ...fmpeg6numpy1.22python3.9.____cpython.yaml} | 12 +- ...mpeg6numpy1.23python3.11.____cpython.yaml} | 10 +- ...fmpeg7numpy1.22python3.10.____cpython.yaml | 33 ++++ ...ffmpeg7numpy1.22python3.8.____cpython.yaml | 33 ++++ ...ffmpeg7numpy1.22python3.9.____cpython.yaml | 33 ++++ ...fmpeg7numpy1.23python3.11.____cpython.yaml | 33 ++++ .ci_support/migrations/python311.yaml | 37 ----- ...mpeg6numpy1.22python3.10.____cpython.yaml} | 12 +- ...fmpeg6numpy1.22python3.8.____cpython.yaml} | 12 +- ...fmpeg6numpy1.22python3.9.____cpython.yaml} | 12 +- ...mpeg6numpy1.23python3.11.____cpython.yaml} | 10 +- ...fmpeg7numpy1.22python3.10.____cpython.yaml | 31 ++++ ...ffmpeg7numpy1.22python3.8.____cpython.yaml | 31 ++++ ...ffmpeg7numpy1.22python3.9.____cpython.yaml | 31 ++++ ...fmpeg7numpy1.23python3.11.____cpython.yaml | 31 ++++ ...mpeg6numpy1.22python3.10.____cpython.yaml} | 6 +- ...fmpeg6numpy1.22python3.8.____cpython.yaml} | 6 +- ...fmpeg6numpy1.22python3.9.____cpython.yaml} | 6 +- ...mpeg6numpy1.23python3.11.____cpython.yaml} | 4 +- ...fmpeg7numpy1.22python3.10.____cpython.yaml | 23 +++ ...ffmpeg7numpy1.22python3.8.____cpython.yaml | 23 +++ ...ffmpeg7numpy1.22python3.9.____cpython.yaml | 23 +++ ...fmpeg7numpy1.23python3.11.____cpython.yaml | 23 +++ .gitignore | 25 ++- .scripts/build_steps.sh | 16 +- .scripts/logging_utils.sh | 4 +- .scripts/run_docker_build.sh | 9 ++ .scripts/run_osx_build.sh | 21 ++- .scripts/run_win_build.bat | 120 +++++++++++++++ README.md | 142 ++++++++++++++---- azure-pipelines.yml | 4 +- build-locally.py | 5 +- 37 files changed, 810 insertions(+), 194 deletions(-) rename .ci_support/{linux_64_numpy1.21python3.10.____cpython.yaml => linux_64_ffmpeg6numpy1.22python3.10.____cpython.yaml} (76%) rename .ci_support/{linux_64_numpy1.20python3.8.____cpython.yaml => linux_64_ffmpeg6numpy1.22python3.8.____cpython.yaml} (76%) rename .ci_support/{linux_64_numpy1.20python3.9.____cpython.yaml => linux_64_ffmpeg6numpy1.22python3.9.____cpython.yaml} (76%) rename .ci_support/{linux_64_numpy1.23python3.11.____cpython.yaml => linux_64_ffmpeg6numpy1.23python3.11.____cpython.yaml} (78%) create mode 100644 .ci_support/linux_64_ffmpeg7numpy1.22python3.10.____cpython.yaml create mode 100644 .ci_support/linux_64_ffmpeg7numpy1.22python3.8.____cpython.yaml create mode 100644 .ci_support/linux_64_ffmpeg7numpy1.22python3.9.____cpython.yaml create mode 100644 .ci_support/linux_64_ffmpeg7numpy1.23python3.11.____cpython.yaml delete mode 100644 .ci_support/migrations/python311.yaml rename .ci_support/{osx_64_numpy1.21python3.10.____cpython.yaml => osx_64_ffmpeg6numpy1.22python3.10.____cpython.yaml} (77%) rename .ci_support/{osx_64_numpy1.20python3.8.____cpython.yaml => osx_64_ffmpeg6numpy1.22python3.8.____cpython.yaml} (77%) rename .ci_support/{osx_64_numpy1.20python3.9.____cpython.yaml => osx_64_ffmpeg6numpy1.22python3.9.____cpython.yaml} (77%) rename .ci_support/{osx_64_numpy1.23python3.11.____cpython.yaml => osx_64_ffmpeg6numpy1.23python3.11.____cpython.yaml} (79%) create mode 100644 .ci_support/osx_64_ffmpeg7numpy1.22python3.10.____cpython.yaml create mode 100644 .ci_support/osx_64_ffmpeg7numpy1.22python3.8.____cpython.yaml create mode 100644 .ci_support/osx_64_ffmpeg7numpy1.22python3.9.____cpython.yaml create mode 100644 .ci_support/osx_64_ffmpeg7numpy1.23python3.11.____cpython.yaml rename .ci_support/{win_64_numpy1.21python3.10.____cpython.yaml => win_64_ffmpeg6numpy1.22python3.10.____cpython.yaml} (89%) rename .ci_support/{win_64_numpy1.20python3.8.____cpython.yaml => win_64_ffmpeg6numpy1.22python3.8.____cpython.yaml} (89%) rename .ci_support/{win_64_numpy1.20python3.9.____cpython.yaml => win_64_ffmpeg6numpy1.22python3.9.____cpython.yaml} (89%) rename .ci_support/{win_64_numpy1.23python3.11.____cpython.yaml => win_64_ffmpeg6numpy1.23python3.11.____cpython.yaml} (92%) create mode 100644 .ci_support/win_64_ffmpeg7numpy1.22python3.10.____cpython.yaml create mode 100644 .ci_support/win_64_ffmpeg7numpy1.22python3.8.____cpython.yaml create mode 100644 .ci_support/win_64_ffmpeg7numpy1.22python3.9.____cpython.yaml create mode 100644 .ci_support/win_64_ffmpeg7numpy1.23python3.11.____cpython.yaml create mode 100755 .scripts/run_win_build.bat diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 7dc566e..65fbcf1 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,30 +8,42 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_numpy1.20python3.8.____cpython: - CONFIG: linux_64_numpy1.20python3.8.____cpython + linux_64_ffmpeg6numpy1.22python3.10.____cpython: + CONFIG: linux_64_ffmpeg6numpy1.22python3.10.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_numpy1.20python3.9.____cpython: - CONFIG: linux_64_numpy1.20python3.9.____cpython + linux_64_ffmpeg6numpy1.22python3.8.____cpython: + CONFIG: linux_64_ffmpeg6numpy1.22python3.8.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_numpy1.21python3.10.____cpython: - CONFIG: linux_64_numpy1.21python3.10.____cpython + linux_64_ffmpeg6numpy1.22python3.9.____cpython: + CONFIG: linux_64_ffmpeg6numpy1.22python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_numpy1.23python3.11.____cpython: - CONFIG: linux_64_numpy1.23python3.11.____cpython + linux_64_ffmpeg6numpy1.23python3.11.____cpython: + CONFIG: linux_64_ffmpeg6numpy1.23python3.11.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_64_ffmpeg7numpy1.22python3.10.____cpython: + CONFIG: linux_64_ffmpeg7numpy1.22python3.10.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_64_ffmpeg7numpy1.22python3.8.____cpython: + CONFIG: linux_64_ffmpeg7numpy1.22python3.8.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_64_ffmpeg7numpy1.22python3.9.____cpython: + CONFIG: linux_64_ffmpeg7numpy1.22python3.9.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_64_ffmpeg7numpy1.23python3.11.____cpython: + CONFIG: linux_64_ffmpeg7numpy1.23python3.11.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 timeoutInMinutes: 360 + variables: {} steps: - - script: | - rm -rf /opt/ghc - df -h - displayName: Manage disk space - # configure qemu binfmt-misc running. This allows us to run docker containers # embedded qemu-static - script: | @@ -42,6 +54,9 @@ jobs: - script: | export CI=azure + export flow_run_id=azure_$(Build.BuildNumber).$(System.JobAttempt) + export remote_url=$(Build.Repository.Uri) + export sha=$(Build.SourceVersion) export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME}) if [[ "${BUILD_REASON:-}" == "PullRequest" ]]; then diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 59db525..ae78d9b 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -5,27 +5,43 @@ jobs: - job: osx pool: - vmImage: macOS-11 + vmImage: macOS-12 strategy: matrix: - osx_64_numpy1.20python3.8.____cpython: - CONFIG: osx_64_numpy1.20python3.8.____cpython + osx_64_ffmpeg6numpy1.22python3.10.____cpython: + CONFIG: osx_64_ffmpeg6numpy1.22python3.10.____cpython UPLOAD_PACKAGES: 'True' - osx_64_numpy1.20python3.9.____cpython: - CONFIG: osx_64_numpy1.20python3.9.____cpython + osx_64_ffmpeg6numpy1.22python3.8.____cpython: + CONFIG: osx_64_ffmpeg6numpy1.22python3.8.____cpython UPLOAD_PACKAGES: 'True' - osx_64_numpy1.21python3.10.____cpython: - CONFIG: osx_64_numpy1.21python3.10.____cpython + osx_64_ffmpeg6numpy1.22python3.9.____cpython: + CONFIG: osx_64_ffmpeg6numpy1.22python3.9.____cpython UPLOAD_PACKAGES: 'True' - osx_64_numpy1.23python3.11.____cpython: - CONFIG: osx_64_numpy1.23python3.11.____cpython + osx_64_ffmpeg6numpy1.23python3.11.____cpython: + CONFIG: osx_64_ffmpeg6numpy1.23python3.11.____cpython + UPLOAD_PACKAGES: 'True' + osx_64_ffmpeg7numpy1.22python3.10.____cpython: + CONFIG: osx_64_ffmpeg7numpy1.22python3.10.____cpython + UPLOAD_PACKAGES: 'True' + osx_64_ffmpeg7numpy1.22python3.8.____cpython: + CONFIG: osx_64_ffmpeg7numpy1.22python3.8.____cpython + UPLOAD_PACKAGES: 'True' + osx_64_ffmpeg7numpy1.22python3.9.____cpython: + CONFIG: osx_64_ffmpeg7numpy1.22python3.9.____cpython + UPLOAD_PACKAGES: 'True' + osx_64_ffmpeg7numpy1.23python3.11.____cpython: + CONFIG: osx_64_ffmpeg7numpy1.23python3.11.____cpython UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 + variables: {} steps: # TODO: Fast finish on azure pipelines? - script: | export CI=azure + export flow_run_id=azure_$(Build.BuildNumber).$(System.JobAttempt) + export remote_url=$(Build.Repository.Uri) + export sha=$(Build.SourceVersion) export OSX_FORCE_SDK_DOWNLOAD="1" export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME}) diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 5c2447e..a5348ae 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -5,26 +5,40 @@ jobs: - job: win pool: - vmImage: windows-2019 + vmImage: windows-2022 strategy: matrix: - win_64_numpy1.20python3.8.____cpython: - CONFIG: win_64_numpy1.20python3.8.____cpython + win_64_ffmpeg6numpy1.22python3.10.____cpython: + CONFIG: win_64_ffmpeg6numpy1.22python3.10.____cpython UPLOAD_PACKAGES: 'True' - win_64_numpy1.20python3.9.____cpython: - CONFIG: win_64_numpy1.20python3.9.____cpython + win_64_ffmpeg6numpy1.22python3.8.____cpython: + CONFIG: win_64_ffmpeg6numpy1.22python3.8.____cpython UPLOAD_PACKAGES: 'True' - win_64_numpy1.21python3.10.____cpython: - CONFIG: win_64_numpy1.21python3.10.____cpython + win_64_ffmpeg6numpy1.22python3.9.____cpython: + CONFIG: win_64_ffmpeg6numpy1.22python3.9.____cpython UPLOAD_PACKAGES: 'True' - win_64_numpy1.23python3.11.____cpython: - CONFIG: win_64_numpy1.23python3.11.____cpython + win_64_ffmpeg6numpy1.23python3.11.____cpython: + CONFIG: win_64_ffmpeg6numpy1.23python3.11.____cpython + UPLOAD_PACKAGES: 'True' + win_64_ffmpeg7numpy1.22python3.10.____cpython: + CONFIG: win_64_ffmpeg7numpy1.22python3.10.____cpython + UPLOAD_PACKAGES: 'True' + win_64_ffmpeg7numpy1.22python3.8.____cpython: + CONFIG: win_64_ffmpeg7numpy1.22python3.8.____cpython + UPLOAD_PACKAGES: 'True' + win_64_ffmpeg7numpy1.22python3.9.____cpython: + CONFIG: win_64_ffmpeg7numpy1.22python3.9.____cpython + UPLOAD_PACKAGES: 'True' + win_64_ffmpeg7numpy1.23python3.11.____cpython: + CONFIG: win_64_ffmpeg7numpy1.23python3.11.____cpython UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: CONDA_BLD_PATH: D:\\bld\\ + UPLOAD_TEMP: D:\\tmp steps: + - task: PythonScript@0 displayName: 'Download Miniforge' inputs: @@ -43,49 +57,17 @@ jobs: displayName: Add conda to PATH - script: | - call activate base - mamba.exe install "python=3.9" conda-build conda pip boa conda-forge-ci-setup=3 "py-lief<0.12" -c conda-forge --strict-channel-priority --yes - displayName: Install conda-build - - - script: set PYTHONUNBUFFERED=1 - displayName: Set PYTHONUNBUFFERED - - # Configure the VM - - script: | - call activate base - setup_conda_rc .\ ".\recipe" .\.ci_support\%CONFIG%.yaml - displayName: conda-forge CI setup - - # Configure the VM. - - script: | - set "CI=azure" - call activate base - run_conda_forge_build_setup - displayName: conda-forge build setup - - - script: | - call activate base - if EXIST LICENSE.txt ( - copy LICENSE.txt "recipe\\recipe-scripts-license.txt" - ) - conda.exe mambabuild "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables - displayName: Build recipe + call ".scripts\run_win_build.bat" + displayName: Run Windows build env: PYTHONUNBUFFERED: 1 - - script: | - set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%" - call activate base - validate_recipe_outputs "%FEEDSTOCK_NAME%" - displayName: Validate Recipe Outputs - - - script: | - set "GIT_BRANCH=%BUILD_SOURCEBRANCHNAME%" - set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%" - call activate base - upload_package --validate --feedstock-name="%FEEDSTOCK_NAME%" .\ ".\recipe" .ci_support\%CONFIG%.yaml - displayName: Upload package - env: + CONFIG: $(CONFIG) + CI: azure + flow_run_id: azure_$(Build.BuildNumber).$(System.JobAttempt) + remote_url: $(Build.Repository.Uri) + sha: $(Build.SourceVersion) + UPLOAD_PACKAGES: $(UPLOAD_PACKAGES) + UPLOAD_TEMP: $(UPLOAD_TEMP) BINSTAR_TOKEN: $(BINSTAR_TOKEN) FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) - STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) - condition: and(succeeded(), not(eq(variables['UPLOAD_PACKAGES'], 'False')), not(eq(variables['Build.Reason'], 'PullRequest'))) \ No newline at end of file + STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) \ No newline at end of file diff --git a/.ci_support/linux_64_numpy1.21python3.10.____cpython.yaml b/.ci_support/linux_64_ffmpeg6numpy1.22python3.10.____cpython.yaml similarity index 76% rename from .ci_support/linux_64_numpy1.21python3.10.____cpython.yaml rename to .ci_support/linux_64_ffmpeg6numpy1.22python3.10.____cpython.yaml index df68333..6be6c9c 100644 --- a/.ci_support/linux_64_numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/linux_64_ffmpeg6numpy1.22python3.10.____cpython.yaml @@ -1,7 +1,11 @@ c_compiler: - gcc c_compiler_version: -- '10' +- '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.12' cdt_name: - cos6 channel_sources: @@ -11,9 +15,9 @@ channel_targets: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 ffmpeg: -- '4.4' +- '6' numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -23,5 +27,7 @@ python: target_platform: - linux-64 zip_keys: +- - c_stdlib_version + - cdt_name - - python - numpy diff --git a/.ci_support/linux_64_numpy1.20python3.8.____cpython.yaml b/.ci_support/linux_64_ffmpeg6numpy1.22python3.8.____cpython.yaml similarity index 76% rename from .ci_support/linux_64_numpy1.20python3.8.____cpython.yaml rename to .ci_support/linux_64_ffmpeg6numpy1.22python3.8.____cpython.yaml index 7caa335..061bd14 100644 --- a/.ci_support/linux_64_numpy1.20python3.8.____cpython.yaml +++ b/.ci_support/linux_64_ffmpeg6numpy1.22python3.8.____cpython.yaml @@ -1,7 +1,11 @@ c_compiler: - gcc c_compiler_version: -- '10' +- '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.12' cdt_name: - cos6 channel_sources: @@ -11,9 +15,9 @@ channel_targets: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 ffmpeg: -- '4.4' +- '6' numpy: -- '1.20' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -23,5 +27,7 @@ python: target_platform: - linux-64 zip_keys: +- - c_stdlib_version + - cdt_name - - python - numpy diff --git a/.ci_support/linux_64_numpy1.20python3.9.____cpython.yaml b/.ci_support/linux_64_ffmpeg6numpy1.22python3.9.____cpython.yaml similarity index 76% rename from .ci_support/linux_64_numpy1.20python3.9.____cpython.yaml rename to .ci_support/linux_64_ffmpeg6numpy1.22python3.9.____cpython.yaml index 2d7af1b..bcdb638 100644 --- a/.ci_support/linux_64_numpy1.20python3.9.____cpython.yaml +++ b/.ci_support/linux_64_ffmpeg6numpy1.22python3.9.____cpython.yaml @@ -1,7 +1,11 @@ c_compiler: - gcc c_compiler_version: -- '10' +- '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.12' cdt_name: - cos6 channel_sources: @@ -11,9 +15,9 @@ channel_targets: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 ffmpeg: -- '4.4' +- '6' numpy: -- '1.20' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -23,5 +27,7 @@ python: target_platform: - linux-64 zip_keys: +- - c_stdlib_version + - cdt_name - - python - numpy diff --git a/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_64_ffmpeg6numpy1.23python3.11.____cpython.yaml similarity index 78% rename from .ci_support/linux_64_numpy1.23python3.11.____cpython.yaml rename to .ci_support/linux_64_ffmpeg6numpy1.23python3.11.____cpython.yaml index e71c17e..a5e5b83 100644 --- a/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_64_ffmpeg6numpy1.23python3.11.____cpython.yaml @@ -1,7 +1,11 @@ c_compiler: - gcc c_compiler_version: -- '10' +- '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.12' cdt_name: - cos6 channel_sources: @@ -11,7 +15,7 @@ channel_targets: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 ffmpeg: -- '4.4' +- '6' numpy: - '1.23' pin_run_as_build: @@ -23,5 +27,7 @@ python: target_platform: - linux-64 zip_keys: +- - c_stdlib_version + - cdt_name - - python - numpy diff --git a/.ci_support/linux_64_ffmpeg7numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_64_ffmpeg7numpy1.22python3.10.____cpython.yaml new file mode 100644 index 0000000..fcd8cc8 --- /dev/null +++ b/.ci_support/linux_64_ffmpeg7numpy1.22python3.10.____cpython.yaml @@ -0,0 +1,33 @@ +c_compiler: +- gcc +c_compiler_version: +- '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.12' +cdt_name: +- cos6 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +ffmpeg: +- '7' +numpy: +- '1.22' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.10.* *_cpython +target_platform: +- linux-64 +zip_keys: +- - c_stdlib_version + - cdt_name +- - python + - numpy diff --git a/.ci_support/linux_64_ffmpeg7numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_64_ffmpeg7numpy1.22python3.8.____cpython.yaml new file mode 100644 index 0000000..2e06e9a --- /dev/null +++ b/.ci_support/linux_64_ffmpeg7numpy1.22python3.8.____cpython.yaml @@ -0,0 +1,33 @@ +c_compiler: +- gcc +c_compiler_version: +- '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.12' +cdt_name: +- cos6 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +ffmpeg: +- '7' +numpy: +- '1.22' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.8.* *_cpython +target_platform: +- linux-64 +zip_keys: +- - c_stdlib_version + - cdt_name +- - python + - numpy diff --git a/.ci_support/linux_64_ffmpeg7numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_64_ffmpeg7numpy1.22python3.9.____cpython.yaml new file mode 100644 index 0000000..2d65d60 --- /dev/null +++ b/.ci_support/linux_64_ffmpeg7numpy1.22python3.9.____cpython.yaml @@ -0,0 +1,33 @@ +c_compiler: +- gcc +c_compiler_version: +- '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.12' +cdt_name: +- cos6 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +ffmpeg: +- '7' +numpy: +- '1.22' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.9.* *_cpython +target_platform: +- linux-64 +zip_keys: +- - c_stdlib_version + - cdt_name +- - python + - numpy diff --git a/.ci_support/linux_64_ffmpeg7numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_64_ffmpeg7numpy1.23python3.11.____cpython.yaml new file mode 100644 index 0000000..cc50567 --- /dev/null +++ b/.ci_support/linux_64_ffmpeg7numpy1.23python3.11.____cpython.yaml @@ -0,0 +1,33 @@ +c_compiler: +- gcc +c_compiler_version: +- '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.12' +cdt_name: +- cos6 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +ffmpeg: +- '7' +numpy: +- '1.23' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.11.* *_cpython +target_platform: +- linux-64 +zip_keys: +- - c_stdlib_version + - cdt_name +- - python + - numpy diff --git a/.ci_support/migrations/python311.yaml b/.ci_support/migrations/python311.yaml deleted file mode 100644 index 2715ab2..0000000 --- a/.ci_support/migrations/python311.yaml +++ /dev/null @@ -1,37 +0,0 @@ -migrator_ts: 1666686085 -__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.11.* *_cpython # new entry - - 3.6.* *_73_pypy - - 3.7.* *_73_pypy - - 3.8.* *_73_pypy - - 3.9.* *_73_pypy - paused: false - longterm: True - pr_limit: 30 - max_solver_attempts: 10 # this will make the bot retry "not solvable" stuff 10 times - exclude: - # this shouldn't attempt to modify the python feedstocks - - python - - pypy3.6 - - pypy-meta - - cross-python - - python_abi - exclude_pinned_pkgs: false - -python: - - 3.11.* *_cpython -# additional entries to add for zip_keys -numpy: - - 1.23 -python_impl: - - cpython diff --git a/.ci_support/osx_64_numpy1.21python3.10.____cpython.yaml b/.ci_support/osx_64_ffmpeg6numpy1.22python3.10.____cpython.yaml similarity index 77% rename from .ci_support/osx_64_numpy1.21python3.10.____cpython.yaml rename to .ci_support/osx_64_ffmpeg6numpy1.22python3.10.____cpython.yaml index d812c1f..b7fe064 100644 --- a/.ci_support/osx_64_numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/osx_64_ffmpeg6numpy1.22python3.10.____cpython.yaml @@ -1,19 +1,23 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' +- '10.13' c_compiler: - clang c_compiler_version: -- '14' +- '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' channel_sources: - conda-forge channel_targets: - conda-forge main ffmpeg: -- '4.4' +- '6' macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_64_numpy1.20python3.8.____cpython.yaml b/.ci_support/osx_64_ffmpeg6numpy1.22python3.8.____cpython.yaml similarity index 77% rename from .ci_support/osx_64_numpy1.20python3.8.____cpython.yaml rename to .ci_support/osx_64_ffmpeg6numpy1.22python3.8.____cpython.yaml index 5c92af1..69a1139 100644 --- a/.ci_support/osx_64_numpy1.20python3.8.____cpython.yaml +++ b/.ci_support/osx_64_ffmpeg6numpy1.22python3.8.____cpython.yaml @@ -1,19 +1,23 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' +- '10.13' c_compiler: - clang c_compiler_version: -- '14' +- '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' channel_sources: - conda-forge channel_targets: - conda-forge main ffmpeg: -- '4.4' +- '6' macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.20' +- '1.22' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_64_numpy1.20python3.9.____cpython.yaml b/.ci_support/osx_64_ffmpeg6numpy1.22python3.9.____cpython.yaml similarity index 77% rename from .ci_support/osx_64_numpy1.20python3.9.____cpython.yaml rename to .ci_support/osx_64_ffmpeg6numpy1.22python3.9.____cpython.yaml index 37a34d0..6b573db 100644 --- a/.ci_support/osx_64_numpy1.20python3.9.____cpython.yaml +++ b/.ci_support/osx_64_ffmpeg6numpy1.22python3.9.____cpython.yaml @@ -1,19 +1,23 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' +- '10.13' c_compiler: - clang c_compiler_version: -- '14' +- '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' channel_sources: - conda-forge channel_targets: - conda-forge main ffmpeg: -- '4.4' +- '6' macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.20' +- '1.22' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_64_ffmpeg6numpy1.23python3.11.____cpython.yaml similarity index 79% rename from .ci_support/osx_64_numpy1.23python3.11.____cpython.yaml rename to .ci_support/osx_64_ffmpeg6numpy1.23python3.11.____cpython.yaml index 96b6510..63ffff2 100644 --- a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_64_ffmpeg6numpy1.23python3.11.____cpython.yaml @@ -1,15 +1,19 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' +- '10.13' c_compiler: - clang c_compiler_version: -- '14' +- '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' channel_sources: - conda-forge channel_targets: - conda-forge main ffmpeg: -- '4.4' +- '6' macos_machine: - x86_64-apple-darwin13.4.0 numpy: diff --git a/.ci_support/osx_64_ffmpeg7numpy1.22python3.10.____cpython.yaml b/.ci_support/osx_64_ffmpeg7numpy1.22python3.10.____cpython.yaml new file mode 100644 index 0000000..81dd8db --- /dev/null +++ b/.ci_support/osx_64_ffmpeg7numpy1.22python3.10.____cpython.yaml @@ -0,0 +1,31 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.13' +c_compiler: +- clang +c_compiler_version: +- '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +ffmpeg: +- '7' +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.10.* *_cpython +target_platform: +- osx-64 +zip_keys: +- - python + - numpy diff --git a/.ci_support/osx_64_ffmpeg7numpy1.22python3.8.____cpython.yaml b/.ci_support/osx_64_ffmpeg7numpy1.22python3.8.____cpython.yaml new file mode 100644 index 0000000..1869418 --- /dev/null +++ b/.ci_support/osx_64_ffmpeg7numpy1.22python3.8.____cpython.yaml @@ -0,0 +1,31 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.13' +c_compiler: +- clang +c_compiler_version: +- '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +ffmpeg: +- '7' +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.8.* *_cpython +target_platform: +- osx-64 +zip_keys: +- - python + - numpy diff --git a/.ci_support/osx_64_ffmpeg7numpy1.22python3.9.____cpython.yaml b/.ci_support/osx_64_ffmpeg7numpy1.22python3.9.____cpython.yaml new file mode 100644 index 0000000..b9fc36d --- /dev/null +++ b/.ci_support/osx_64_ffmpeg7numpy1.22python3.9.____cpython.yaml @@ -0,0 +1,31 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.13' +c_compiler: +- clang +c_compiler_version: +- '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +ffmpeg: +- '7' +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.* *_cpython +target_platform: +- osx-64 +zip_keys: +- - python + - numpy diff --git a/.ci_support/osx_64_ffmpeg7numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_64_ffmpeg7numpy1.23python3.11.____cpython.yaml new file mode 100644 index 0000000..b83ad20 --- /dev/null +++ b/.ci_support/osx_64_ffmpeg7numpy1.23python3.11.____cpython.yaml @@ -0,0 +1,31 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.13' +c_compiler: +- clang +c_compiler_version: +- '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +ffmpeg: +- '7' +macos_machine: +- x86_64-apple-darwin13.4.0 +numpy: +- '1.23' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.11.* *_cpython +target_platform: +- osx-64 +zip_keys: +- - python + - numpy diff --git a/.ci_support/win_64_numpy1.21python3.10.____cpython.yaml b/.ci_support/win_64_ffmpeg6numpy1.22python3.10.____cpython.yaml similarity index 89% rename from .ci_support/win_64_numpy1.21python3.10.____cpython.yaml rename to .ci_support/win_64_ffmpeg6numpy1.22python3.10.____cpython.yaml index 7ea0ad8..7cbfb48 100644 --- a/.ci_support/win_64_numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/win_64_ffmpeg6numpy1.22python3.10.____cpython.yaml @@ -1,13 +1,15 @@ c_compiler: - vs2019 +c_stdlib: +- vs channel_sources: - conda-forge channel_targets: - conda-forge main ffmpeg: -- '4.4' +- '6' numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/win_64_numpy1.20python3.8.____cpython.yaml b/.ci_support/win_64_ffmpeg6numpy1.22python3.8.____cpython.yaml similarity index 89% rename from .ci_support/win_64_numpy1.20python3.8.____cpython.yaml rename to .ci_support/win_64_ffmpeg6numpy1.22python3.8.____cpython.yaml index fff6fc2..a30770e 100644 --- a/.ci_support/win_64_numpy1.20python3.8.____cpython.yaml +++ b/.ci_support/win_64_ffmpeg6numpy1.22python3.8.____cpython.yaml @@ -1,13 +1,15 @@ c_compiler: - vs2019 +c_stdlib: +- vs channel_sources: - conda-forge channel_targets: - conda-forge main ffmpeg: -- '4.4' +- '6' numpy: -- '1.20' +- '1.22' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/win_64_numpy1.20python3.9.____cpython.yaml b/.ci_support/win_64_ffmpeg6numpy1.22python3.9.____cpython.yaml similarity index 89% rename from .ci_support/win_64_numpy1.20python3.9.____cpython.yaml rename to .ci_support/win_64_ffmpeg6numpy1.22python3.9.____cpython.yaml index 1fef6e8..3e21a88 100644 --- a/.ci_support/win_64_numpy1.20python3.9.____cpython.yaml +++ b/.ci_support/win_64_ffmpeg6numpy1.22python3.9.____cpython.yaml @@ -1,13 +1,15 @@ c_compiler: - vs2019 +c_stdlib: +- vs channel_sources: - conda-forge channel_targets: - conda-forge main ffmpeg: -- '4.4' +- '6' numpy: -- '1.20' +- '1.22' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/win_64_ffmpeg6numpy1.23python3.11.____cpython.yaml similarity index 92% rename from .ci_support/win_64_numpy1.23python3.11.____cpython.yaml rename to .ci_support/win_64_ffmpeg6numpy1.23python3.11.____cpython.yaml index a11d940..8778a54 100644 --- a/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/win_64_ffmpeg6numpy1.23python3.11.____cpython.yaml @@ -1,11 +1,13 @@ c_compiler: - vs2019 +c_stdlib: +- vs channel_sources: - conda-forge channel_targets: - conda-forge main ffmpeg: -- '4.4' +- '6' numpy: - '1.23' pin_run_as_build: diff --git a/.ci_support/win_64_ffmpeg7numpy1.22python3.10.____cpython.yaml b/.ci_support/win_64_ffmpeg7numpy1.22python3.10.____cpython.yaml new file mode 100644 index 0000000..0082c3e --- /dev/null +++ b/.ci_support/win_64_ffmpeg7numpy1.22python3.10.____cpython.yaml @@ -0,0 +1,23 @@ +c_compiler: +- vs2019 +c_stdlib: +- vs +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +ffmpeg: +- '7' +numpy: +- '1.22' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.10.* *_cpython +target_platform: +- win-64 +zip_keys: +- - python + - numpy diff --git a/.ci_support/win_64_ffmpeg7numpy1.22python3.8.____cpython.yaml b/.ci_support/win_64_ffmpeg7numpy1.22python3.8.____cpython.yaml new file mode 100644 index 0000000..c42d4fd --- /dev/null +++ b/.ci_support/win_64_ffmpeg7numpy1.22python3.8.____cpython.yaml @@ -0,0 +1,23 @@ +c_compiler: +- vs2019 +c_stdlib: +- vs +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +ffmpeg: +- '7' +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_ffmpeg7numpy1.22python3.9.____cpython.yaml b/.ci_support/win_64_ffmpeg7numpy1.22python3.9.____cpython.yaml new file mode 100644 index 0000000..da0f3ac --- /dev/null +++ b/.ci_support/win_64_ffmpeg7numpy1.22python3.9.____cpython.yaml @@ -0,0 +1,23 @@ +c_compiler: +- vs2019 +c_stdlib: +- vs +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +ffmpeg: +- '7' +numpy: +- '1.22' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.9.* *_cpython +target_platform: +- win-64 +zip_keys: +- - python + - numpy diff --git a/.ci_support/win_64_ffmpeg7numpy1.23python3.11.____cpython.yaml b/.ci_support/win_64_ffmpeg7numpy1.23python3.11.____cpython.yaml new file mode 100644 index 0000000..46c6843 --- /dev/null +++ b/.ci_support/win_64_ffmpeg7numpy1.23python3.11.____cpython.yaml @@ -0,0 +1,23 @@ +c_compiler: +- vs2019 +c_stdlib: +- vs +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +ffmpeg: +- '7' +numpy: +- '1.23' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.11.* *_cpython +target_platform: +- win-64 +zip_keys: +- - python + - numpy diff --git a/.gitignore b/.gitignore index c89ecb7..179afe5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,24 @@ -*.pyc +# User content belongs under recipe/. +# Feedstock configuration goes in `conda-forge.yml` +# Everything else is managed by the conda-smithy rerender process. +# Please do not modify + +# Ignore all files and folders in root +* +!/conda-forge.yml + +# Don't ignore any files/folders if the parent folder is 'un-ignored' +# This also avoids warnings when adding an already-checked file with an ignored parent. +!/**/ +# Don't ignore any files/folders recursively in the following folders +!/recipe/** +!/.ci_support/** -build_artifacts +# Since we ignore files/folders recursively, any folders inside +# build_artifacts gets ignored which trips some build systems. +# To avoid that we 'un-ignore' all files/folders recursively +# and only ignore the root build_artifacts folder. +!/build_artifacts/** +/build_artifacts + +*.pyc diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 71a4242..2f3df6c 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -28,14 +28,15 @@ conda-build: pkgs_dirs: - ${FEEDSTOCK_ROOT}/build_artifacts/pkg_cache - /opt/conda/pkgs +solver: libmamba CONDARC +export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 - -mamba install --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" -mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" +mamba install --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" +mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" @@ -64,9 +65,10 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then # Drop into an interactive shell /bin/bash else - conda mambabuild "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ + conda-build "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ - --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" + --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" \ + --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" diff --git a/.scripts/logging_utils.sh b/.scripts/logging_utils.sh index 57bc95c..aff009f 100644 --- a/.scripts/logging_utils.sh +++ b/.scripts/logging_utils.sh @@ -12,7 +12,7 @@ function startgroup { echo "##[group]$1";; travis ) echo "$1" - echo -en 'travis_fold:start:'"${1// /}"'\\r';; + echo -en 'travis_fold:start:'"${1// /}"'\r';; github_actions ) echo "::group::$1";; * ) @@ -28,7 +28,7 @@ function endgroup { azure ) echo "##[endgroup]";; travis ) - echo -en 'travis_fold:end:'"${1// /}"'\\r';; + echo -en 'travis_fold:end:'"${1// /}"'\r';; github_actions ) echo "::endgroup::";; esac diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh index 9236239..00f377a 100755 --- a/.scripts/run_docker_build.sh +++ b/.scripts/run_docker_build.sh @@ -21,6 +21,12 @@ if [ -z ${FEEDSTOCK_NAME} ]; then export FEEDSTOCK_NAME=$(basename ${FEEDSTOCK_ROOT}) fi +if [[ "${sha:-}" == "" ]]; then + pushd "${FEEDSTOCK_ROOT}" + sha=$(git rev-parse HEAD) + popd +fi + docker info # In order for the conda-build process in the container to write to the mounted @@ -91,6 +97,9 @@ docker run ${DOCKER_RUN_ARGS} \ -e CPU_COUNT \ -e BUILD_WITH_CONDA_DEBUG \ -e BUILD_OUTPUT_ID \ + -e flow_run_id \ + -e remote_url \ + -e sha \ -e BINSTAR_TOKEN \ -e FEEDSTOCK_TOKEN \ -e STAGING_BINSTAR_TOKEN \ diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index caa788e..165fa51 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -22,11 +22,13 @@ bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} source ${MINIFORGE_HOME}/etc/profile.d/conda.sh conda activate base +export CONDA_SOLVER="libmamba" +export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 -mamba install --update-specs --quiet --yes --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" -mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" +mamba install --update-specs --quiet --yes --channel conda-forge --strict-channel-priority \ + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" +mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" @@ -45,6 +47,10 @@ else echo -e "\n\nNot mangling homebrew as we are not running in CI" fi +if [[ "${sha:-}" == "" ]]; then + sha=$(git rev-parse HEAD) +fi + echo -e "\n\nRunning the build setup script." source run_conda_forge_build_setup @@ -55,7 +61,6 @@ source run_conda_forge_build_setup echo -e "\n\nMaking the build clobber file" make_build_number ./ ./recipe ./.ci_support/${CONFIG}.yaml - if [[ -f LICENSE.txt ]]; then cp LICENSE.txt "recipe/recipe-scripts-license.txt" fi @@ -71,9 +76,11 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then # Drop into an interactive shell /bin/bash else - conda mambabuild ./recipe -m ./.ci_support/${CONFIG}.yaml \ + + conda-build ./recipe -m ./.ci_support/${CONFIG}.yaml \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ - --clobber-file ./.ci_support/clobber_${CONFIG}.yaml + --clobber-file ./.ci_support/clobber_${CONFIG}.yaml \ + --extra-meta flow_run_id="$flow_run_id" remote_url="$remote_url" sha="$sha" ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat new file mode 100755 index 0000000..7491838 --- /dev/null +++ b/.scripts/run_win_build.bat @@ -0,0 +1,120 @@ +:: PLEASE NOTE: This script has been automatically generated by conda-smithy. Any changes here +:: will be lost next time ``conda smithy rerender`` is run. If you would like to make permanent +:: changes to this script, consider a proposal to conda-smithy so that other feedstocks can also +:: benefit from the improvement. + +:: Note: we assume a Miniforge installation is available + +:: INPUTS (required environment variables) +:: CONFIG: name of the .ci_support/*.yaml file for this job +:: CI: azure, github_actions, or unset +:: UPLOAD_PACKAGES: true or false +:: UPLOAD_ON_BRANCH: true or false + +setlocal enableextensions enabledelayedexpansion + +call :start_group "Configuring conda" + +:: Activate the base conda environment +call activate base +:: Configure the solver +set "CONDA_SOLVER=libmamba" +if !errorlevel! neq 0 exit /b !errorlevel! +set "CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1" + +:: Provision the necessary dependencies to build the recipe later +echo Installing dependencies +mamba.exe install "python=3.10" pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" -c conda-forge --strict-channel-priority --yes +if !errorlevel! neq 0 exit /b !errorlevel! + +:: Set basic configuration +echo Setting up configuration +setup_conda_rc .\ ".\recipe" .\.ci_support\%CONFIG%.yaml +if !errorlevel! neq 0 exit /b !errorlevel! +echo Running build setup +CALL run_conda_forge_build_setup + + +if !errorlevel! neq 0 exit /b !errorlevel! + +if EXIST LICENSE.txt ( + echo Copying feedstock license + copy LICENSE.txt "recipe\\recipe-scripts-license.txt" +) + +if NOT [%flow_run_id%] == [] ( + set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --extra-meta flow_run_id=%flow_run_id% remote_url=%remote_url% sha=%sha%" +) + +call :end_group + +:: Build the recipe +echo Building recipe +conda-build.exe "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% +if !errorlevel! neq 0 exit /b !errorlevel! + +:: Prepare some environment variables for the upload step +if /i "%CI%" == "github_actions" ( + set "FEEDSTOCK_NAME=%GITHUB_REPOSITORY:*/=%" + set "GIT_BRANCH=%GITHUB_REF:refs/heads/=%" + if /i "%GITHUB_EVENT_NAME%" == "pull_request" ( + set "IS_PR_BUILD=True" + ) else ( + set "IS_PR_BUILD=False" + ) + set "TEMP=%RUNNER_TEMP%" +) +if /i "%CI%" == "azure" ( + set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%" + set "GIT_BRANCH=%BUILD_SOURCEBRANCHNAME%" + if /i "%BUILD_REASON%" == "PullRequest" ( + set "IS_PR_BUILD=True" + ) else ( + set "IS_PR_BUILD=False" + ) + set "TEMP=%UPLOAD_TEMP%" +) + +:: Validate +call :start_group "Validating outputs" +validate_recipe_outputs "%FEEDSTOCK_NAME%" +if !errorlevel! neq 0 exit /b !errorlevel! +call :end_group + +if /i "%UPLOAD_PACKAGES%" == "true" ( + if /i "%IS_PR_BUILD%" == "false" ( + call :start_group "Uploading packages" + if not exist "%TEMP%\" md "%TEMP%" + set "TMP=%TEMP%" + upload_package --validate --feedstock-name="%FEEDSTOCK_NAME%" .\ ".\recipe" .ci_support\%CONFIG%.yaml + if !errorlevel! neq 0 exit /b !errorlevel! + call :end_group + ) +) + +exit + +:: Logging subroutines + +:start_group +if /i "%CI%" == "github_actions" ( + echo ::group::%~1 + exit /b +) +if /i "%CI%" == "azure" ( + echo ##[group]%~1 + exit /b +) +echo %~1 +exit /b + +:end_group +if /i "%CI%" == "github_actions" ( + echo ::endgroup:: + exit /b +) +if /i "%CI%" == "azure" ( + echo ##[endgroup] + exit /b +) +exit /b \ No newline at end of file diff --git a/README.md b/README.md index 90a1986..75fee08 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@ -About aubio -=========== +About aubio-feedstock +===================== + +Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/aubio-feedstock/blob/main/LICENSE.txt) Home: https://aubio.org Package license: GPL-3.0-or-later -Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/aubio-feedstock/blob/main/LICENSE.txt) - Summary: tools for audio and music analysis and transformation Development: https://github.com/aubio/aubio/ @@ -36,87 +36,171 @@ Current build status - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + @@ -200,7 +284,7 @@ available continuous integration services. Thanks to the awesome service provide [CircleCI](https://circleci.com/), [AppVeyor](https://www.appveyor.com/), [Drone](https://cloud.drone.io/welcome), and [TravisCI](https://travis-ci.com/) it is possible to build and upload installable packages to the -[conda-forge](https://anaconda.org/conda-forge) [Anaconda-Cloud](https://anaconda.org/) +[conda-forge](https://anaconda.org/conda-forge) [anaconda.org](https://anaconda.org/) channel for Linux, Windows and OSX respectively. To manage the continuous integration and simplify feedstock maintenance diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 6b346f5..e5306da 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -4,5 +4,5 @@ jobs: - template: ./.azure-pipelines/azure-pipelines-linux.yml - - template: ./.azure-pipelines/azure-pipelines-win.yml - - template: ./.azure-pipelines/azure-pipelines-osx.yml \ No newline at end of file + - template: ./.azure-pipelines/azure-pipelines-osx.yml + - template: ./.azure-pipelines/azure-pipelines-win.yml \ No newline at end of file diff --git a/build-locally.py b/build-locally.py index 3f4b7a7..e0d408d 100755 --- a/build-locally.py +++ b/build-locally.py @@ -64,8 +64,9 @@ def verify_config(ns): elif ns.config.startswith("osx"): if "OSX_SDK_DIR" not in os.environ: raise RuntimeError( - "Need OSX_SDK_DIR env variable set. Run 'export OSX_SDK_DIR=SDKs' " - "to download the SDK automatically to 'SDKs/MacOSX.sdk'. " + "Need OSX_SDK_DIR env variable set. Run 'export OSX_SDK_DIR=$PWD/SDKs' " + "to download the SDK automatically to '$PWD/SDKs/MacOSX.sdk'. " + "Note: OSX_SDK_DIR must be set to an absolute path. " "Setting this variable implies agreement to the licensing terms of the SDK by Apple." )
VariantStatus
linux_64_numpy1.20python3.8.____cpythonlinux_64_ffmpeg6numpy1.22python3.10.____cpython + + variant + +
linux_64_ffmpeg6numpy1.22python3.8.____cpython + + variant + +
linux_64_ffmpeg6numpy1.22python3.9.____cpython + + variant + +
linux_64_ffmpeg6numpy1.23python3.11.____cpython + + variant + +
linux_64_ffmpeg7numpy1.22python3.10.____cpython + + variant + +
linux_64_ffmpeg7numpy1.22python3.8.____cpython + + variant + +
linux_64_ffmpeg7numpy1.22python3.9.____cpython + + variant + +
linux_64_ffmpeg7numpy1.23python3.11.____cpython + + variant + +
osx_64_ffmpeg6numpy1.22python3.10.____cpython + + variant + +
osx_64_ffmpeg6numpy1.22python3.8.____cpython + + variant + +
osx_64_ffmpeg6numpy1.22python3.9.____cpython + + variant + +
osx_64_ffmpeg6numpy1.23python3.11.____cpython + + variant + +
osx_64_ffmpeg7numpy1.22python3.10.____cpython - variant + variant
linux_64_numpy1.20python3.9.____cpythonosx_64_ffmpeg7numpy1.22python3.8.____cpython - variant + variant
linux_64_numpy1.21python3.10.____cpythonosx_64_ffmpeg7numpy1.22python3.9.____cpython - variant + variant
linux_64_numpy1.23python3.11.____cpythonosx_64_ffmpeg7numpy1.23python3.11.____cpython - variant + variant
osx_64_numpy1.20python3.8.____cpythonwin_64_ffmpeg6numpy1.22python3.10.____cpython - variant + variant
osx_64_numpy1.20python3.9.____cpythonwin_64_ffmpeg6numpy1.22python3.8.____cpython - variant + variant
osx_64_numpy1.21python3.10.____cpythonwin_64_ffmpeg6numpy1.22python3.9.____cpython - variant + variant
osx_64_numpy1.23python3.11.____cpythonwin_64_ffmpeg6numpy1.23python3.11.____cpython - variant + variant
win_64_numpy1.20python3.8.____cpythonwin_64_ffmpeg7numpy1.22python3.10.____cpython - variant + variant
win_64_numpy1.20python3.9.____cpythonwin_64_ffmpeg7numpy1.22python3.8.____cpython - variant + variant
win_64_numpy1.21python3.10.____cpythonwin_64_ffmpeg7numpy1.22python3.9.____cpython - variant + variant
win_64_numpy1.23python3.11.____cpythonwin_64_ffmpeg7numpy1.23python3.11.____cpython - variant + variant