Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

protobuf 5.26.1 #215

Merged
merged 93 commits into from
Sep 19, 2024
Merged

protobuf 5.26.1 #215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
93 commits
Select commit Hold shift + click to select a range
37ea27f
add migration for libprotobuf 5.26.1
h-vetinari May 6, 2024
e4178f7
stdlib transformations
h-vetinari May 6, 2024
c929206
protobuf 5.26.1
h-vetinari May 6, 2024
a99d92d
MNT: Re-rendered with conda-build 24.3.0, conda-smithy 3.35.0, and co…
h-vetinari May 6, 2024
9299dae
protobuf 5.27.2
h-vetinari Jun 28, 2024
fa531c7
drop patches (`setup.py` is no more)
h-vetinari Jun 28, 2024
4cb5a83
backport patch to help with upb situation
h-vetinari Jun 28, 2024
bb0e4d1
switch to building with bazel
h-vetinari Jun 28, 2024
eeba6d1
MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.36.2, and co…
h-vetinari Jun 28, 2024
268270d
skip pypy
h-vetinari Jun 28, 2024
374964b
keep building C++ backend
h-vetinari Jun 28, 2024
c95c0bd
commence the patch bonanza
h-vetinari Jun 28, 2024
0021456
binary_wheel
h-vetinari Jun 28, 2024
96040dd
iterate
h-vetinari Jun 28, 2024
012d5b6
introduce build scripts
h-vetinari Jul 14, 2024
12db823
use bazel-toolchain
h-vetinari Jul 14, 2024
07414ff
patch out windows config failure
h-vetinari Jul 14, 2024
6d91a35
relative paths
h-vetinari Jul 14, 2024
47fe780
back to v26.1
h-vetinari Jul 17, 2024
b43dab7
use standalone bazel
h-vetinari Jul 26, 2024
73de957
MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.37.1, and co…
h-vetinari Jul 26, 2024
100b09f
unlock windows harder
h-vetinari Jul 26, 2024
c163912
path to local bazel
h-vetinari Jul 26, 2024
6d7a704
unblock windows harder still
h-vetinari Jul 26, 2024
104cb7d
set BAZEL_BUILD_OPTS
h-vetinari Jul 26, 2024
e666256
debug...
h-vetinari Jul 26, 2024
e1e6444
explicitly use standalone bazel
h-vetinari Jul 26, 2024
ff91c8d
more -standalone
h-vetinari Jul 26, 2024
8d2c23d
depend on openjdk
h-vetinari Jul 28, 2024
f85c27b
add python to build environment also on windows
h-vetinari Jul 28, 2024
c1f3d4b
Merge remote-tracking branch 'upstream/main' into bump
xhochy Sep 12, 2024
7c20868
MNT: Re-rendered with conda-build 24.7.1, conda-smithy 3.39.1, and co…
xhochy Sep 12, 2024
7394445
Bazel build fixes
xhochy Sep 12, 2024
0bc3289
Update tests
xhochy Sep 13, 2024
d260833
Add py_toolchain
xhochy Sep 13, 2024
8056706
Limit python toolchain to Linux
xhochy Sep 13, 2024
2a447f5
Correctly disable the python toolchain
xhochy Sep 16, 2024
d3f64f1
Fix python toolchain
xhochy Sep 16, 2024
470cbbc
Patch aarch64 build
xhochy Sep 16, 2024
186d271
Get python version from environment
xhochy Sep 16, 2024
5f76704
Revert errorneous patch
xhochy Sep 16, 2024
266e246
Add patch for ppc64le support
xhochy Sep 16, 2024
93a1f89
Add py_toolchain for windows
xhochy Sep 16, 2024
a3a48a1
Fix order of arguments
xhochy Sep 16, 2024
d42be58
Delayed expansion
xhochy Sep 16, 2024
dc3ac9b
Add py_toolchain subfolder
xhochy Sep 16, 2024
569920d
Fix py_toolchain
xhochy Sep 16, 2024
50b740b
Use Mistral instead of ChatGPT
xhochy Sep 16, 2024
8e26857
Bazel debug
xhochy Sep 16, 2024
5f4f54f
cygpath
xhochy Sep 16, 2024
3ae2678
Workaround missing leading whitespace for mcpu stripping in bazel-too…
xhochy Sep 16, 2024
75a0d7e
Try to set system python
xhochy Sep 17, 2024
06c8e5a
Ensure correct wheel tags
xhochy Sep 17, 2024
955c06d
Hardcode Python version
xhochy Sep 17, 2024
c188601
Limit matrix
xhochy Sep 17, 2024
8518aea
MNT: Re-rendered with conda-build 24.7.1, conda-smithy 3.39.1, and co…
xhochy Sep 17, 2024
e0fc120
Fix string replacement
xhochy Sep 17, 2024
418766d
Fix string replacement
xhochy Sep 17, 2024
511e41f
Fix string replacement
xhochy Sep 17, 2024
88528fa
Use sed
xhochy Sep 17, 2024
1452599
Support Windows CPUs
xhochy Sep 17, 2024
0c65168
use_fast_cpp_protos=true
xhochy Sep 17, 2024
42e61f8
Add library prefix to includes
xhochy Sep 17, 2024
895cc2c
Revert "Add library prefix to includes"
xhochy Sep 17, 2024
86726f1
Set different output_base
xhochy Sep 17, 2024
2454f03
output_base must be before build
xhochy Sep 17, 2024
c5afcac
Depend on posix
xhochy Sep 17, 2024
38acedd
Only shorten output base in CI
xhochy Sep 17, 2024
44f10b8
Windows and quotes...
xhochy Sep 17, 2024
0dc4796
Fix syntax
xhochy Sep 17, 2024
4e9eeb3
No no-pedantic on Windows
xhochy Sep 17, 2024
167a47b
Fix patch location
xhochy Sep 18, 2024
4dd1532
Update patch
xhochy Sep 18, 2024
81622d8
Add py_cc toolchain
xhochy Sep 18, 2024
a465c66
Fix some syntax issues
xhochy Sep 18, 2024
e51ac2a
rules_python is too old for libs
xhochy Sep 18, 2024
6c7eff5
rules_python is too old for libs
xhochy Sep 18, 2024
b21a509
Hardcode python_exe
xhochy Sep 18, 2024
77494ea
Remove trailing ; after PyObject_HEAD
xhochy Sep 18, 2024
8472b24
More PyObject_HEAD
xhochy Sep 18, 2024
53af898
Use Windows visibility
xhochy Sep 18, 2024
47d1a13
Omit flatten on Windows
xhochy Sep 18, 2024
cbed77a
Extend libpath via action_env
xhochy Sep 18, 2024
26000f5
Try linkopt
xhochy Sep 18, 2024
244b7b8
Use a different pip install
xhochy Sep 18, 2024
a66baf3
Explicit pip install
xhochy Sep 18, 2024
1ce4eaa
Use the correct python
xhochy Sep 18, 2024
fd3f36b
Clean up bazel
xhochy Sep 19, 2024
e61fdab
Remove skips
xhochy Sep 19, 2024
293357f
MNT: Re-rendered with conda-build 24.7.1, conda-smithy 3.40.1, and co…
xhochy Sep 19, 2024
b5d6a81
Cleanup patches
xhochy Sep 19, 2024
597008c
Drop some unneccessary options on Windows
xhochy Sep 19, 2024
58b9abf
Drop py_toolchain on Windows
xhochy Sep 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .ci_support/linux_64_python3.10.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@ pin_run_as_build:
max_pin: x.x
python:
- 3.10.* *_cpython
python_impl:
- cpython
target_platform:
- linux-64
zip_keys:
Expand All @@ -36,5 +34,4 @@ zip_keys:
- - c_stdlib_version
- cdt_name
- - python
- python_impl
- channel_sources
3 changes: 0 additions & 3 deletions .ci_support/linux_64_python3.11.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@ pin_run_as_build:
max_pin: x.x
python:
- 3.11.* *_cpython
python_impl:
- cpython
target_platform:
- linux-64
zip_keys:
Expand All @@ -36,5 +34,4 @@ zip_keys:
- - c_stdlib_version
- cdt_name
- - python
- python_impl
- channel_sources
3 changes: 0 additions & 3 deletions .ci_support/linux_64_python3.12.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@ pin_run_as_build:
max_pin: x.x
python:
- 3.12.* *_cpython
python_impl:
- cpython
target_platform:
- linux-64
zip_keys:
Expand All @@ -36,5 +34,4 @@ zip_keys:
- - c_stdlib_version
- cdt_name
- - python
- python_impl
- channel_sources
3 changes: 0 additions & 3 deletions .ci_support/linux_64_python3.13.____cp313.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@ pin_run_as_build:
max_pin: x.x
python:
- 3.13.* *_cp313
python_impl:
- cpython
target_platform:
- linux-64
zip_keys:
Expand All @@ -36,5 +34,4 @@ zip_keys:
- - c_stdlib_version
- cdt_name
- - python
- python_impl
- channel_sources
3 changes: 0 additions & 3 deletions .ci_support/linux_64_python3.9.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@ pin_run_as_build:
max_pin: x.x
python:
- 3.9.* *_cpython
python_impl:
- cpython
target_platform:
- linux-64
zip_keys:
Expand All @@ -36,5 +34,4 @@ zip_keys:
- - c_stdlib_version
- cdt_name
- - python
- python_impl
- channel_sources
3 changes: 0 additions & 3 deletions .ci_support/linux_aarch64_python3.10.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@ pin_run_as_build:
max_pin: x.x
python:
- 3.10.* *_cpython
python_impl:
- cpython
target_platform:
- linux-aarch64
zip_keys:
Expand All @@ -40,5 +38,4 @@ zip_keys:
- - c_stdlib_version
- cdt_name
- - python
- python_impl
- channel_sources
3 changes: 0 additions & 3 deletions .ci_support/linux_aarch64_python3.11.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@ pin_run_as_build:
max_pin: x.x
python:
- 3.11.* *_cpython
python_impl:
- cpython
target_platform:
- linux-aarch64
zip_keys:
Expand All @@ -40,5 +38,4 @@ zip_keys:
- - c_stdlib_version
- cdt_name
- - python
- python_impl
- channel_sources
3 changes: 0 additions & 3 deletions .ci_support/linux_aarch64_python3.12.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@ pin_run_as_build:
max_pin: x.x
python:
- 3.12.* *_cpython
python_impl:
- cpython
target_platform:
- linux-aarch64
zip_keys:
Expand All @@ -40,5 +38,4 @@ zip_keys:
- - c_stdlib_version
- cdt_name
- - python
- python_impl
- channel_sources
3 changes: 0 additions & 3 deletions .ci_support/linux_aarch64_python3.13.____cp313.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@ pin_run_as_build:
max_pin: x.x
python:
- 3.13.* *_cp313
python_impl:
- cpython
target_platform:
- linux-aarch64
zip_keys:
Expand All @@ -40,5 +38,4 @@ zip_keys:
- - c_stdlib_version
- cdt_name
- - python
- python_impl
- channel_sources
3 changes: 0 additions & 3 deletions .ci_support/linux_aarch64_python3.9.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@ pin_run_as_build:
max_pin: x.x
python:
- 3.9.* *_cpython
python_impl:
- cpython
target_platform:
- linux-aarch64
zip_keys:
Expand All @@ -40,5 +38,4 @@ zip_keys:
- - c_stdlib_version
- cdt_name
- - python
- python_impl
- channel_sources
3 changes: 0 additions & 3 deletions .ci_support/linux_ppc64le_python3.10.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@ pin_run_as_build:
max_pin: x.x
python:
- 3.10.* *_cpython
python_impl:
- cpython
target_platform:
- linux-ppc64le
zip_keys:
Expand All @@ -36,5 +34,4 @@ zip_keys:
- - c_stdlib_version
- cdt_name
- - python
- python_impl
- channel_sources
3 changes: 0 additions & 3 deletions .ci_support/linux_ppc64le_python3.11.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@ pin_run_as_build:
max_pin: x.x
python:
- 3.11.* *_cpython
python_impl:
- cpython
target_platform:
- linux-ppc64le
zip_keys:
Expand All @@ -36,5 +34,4 @@ zip_keys:
- - c_stdlib_version
- cdt_name
- - python
- python_impl
- channel_sources
3 changes: 0 additions & 3 deletions .ci_support/linux_ppc64le_python3.12.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@ pin_run_as_build:
max_pin: x.x
python:
- 3.12.* *_cpython
python_impl:
- cpython
target_platform:
- linux-ppc64le
zip_keys:
Expand All @@ -36,5 +34,4 @@ zip_keys:
- - c_stdlib_version
- cdt_name
- - python
- python_impl
- channel_sources
3 changes: 0 additions & 3 deletions .ci_support/linux_ppc64le_python3.13.____cp313.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@ pin_run_as_build:
max_pin: x.x
python:
- 3.13.* *_cp313
python_impl:
- cpython
target_platform:
- linux-ppc64le
zip_keys:
Expand All @@ -36,5 +34,4 @@ zip_keys:
- - c_stdlib_version
- cdt_name
- - python
- python_impl
- channel_sources
3 changes: 0 additions & 3 deletions .ci_support/linux_ppc64le_python3.9.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@ pin_run_as_build:
max_pin: x.x
python:
- 3.9.* *_cpython
python_impl:
- cpython
target_platform:
- linux-ppc64le
zip_keys:
Expand All @@ -36,5 +34,4 @@ zip_keys:
- - c_stdlib_version
- cdt_name
- - python
- python_impl
- channel_sources
11 changes: 11 additions & 0 deletions .ci_support/migrations/libgrpc163_libprotobuf5261.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
__migrator:
build_number: 1
commit_message: Rebuild for libgrp 1.63 & libprotobuf 5.26.1
kind: version
paused: true
migration_number: 1
libgrpc:
- "1.63"
libprotobuf:
- 5.26.1
migrator_ts: 1711628174.9404116
3 changes: 0 additions & 3 deletions .ci_support/osx_64_python3.10.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,10 @@ pin_run_as_build:
max_pin: x.x
python:
- 3.10.* *_cpython
python_impl:
- cpython
target_platform:
- osx-64
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - python
- python_impl
- channel_sources
3 changes: 0 additions & 3 deletions .ci_support/osx_64_python3.11.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,10 @@ pin_run_as_build:
max_pin: x.x
python:
- 3.11.* *_cpython
python_impl:
- cpython
target_platform:
- osx-64
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - python
- python_impl
- channel_sources
3 changes: 0 additions & 3 deletions .ci_support/osx_64_python3.12.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,10 @@ pin_run_as_build:
max_pin: x.x
python:
- 3.12.* *_cpython
python_impl:
- cpython
target_platform:
- osx-64
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - python
- python_impl
- channel_sources
3 changes: 0 additions & 3 deletions .ci_support/osx_64_python3.13.____cp313.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,10 @@ pin_run_as_build:
max_pin: x.x
python:
- 3.13.* *_cp313
python_impl:
- cpython
target_platform:
- osx-64
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - python
- python_impl
- channel_sources
3 changes: 0 additions & 3 deletions .ci_support/osx_64_python3.9.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,10 @@ pin_run_as_build:
max_pin: x.x
python:
- 3.9.* *_cpython
python_impl:
- cpython
target_platform:
- osx-64
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - python
- python_impl
- channel_sources
3 changes: 0 additions & 3 deletions .ci_support/osx_arm64_python3.10.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,10 @@ pin_run_as_build:
max_pin: x.x
python:
- 3.10.* *_cpython
python_impl:
- cpython
target_platform:
- osx-arm64
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - python
- python_impl
- channel_sources
3 changes: 0 additions & 3 deletions .ci_support/osx_arm64_python3.11.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,10 @@ pin_run_as_build:
max_pin: x.x
python:
- 3.11.* *_cpython
python_impl:
- cpython
target_platform:
- osx-arm64
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - python
- python_impl
- channel_sources
3 changes: 0 additions & 3 deletions .ci_support/osx_arm64_python3.12.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,10 @@ pin_run_as_build:
max_pin: x.x
python:
- 3.12.* *_cpython
python_impl:
- cpython
target_platform:
- osx-arm64
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - python
- python_impl
- channel_sources
3 changes: 0 additions & 3 deletions .ci_support/osx_arm64_python3.13.____cp313.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,10 @@ pin_run_as_build:
max_pin: x.x
python:
- 3.13.* *_cp313
python_impl:
- cpython
target_platform:
- osx-arm64
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - python
- python_impl
- channel_sources
3 changes: 0 additions & 3 deletions .ci_support/osx_arm64_python3.9.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,10 @@ pin_run_as_build:
max_pin: x.x
python:
- 3.9.* *_cpython
python_impl:
- cpython
target_platform:
- osx-arm64
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - python
- python_impl
- channel_sources
3 changes: 0 additions & 3 deletions .ci_support/win_64_python3.10.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,8 @@ pin_run_as_build:
max_pin: x.x
python:
- 3.10.* *_cpython
python_impl:
- cpython
target_platform:
- win-64
zip_keys:
- - python
- python_impl
- channel_sources
Loading