Skip to content

Commit

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

* MNT: Re-rendered with conda-build 3.25.0, conda-smithy 3.23.1, and conda-forge-pinning 2023.06.26.14.25.37

* try forcing cxx 17

* update patch

* try other approach

* use a block

* try another approach

* use target instead

* d'oh wasnt applying patch for non-windows. remove cxx17 forcing

* go back to previous way

* make patch simpler and see what happens

* reinstate CONFIG for Windows

* try other suggestion

* agin

---------

Co-authored-by: Sam Gillingham <gillingham.sam@gmail.com>
  • Loading branch information
regro-cf-autotick-bot and gillins authored Jun 29, 2023
1 parent a9c8759 commit 6249805
Show file tree
Hide file tree
Showing 47 changed files with 1,498 additions and 102 deletions.
64 changes: 48 additions & 16 deletions .azure-pipelines/azure-pipelines-linux.yml

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

56 changes: 40 additions & 16 deletions .azure-pipelines/azure-pipelines-osx.yml

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

28 changes: 20 additions & 8 deletions .azure-pipelines/azure-pipelines-win.yml

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

59 changes: 59 additions & 0 deletions .ci_support/linux_64_libprotobuf4.23.2python3.10.____cpython.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
c_compiler:
- gcc
c_compiler_version:
- '12'
cdt_name:
- cos7
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- gxx
cxx_compiler_version:
- '12'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
exiv2:
- '0.27'
expat:
- '2'
gdal:
- '3.7'
geos:
- 3.11.2
gsl:
- '2.7'
icu:
- '72'
libgdal:
- '3.7'
libprotobuf:
- 4.23.2
libspatialindex:
- 1.9.3
libzip:
- '1'
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
postgresql:
- '15'
proj:
- 9.2.0
pyqt:
- '5.15'
python:
- 3.10.* *_cpython
qt_main:
- '5.15'
qtkeychain:
- '0.14'
sqlite:
- '3'
target_platform:
- linux-64
zip_keys:
- - c_compiler_version
- cxx_compiler_version
59 changes: 59 additions & 0 deletions .ci_support/linux_64_libprotobuf4.23.2python3.11.____cpython.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
c_compiler:
- gcc
c_compiler_version:
- '12'
cdt_name:
- cos7
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- gxx
cxx_compiler_version:
- '12'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
exiv2:
- '0.27'
expat:
- '2'
gdal:
- '3.7'
geos:
- 3.11.2
gsl:
- '2.7'
icu:
- '72'
libgdal:
- '3.7'
libprotobuf:
- 4.23.2
libspatialindex:
- 1.9.3
libzip:
- '1'
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
postgresql:
- '15'
proj:
- 9.2.0
pyqt:
- '5.15'
python:
- 3.11.* *_cpython
qt_main:
- '5.15'
qtkeychain:
- '0.14'
sqlite:
- '3'
target_platform:
- linux-64
zip_keys:
- - c_compiler_version
- cxx_compiler_version
59 changes: 59 additions & 0 deletions .ci_support/linux_64_libprotobuf4.23.2python3.8.____cpython.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
c_compiler:
- gcc
c_compiler_version:
- '12'
cdt_name:
- cos7
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- gxx
cxx_compiler_version:
- '12'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
exiv2:
- '0.27'
expat:
- '2'
gdal:
- '3.7'
geos:
- 3.11.2
gsl:
- '2.7'
icu:
- '72'
libgdal:
- '3.7'
libprotobuf:
- 4.23.2
libspatialindex:
- 1.9.3
libzip:
- '1'
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
postgresql:
- '15'
proj:
- 9.2.0
pyqt:
- '5.15'
python:
- 3.8.* *_cpython
qt_main:
- '5.15'
qtkeychain:
- '0.14'
sqlite:
- '3'
target_platform:
- linux-64
zip_keys:
- - c_compiler_version
- cxx_compiler_version
Loading

0 comments on commit 6249805

Please sign in to comment.