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.

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

Fix macOS issue for new Python version #3362

Merged
merged 8 commits into from
Apr 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 3 additions & 5 deletions .github/workflows/build-extensions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -106,11 +106,9 @@ jobs:
steps:
- uses: actions/checkout@v3

- name: Install OpenSSL
- name: Install dependencies
run: |
brew install openssl@3 duckdb
OPENSSL_ROOT=$(readlink -f /opt/homebrew/Cellar/openssl@3/*/)
echo "OPENSSL_ROOT_DIR=$OPENSSL_ROOT" >> $GITHUB_ENV
brew install duckdb openssl@3

- name: Build precompiled extensions
run: make extension-release LTO=1 NUM_THREADS=$(nproc)
Expand All @@ -137,7 +135,7 @@ jobs:
- name: Build precompiled extensions
run: make extension-release LTO=1 NUM_THREADS=$(nproc)
env:
MACOSX_DEPLOYMENT_TARGET: 10.15
MACOSX_DEPLOYMENT_TARGET: 11.0
CMAKE_OSX_ARCHITECTURES: "x86_64"

- name: Collect built artifacts
Expand Down
13 changes: 11 additions & 2 deletions .github/workflows/ci-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -406,8 +406,8 @@ jobs:

- name: Ensure Python dependencies
run: |
pip3 install torch~=2.0.0 --extra-index-url https://download.pytorch.org/whl/cpu
pip3 install --user -r tools/python_api/requirements_dev.txt -f https://data.pyg.org/whl/torch-2.0.0+cpu.html
pip3 install torch~=2.2.0 --break-system-package --extra-index-url https://download.pytorch.org/whl/cpu
pip3 install --break-system-package --user -r tools/python_api/requirements_dev.txt -f https://data.pyg.org/whl/torch-2.0.0+cpu.html

- name: Ensure Node.js dependencies
run: npm install --include=dev
Expand Down Expand Up @@ -505,6 +505,9 @@ jobs:
node -e 'fs=require("fs");fs.readFile(process.env.FNAME,"utf8",(err,data)=>{if(err!=null)throw err;fs.writeFile(process.env.FNAME,data.replaceAll(process.env.FIND,process.env.PG_HOST),"utf8",e=>{if(e!=null)throw e;});});'
cat postgres_scanner.test

- name: Install dependencies
run: pip install rangehttpserver

- name: Extension test
run: |
cd scripts/ && python3 http-server.py &
Expand Down Expand Up @@ -538,6 +541,9 @@ jobs:
node -e 'fs=require("fs");fs.readFile(process.env.FNAME,"utf8",(err,data)=>{if(err!=null)throw err;fs.writeFile(process.env.FNAME,data.replaceAll(process.env.FIND,process.env.PG_HOST),"utf8",e=>{if(e!=null)throw e;});});'
cat postgres_scanner.test

- name: Install dependencies
run: pip3 install --break-system-packages rangehttpserver

- name: Extension test
run: |
cd scripts/ && python3 http-server.py &
Expand Down Expand Up @@ -565,6 +571,9 @@ jobs:
steps:
- uses: actions/checkout@v3

- name: Install dependencies
run: pip install rangehttpserver

- name: Update PostgreSQL host
working-directory: extension/postgres_scanner/test/test_files
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mac-java-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
run: |
env JAVA_HOME=$(/usr/libexec/java_home) make java LTO=1 NUM_THREADS=48
env:
MACOSX_DEPLOYMENT_TARGET: 10.15
MACOSX_DEPLOYMENT_TARGET: 11.0
ARCHFLAGS: "-arch x86_64"

- uses: actions/upload-artifact@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mac-nodejs-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
working-directory: tools/nodejs_api/package
run: npm i
env:
MACOSX_DEPLOYMENT_TARGET: 10.15
MACOSX_DEPLOYMENT_TARGET: 11.0
ARCHFLAGS: "-arch x86_64"

- name: Move Node.js native module
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mac-wheel-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ jobs:
CIBW_SKIP: pp* cp36*
CIBW_ARCHS_MACOS: x86_64
CIBW_BUILD_VERBOSITY: 3
MACOSX_DEPLOYMENT_TARGET: 10.15
MACOSX_DEPLOYMENT_TARGET: 11.0
with:
package-dir: ./scripts/pip-package/kuzu.tar.gz
output-dir: ./scripts/pip-package/wheelhouse
Expand Down
1 change: 0 additions & 1 deletion scripts/http-server.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import os

# Change the current working directory
os.system("pip3 install rangehttpserver")
os.chdir(f'{os.getcwd()}/../dataset')
os.system("python3 -m RangeHTTPServer 80")
Loading