Skip to content

Commit

Permalink
Rebuild for libgrpc158_libprotobuf4243 (#375)
Browse files Browse the repository at this point in the history
* Rebuild for libgrpc158_libprotobuf4243

* MNT: Re-rendered with conda-build 3.27.0, conda-smithy 3.27.1, and conda-forge-pinning 2023.10.08.10.53.16
  • Loading branch information
regro-cf-autotick-bot authored Oct 9, 2023
1 parent 0ed2fc8 commit 100a818
Show file tree
Hide file tree
Showing 20 changed files with 46 additions and 67 deletions.
2 changes: 1 addition & 1 deletion .ci_support/linux_64_python3.10.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ icu:
libgdal:
- '3.7'
libprotobuf:
- 4.23.4
- 4.24.3
libspatialindex:
- 1.9.3
libzip:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_64_python3.11.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ icu:
libgdal:
- '3.7'
libprotobuf:
- 4.23.4
- 4.24.3
libspatialindex:
- 1.9.3
libzip:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_64_python3.9.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ icu:
libgdal:
- '3.7'
libprotobuf:
- 4.23.4
- 4.24.3
libspatialindex:
- 1.9.3
libzip:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_aarch64_python3.10.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ icu:
libgdal:
- '3.7'
libprotobuf:
- 4.23.4
- 4.24.3
libspatialindex:
- 1.9.3
libzip:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_aarch64_python3.11.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ icu:
libgdal:
- '3.7'
libprotobuf:
- 4.23.4
- 4.24.3
libspatialindex:
- 1.9.3
libzip:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_aarch64_python3.9.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ icu:
libgdal:
- '3.7'
libprotobuf:
- 4.23.4
- 4.24.3
libspatialindex:
- 1.9.3
libzip:
Expand Down
16 changes: 16 additions & 0 deletions .ci_support/migrations/libgrpc158_libprotobuf4243.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
__migrator:
build_number: 1
kind: version
migration_number: 1
exclude:
# this shouldn't attempt to modify the python feedstocks
- protobuf
libgrpc:
- "1.58"
libprotobuf:
- 4.24.3
# already covered by libabseil20230802_libgrpc157_libprotobuf4234,
# which we cannot delete yet, but keep for clarity
MACOSX_DEPLOYMENT_TARGET: # [osx and x86_64]
- "10.13" # [osx and x86_64]
migrator_ts: 1695803907.2958245
37 changes: 0 additions & 37 deletions .ci_support/migrations/python311.yaml

This file was deleted.

6 changes: 3 additions & 3 deletions .ci_support/osx_64_python3.10.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ MACOSX_SDK_VERSION:
c_compiler:
- clang
c_compiler_version:
- '15'
- '16'
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- clangxx
cxx_compiler_version:
- '15'
- '16'
exiv2:
- '0.27'
expat:
Expand All @@ -29,7 +29,7 @@ icu:
libgdal:
- '3.7'
libprotobuf:
- 4.23.4
- 4.24.3
libspatialindex:
- 1.9.3
libzip:
Expand Down
6 changes: 3 additions & 3 deletions .ci_support/osx_64_python3.11.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ MACOSX_SDK_VERSION:
c_compiler:
- clang
c_compiler_version:
- '15'
- '16'
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- clangxx
cxx_compiler_version:
- '15'
- '16'
exiv2:
- '0.27'
expat:
Expand All @@ -29,7 +29,7 @@ icu:
libgdal:
- '3.7'
libprotobuf:
- 4.23.4
- 4.24.3
libspatialindex:
- 1.9.3
libzip:
Expand Down
6 changes: 3 additions & 3 deletions .ci_support/osx_64_python3.9.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ MACOSX_SDK_VERSION:
c_compiler:
- clang
c_compiler_version:
- '15'
- '16'
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- clangxx
cxx_compiler_version:
- '15'
- '16'
exiv2:
- '0.27'
expat:
Expand All @@ -29,7 +29,7 @@ icu:
libgdal:
- '3.7'
libprotobuf:
- 4.23.4
- 4.24.3
libspatialindex:
- 1.9.3
libzip:
Expand Down
6 changes: 3 additions & 3 deletions .ci_support/osx_arm64_python3.10.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ MACOSX_DEPLOYMENT_TARGET:
c_compiler:
- clang
c_compiler_version:
- '15'
- '16'
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- clangxx
cxx_compiler_version:
- '15'
- '16'
exiv2:
- '0.27'
expat:
Expand All @@ -27,7 +27,7 @@ icu:
libgdal:
- '3.7'
libprotobuf:
- 4.23.4
- 4.24.3
libspatialindex:
- 1.9.3
libzip:
Expand Down
6 changes: 3 additions & 3 deletions .ci_support/osx_arm64_python3.11.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ MACOSX_DEPLOYMENT_TARGET:
c_compiler:
- clang
c_compiler_version:
- '15'
- '16'
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- clangxx
cxx_compiler_version:
- '15'
- '16'
exiv2:
- '0.27'
expat:
Expand All @@ -27,7 +27,7 @@ icu:
libgdal:
- '3.7'
libprotobuf:
- 4.23.4
- 4.24.3
libspatialindex:
- 1.9.3
libzip:
Expand Down
6 changes: 3 additions & 3 deletions .ci_support/osx_arm64_python3.9.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ MACOSX_DEPLOYMENT_TARGET:
c_compiler:
- clang
c_compiler_version:
- '15'
- '16'
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- clangxx
cxx_compiler_version:
- '15'
- '16'
exiv2:
- '0.27'
expat:
Expand All @@ -27,7 +27,7 @@ icu:
libgdal:
- '3.7'
libprotobuf:
- 4.23.4
- 4.24.3
libspatialindex:
- 1.9.3
libzip:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/win_64_python3.10.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ icu:
libgdal:
- '3.7'
libprotobuf:
- 4.23.4
- 4.24.3
libspatialindex:
- 1.9.3
libzip:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/win_64_python3.11.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ icu:
libgdal:
- '3.7'
libprotobuf:
- 4.23.4
- 4.24.3
libspatialindex:
- 1.9.3
libzip:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/win_64_python3.9.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ icu:
libgdal:
- '3.7'
libprotobuf:
- 4.23.4
- 4.24.3
libspatialindex:
- 1.9.3
libzip:
Expand Down
2 changes: 1 addition & 1 deletion .scripts/build_steps.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .scripts/run_osx_build.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ source:
- 0005-check-locks-not-destroyed.patch

build:
number: 1
number: 2
# pyproj no longer supports py38
skip: true # [py2k or py<39]

Expand Down

0 comments on commit 100a818

Please sign in to comment.