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

add swap for windows, add debug for macos, rerender #187

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

add swap for windows, add debug for macos, rerender #187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
37d4438
add swap for windows, add debug for macos, rerender
mattip Oct 31, 2024
84ada5a
clean up macOS x86_64 build, python3.8 cruft
mattip Oct 31, 2024
a9fb882
revert part of last commit
mattip Oct 31, 2024
0242efe
typo
mattip Oct 31, 2024
b14d35c
use macOS-14
mattip Oct 31, 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
2 changes: 1 addition & 1 deletion .azure-pipelines/azure-pipelines-osx.yml
View file
Open in desktop

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

1 change: 1 addition & 0 deletions .azure-pipelines/azure-pipelines-win.yml
View file
Open in desktop

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

18 changes: 0 additions & 18 deletions .ci_support/migrations/libabseil20240722_grpc165_libprotobuf5275.yaml
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 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 @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION:
c_compiler:
- clang
c_compiler_version:
- '17'
- '18'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
Expand All @@ -19,7 +19,7 @@ curl:
cxx_compiler:
- clangxx
cxx_compiler_version:
- '17'
- '18'
libgrpc:
- '1.65'
macos_machine:
Expand Down
4 changes: 2 additions & 2 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 @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION:
c_compiler:
- clang
c_compiler_version:
- '17'
- '18'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
Expand All @@ -19,7 +19,7 @@ curl:
cxx_compiler:
- clangxx
cxx_compiler_version:
- '17'
- '18'
libgrpc:
- '1.65'
macos_machine:
Expand Down
4 changes: 2 additions & 2 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 @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION:
c_compiler:
- clang
c_compiler_version:
- '17'
- '18'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
Expand All @@ -19,7 +19,7 @@ curl:
cxx_compiler:
- clangxx
cxx_compiler_version:
- '17'
- '18'
libgrpc:
- '1.65'
macos_machine:
Expand Down
4 changes: 2 additions & 2 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 @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION:
c_compiler:
- clang
c_compiler_version:
- '17'
- '18'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
Expand All @@ -19,7 +19,7 @@ curl:
cxx_compiler:
- clangxx
cxx_compiler_version:
- '17'
- '18'
libgrpc:
- '1.65'
macos_machine:
Expand Down
4 changes: 2 additions & 2 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 @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION:
c_compiler:
- clang
c_compiler_version:
- '17'
- '18'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
Expand All @@ -19,7 +19,7 @@ curl:
cxx_compiler:
- clangxx
cxx_compiler_version:
- '17'
- '18'
libgrpc:
- '1.65'
macos_machine:
Expand Down
4 changes: 2 additions & 2 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 @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION:
c_compiler:
- clang
c_compiler_version:
- '17'
- '18'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
Expand All @@ -19,7 +19,7 @@ curl:
cxx_compiler:
- clangxx
cxx_compiler_version:
- '17'
- '18'
libgrpc:
- '1.65'
macos_machine:
Expand Down
4 changes: 2 additions & 2 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 @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION:
c_compiler:
- clang
c_compiler_version:
- '17'
- '18'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
Expand All @@ -19,7 +19,7 @@ curl:
cxx_compiler:
- clangxx
cxx_compiler_version:
- '17'
- '18'
libgrpc:
- '1.65'
macos_machine:
Expand Down
4 changes: 2 additions & 2 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 @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION:
c_compiler:
- clang
c_compiler_version:
- '17'
- '18'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
Expand All @@ -19,7 +19,7 @@ curl:
cxx_compiler:
- clangxx
cxx_compiler_version:
- '17'
- '18'
libgrpc:
- '1.65'
macos_machine:
Expand Down
5 changes: 5 additions & 0 deletions conda-forge.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,8 @@ github:
branch_name: main
tooling_branch_name: main
test: native_and_emulated

azure:
settings_win:
variables:
SET_PAGEFILE: 'True'
3 changes: 1 addition & 2 deletions recipe/build-core.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,8 @@ echo ==========================================================
echo calling pip to install
echo ==========================================================
cd python
rem This requires patch 0006
echo startup --output_user_root=D:/tmp >> ..\.bazelrc
echo build --jobs=1 >> ..\.bazelrc
rem echo build --jobs=1 >> ..\.bazelrc
"%PYTHON%" -m pip install . -vv

rem remember the return code
Expand Down
10 changes: 1 addition & 9 deletions recipe/build-core.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,7 @@ if [[ "$target_platform" == osx* ]]; then
# also passed as we are using at least OSX 10.15 which moves the include directory out
# of /usr/include to ${SDKROOT}/MacOSX.sdk/usr/include
if [[ "$target_platform" == osx-arm64 ]]; then
# https://github.com/conda-forge/bazel-toolchain-feedstock/issues/18
# delete the line from the template and the CXXFLAGS
export CXXFLAGS=${CXXFLAGS/-stdlib=libc++ /}
export LDFLAGS="$LDFLAGS -undefined dynamic_lookup -Wl,-framework,Foundation"
sed -e"/stdlib=libc/d" -i'' $CONDA_PREFIX/share/bazel_toolchain/CROSSTOOL.template
source gen-bazel-toolchain
fi
cat >> .bazelrc <<EOF
Expand All @@ -32,11 +28,7 @@ EOF
fi
fi

if [[ -e $CONDA_PREFIX/include/crypt.h ]]; then
# fix for python3.8 which depends on system includes for crypt.h
# but the bazel sandbox does not add it
cp $CONDA_PREFIX/include/crypt.h $PREFIX/include/python*
fi
echo CXXFLAGS=$CXXFLAGS

cd python/
export SKIP_THIRDPARTY_INSTALL=1
Expand Down
2 changes: 1 addition & 1 deletion recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ source:
- patches/0005-Vendor-grpc-1.65.5.patch

build:
number: 2
number: 3

# Need these up here for conda-smithy to handle them properly.
requirements:
Expand Down
Loading