From 9defbf14e4b3a693c6c5895ffc9552587a2e3ffb Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Tue, 12 Sep 2023 14:43:46 -0500 Subject: [PATCH] try without gcc override --- .github/workflows/test-python.yml | 3 ++- bindings/python/setup.py | 8 -------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/.github/workflows/test-python.yml b/.github/workflows/test-python.yml index ba195209..4145ded2 100644 --- a/.github/workflows/test-python.yml +++ b/.github/workflows/test-python.yml @@ -102,6 +102,7 @@ jobs: python-version: ${{ matrix.python-version }} cache: 'pip' cache-dependency-path: '**/setup.cfg' + allow-prereleases: true - name: Start MongoDB uses: supercharge/mongodb-github-action@1.3.0 with: @@ -116,7 +117,7 @@ jobs: - name: Install pyarrow run: | #sudo apt-get install -y build-essential cmake python3-dev python3.10-venv libssl-dev - ./build-pyarrow.sh + #./build-pyarrow.sh - name: Install the project with test dependencies run: | python -m pip install -v -e ".[test]" diff --git a/bindings/python/setup.py b/bindings/python/setup.py index eb59b06a..5335e398 100644 --- a/bindings/python/setup.py +++ b/bindings/python/setup.py @@ -18,11 +18,6 @@ # Whether to create libarrow symlinks on posix systems. CREATE_LIBARROW_SYMLINKS = os.environ.get("MONGO_CREATE_LIBARROW_SYMLINKS", "1") -# Whether to add the GLIBCXX override. -# Arrow's manylinux{2010, 2014} binaries are built with gcc <= 4.8 which predates CXX11 ABI -# - https://uwekorn.com/2019/09/15/how-we-build-apache-arrows-manylinux-wheels.html -ADD_GLIBCXX_OVERRIDE = os.environ.get("MONGO_ADD_GLIBCXX_OVERRIDE", "1") - # Set a default value for MACOSX_DEPLOYMENT_TARGET. os.environ.setdefault("MACOSX_DEPLOYMENT_TARGET", "10.15") @@ -157,9 +152,6 @@ def append_arrow_flags(ext): if os.name == "posix": ext.extra_compile_args.append("-std=c++17") - if ADD_GLIBCXX_OVERRIDE: - ext.extra_compile_args.append("-D_GLIBCXX_USE_CXX11_ABI=0") - elif os.name == "nt": ext.extra_compile_args.append("/std:c++17")