Skip to content

Commit

Permalink
Merge branch 'main' into json_varchar_comparison
Browse files Browse the repository at this point in the history
  • Loading branch information
lnkuiper committed Apr 12, 2024
2 parents f1b63be + 55607c0 commit b9db3b4
Show file tree
Hide file tree
Showing 187 changed files with 18,572 additions and 1,696 deletions.
16 changes: 7 additions & 9 deletions .github/config/out_of_tree_extensions.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,11 @@
# VCPKG_TARGET_TRIPLET=arm64-osx

################# ARROW
if (NOT WIN32)
duckdb_extension_load(arrow
LOAD_TESTS DONT_LINK
GIT_URL https://github.com/duckdb/arrow
GIT_TAG 9e10240da11f61ea7fbfe3fc9988ffe672ccd40f
)
endif()
duckdb_extension_load(arrow
LOAD_TESTS DONT_LINK
GIT_URL https://github.com/duckdb/arrow
GIT_TAG 9e10240da11f61ea7fbfe3fc9988ffe672ccd40f
)

################## AWS
if (NOT MINGW)
Expand All @@ -38,7 +36,7 @@ if (NOT MINGW)
duckdb_extension_load(azure
LOAD_TESTS
GIT_URL https://github.com/duckdb/duckdb_azure
GIT_TAG 6620a32454c1eb2e455104d87262061d2464aad0
GIT_TAG 4512a652479016d40d712f990cab9b9aab43d341
APPLY_PATCHES
)
endif()
Expand Down Expand Up @@ -67,7 +65,7 @@ if (NOT MINGW)
duckdb_extension_load(postgres_scanner
DONT_LINK
GIT_URL https://github.com/duckdb/postgres_scanner
GIT_TAG 375710fd22a35107b2c28e744f787e1a93a99998
GIT_TAG 96206f41d5ca7015920a66b54e936c986fe0b0f8
)
endif()

Expand Down
99 changes: 99 additions & 0 deletions .github/workflows/Pyodide.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
name: Pyodide
on:
workflow_call:
inputs:
override_git_describe:
type: string
git_ref:
type: string
skip_tests:
type: string
workflow_dispatch:
inputs:
override_git_describe:
type: string
git_ref:
type: string
skip_tests:
type: string
repository_dispatch:
push:
branches:
- "**"
- "!main"
- "!feature"
paths-ignore:
- "**"
- "!.github/workflows/Pyodide.yml"

pull_request:
types: [opened, reopened, ready_for_review]
paths-ignore:
- "**"
- "!.github/workflows/Pyodide.yml"

jobs:
build_pyodide:
name: Build pyodide wheel
runs-on: ubuntu-22.04
strategy:
fail-fast: false
matrix:
version:
- python: "3.10"
pyodide-build: "0.22.1"
- python: "3.11"
pyodide-build: "0.25.1"
steps:
- uses: actions/checkout@v4
with:
# fetch everything so that the version on the built wheel path is
# correct
fetch-depth: 0

- uses: actions/setup-python@v5
with:
python-version: ${{ matrix.version.python }}

- run: pip install 'pyodide-build==${{ matrix.version.pyodide-build }}' 'pydantic<2'

- name: get emscripten version
id: emscripten-version
run: |
echo "value=$(pyodide config get emscripten_version)" | tee -a "$GITHUB_OUTPUT"
- uses: mymindstorm/setup-emsdk@v14
with:
version: ${{ steps.emscripten-version.outputs.value }}

- name: build wasm wheel
run: pyodide build --exports=whole_archive
working-directory: ./tools/pythonpkg
env:
DUCKDB_CUSTOM_PLATFORM: wasm_eh_pyodide
CFLAGS: "-fexceptions"
LDFLAGS: "-fexceptions"

- name: smoke test duckdb on pyodide
run: |
pyodide venv .venv-pyodide
source .venv-pyodide/bin/activate
pip install ./tools/pythonpkg/dist/*.whl
python -V
python <<EOF
import duckdb
print(duckdb.__version__)
print(duckdb.sql("SELECT 1 AS a"))
(platform,) = duckdb.execute("PRAGMA platform").fetchone()
assert platform == "wasm_eh_pyodide", platform
EOF
- uses: actions/upload-artifact@v3
with:
name: pyodide-python${{ matrix.version.python }}
if-no-files-found: error
path: |
./tools/pythonpkg/dist/*.whl
1 change: 0 additions & 1 deletion .github/workflows/R_CMD_CHECK.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ jobs:
- {os: ubuntu-latest, r: 'release'}

env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
R_KEEP_PKG_SOURCE: yes

steps:
Expand Down
7 changes: 6 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -339,9 +339,14 @@ zig-cache/*

# .db files
*.db
*.db.gz

# local cmake extension config
extension/extension_config_local.cmake

# extension_external dir
extension_external
extension_external

# pyodide (emscripten python) build and test environment
.pyodide-xbuildenv
.venv-pyodide
Loading

0 comments on commit b9db3b4

Please sign in to comment.