From 1aaba65d7259868080c58c1f12299bfd614db249 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sat, 13 May 2023 12:45:05 +1100 Subject: [PATCH] MNT: Re-rendered with conda-build 3.24.0, conda-smithy 3.23.1, and conda-forge-pinning 2023.05.12.17.26.46 --- .azure-pipelines/azure-pipelines-win.yml | 4 ++-- .ci_support/linux_64_.yaml | 6 ++++-- .ci_support/linux_aarch64_.yaml | 6 ++++-- .ci_support/linux_ppc64le_.yaml | 6 ++++-- .ci_support/migrations/libabseil20230125.yaml | 7 ------- .ci_support/osx_64_.yaml | 6 ++++-- .ci_support/osx_arm64_.yaml | 6 ++++-- .ci_support/win_64_.yaml | 2 ++ .scripts/build_steps.sh | 4 ++-- .scripts/run_osx_build.sh | 4 ++-- README.md | 8 ++++---- 11 files changed, 32 insertions(+), 27 deletions(-) delete mode 100644 .ci_support/migrations/libabseil20230125.yaml diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index a192c0b..8a96a72 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -5,7 +5,7 @@ jobs: - job: win pool: - vmImage: windows-2019 + vmImage: windows-2022 strategy: matrix: win_64_: @@ -36,7 +36,7 @@ jobs: - 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 + mamba.exe install "python=3.10" conda-build conda pip boa conda-forge-ci-setup=3 -c conda-forge --strict-channel-priority --yes displayName: Install conda-build - script: set PYTHONUNBUFFERED=1 diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index 12b276a..95d0fa4 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '11' +- '12' cdt_name: - cos6 channel_sources: @@ -11,9 +11,11 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '11' +- '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 +jsoncpp: +- 1.9.5 libabseil: - '20230125' target_platform: diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml index 52a8439..3cabc39 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_.yaml @@ -3,7 +3,7 @@ BUILD: c_compiler: - gcc c_compiler_version: -- '11' +- '12' cdt_arch: - aarch64 cdt_name: @@ -15,9 +15,11 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '11' +- '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 +jsoncpp: +- 1.9.5 libabseil: - '20230125' target_platform: diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml index 764d69a..1b29a43 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.ci_support/linux_ppc64le_.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '11' +- '12' cdt_name: - cos7 channel_sources: @@ -11,9 +11,11 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '11' +- '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 +jsoncpp: +- 1.9.5 libabseil: - '20230125' target_platform: diff --git a/.ci_support/migrations/libabseil20230125.yaml b/.ci_support/migrations/libabseil20230125.yaml deleted file mode 100644 index 2dea689..0000000 --- a/.ci_support/migrations/libabseil20230125.yaml +++ /dev/null @@ -1,7 +0,0 @@ -__migrator: - build_number: 1 - kind: version - migration_number: 1 -libabseil: -- '20230125' -migrator_ts: 1676218104.8853533 diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index a957f92..6591b47 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '14' +- '15' channel_sources: - conda-forge channel_targets: @@ -11,7 +11,9 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '14' +- '15' +jsoncpp: +- 1.9.5 libabseil: - '20230125' macos_machine: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index 12751a6..ad6b4c4 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '14' +- '15' channel_sources: - conda-forge channel_targets: @@ -11,7 +11,9 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '14' +- '15' +jsoncpp: +- 1.9.5 libabseil: - '20230125' macos_machine: diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml index ce55bfd..4d1970f 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_.yaml @@ -6,6 +6,8 @@ channel_targets: - conda-forge main cxx_compiler: - vs2019 +jsoncpp: +- 1.9.5 libabseil: - '20230125' target_platform: diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 84431a6..a6b09f6 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -33,9 +33,9 @@ CONDARC mamba install --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" + conda-build pip boa conda-forge-ci-setup=3 mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" + conda-build pip boa conda-forge-ci-setup=3 # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index b3abaeb..bb00584 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -24,9 +24,9 @@ source ${MINIFORGE_HOME}/etc/profile.d/conda.sh conda activate base mamba install --update-specs --quiet --yes --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" + conda-build pip boa conda-forge-ci-setup=3 mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" + conda-build pip boa conda-forge-ci-setup=3 diff --git a/README.md b/README.md index 450c603..26c1cf9 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@ -About libprotobuf -================= +About libprotobuf-feedstock +=========================== + +Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/libprotobuf-feedstock/blob/main/LICENSE.txt) Home: https://developers.google.com/protocol-buffers/ Package license: BSD-3-Clause -Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/libprotobuf-feedstock/blob/main/LICENSE.txt) - Summary: Protocol Buffers - Google's data interchange format. C++ Libraries and protoc, the protobuf compiler. Development: https://github.com/protocolbuffers/protobuf