From 64d3dddf67b8d746214fcee33d82d01d2d7707bb Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Tue, 26 Sep 2023 21:13:26 +1100 Subject: [PATCH 1/2] protobuf v4.24.3 --- recipe/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 1bcce3b..d85f1ff 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,5 @@ # keep this without major version to let the bot pick it up -{% set version = "23.4" %} +{% set version = "24.3" %} # protobuf doesn't add the major version in the tag, it's defined per language in # https://github.com/protocolbuffers/protobuf/blob/main/version.json {% set major = "4" %} @@ -12,7 +12,7 @@ package: source: url: https://github.com/protocolbuffers/protobuf/archive/refs/tags/v{{ version }}.tar.gz - sha256: a700a49470d301f1190a487a923b5095bf60f08f4ae4cac9f5f7c36883d17971 + sha256: 07d69502e58248927b58c7d7e7424135272ba5b2852a753ab6b67e62d2d29355 patches: - patches/0001-do-not-link-msvc-runtime-statically.patch - patches/0002-fix-paths-for-include-lib-directories.patch @@ -21,7 +21,7 @@ source: - patches/0005-set-PROTOBUF_USE_DLLS-on-windows.patch build: - number: 3 + number: 0 skip: true # [python_impl == "pypy"] script: - cd python From 85a10efc5f712c83a610dd50d62f9233b4524355 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Tue, 26 Sep 2023 21:14:36 +1100 Subject: [PATCH 2/2] MNT: Re-rendered with conda-build 3.26.1, conda-smithy 3.26.2, and conda-forge-pinning 2023.09.26.07.13.00 --- .ci_support/migrations/python311.yaml | 37 --------------------------- 1 file changed, 37 deletions(-) delete mode 100644 .ci_support/migrations/python311.yaml diff --git a/.ci_support/migrations/python311.yaml b/.ci_support/migrations/python311.yaml deleted file mode 100644 index 45d995c..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: 40 - 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