More updates for CI

.gitattributes

@@ -16,5 +16,4 @@
 # under the License.
 
 dist/* linguist-generated
-extensions/nanoarrow_ipc/thirdparty/* linguist-vendored
 python/src/nanoarrow/*.pxi linguist-generated

.github/workflows/build-and-test-ipc.yaml

@@ -28,7 +28,6 @@ on:
       - 'CMakeLists.txt'
       - '.github/workflows/build-and-test-ipc.yaml'
       - 'src/nanoarrow/**'
-      - 'extensions/nanoarrow_ipc/**'
 
 permissions:
   contents: read
@@ -50,7 +49,6 @@ jobs:
           - {label: bundled-build, cmake_args: "-DNANOARROW_IPC_BUNDLE=ON"}
 
     env:
-      SUBDIR: 'extensions/nanoarrow_ipc'
       NANOARROW_ARROW_TESTING_DIR: '${{ github.workspace }}/arrow-testing'
 
     steps:
@@ -147,4 +145,4 @@ jobs:
         uses: actions/upload-artifact@main
         with:
           name: nanoarrow-ipc-memcheck
-          path: extensions/nanoarrow_ipc/build/Testing/Temporary/MemoryChecker.*.log
+          path: build/Testing/Temporary/MemoryChecker.*.log

.github/workflows/bundle.yaml

@@ -44,11 +44,11 @@ jobs:
 
       - name: Bundle nanoarrow_ipc
         run: |
-          cd extensions/nanoarrow_ipc
+          rm -rf build
           mkdir build && cd build
-          cmake .. -DNANOARROW_IPC_BUNDLE=ON
+          cmake .. -DNANOARROW_BUNDLE=ON -DNANOARROW_IPC=ON
           cmake --build .
-          cmake --install . --prefix=../../../nanoarrow-latest
+          cmake --install . --prefix=../nanoarrow-latest
 
       - name: Bundle nanoarrow_device
         run: |

.github/workflows/coverage.yaml

@@ -31,7 +31,6 @@ on:
       - 'docker-compose.yml'
       - 'CMakeLists.txt'
       - 'src/nanoarrow/**'
-      - 'extensions/nanoarrow_ipc/**'
       - 'r/**'
 
 jobs:

.github/workflows/docs.yaml

@@ -29,7 +29,6 @@ on:
       - 'ci/scripts/coverage.sh'
       - 'ci/docker/ubuntu.dockerfile'
       - 'docker-compose.yml'
-      - 'extensions/nanoarrow_ipc/src/**'
       - 'src/**'
       - 'r/**'
       - 'docs/source/**'

.github/workflows/examples.yaml

@@ -90,7 +90,7 @@ jobs:
           cmake --build .
           cmake --install . --prefix=../src/nanoarrow
           mkdir ../build_ipc && cd ../build_ipc
-          cmake ../../../extensions/nanoarrow_ipc -DNANOARROW_IPC_BUNDLE=ON
+          cmake ../../.. -DNANOARROW_BUNDLE=ON -DNANOARROW_IPC=ON
           cmake --build .
           cmake --install . --prefix=../src/nanoarrow
 

.pre-commit-config.yaml

@@ -35,7 +35,7 @@ repos:
       - id: clang-format
         args: [-i]
         types_or: [c, c++]
-        exclude: "(^extensions/nanoarrow_ipc/thirdparty/.*$)|(nanoarrow_ipc_flatcc_generated.h)"
+        exclude: "(^thirdparty/.*$)|(nanoarrow_ipc_flatcc_generated.h)"
   - repo: https://github.com/cheshirekow/cmake-format-precommit
     rev: v0.6.13
     hooks:
@@ -65,7 +65,7 @@ repos:
         additional_dependencies: [tomli]
         exclude: |
             (?x)
-            ^extensions/nanoarrow_ipc/thirdparty
+            ^thirdparty
             |nanoarrow_ipc_flatcc_generated.h
             |nanoarrow_device_metal.cc
 

LICENSE.txt

@@ -203,7 +203,6 @@
 
 --------------------------------------------------------------------------------
 
-extensions/nanoarrow_ipc/thirdparty/flatcc, dist/flatcc.c,
-  and dist/flatcc: Apache 2.0
+thirdparty/flatcc, dist/flatcc.c, and dist/flatcc: Apache 2.0
 
 Copyright 2015-2023 Mikkel F. Jørgensen, dvide.com

ci/scripts/build-docs.sh

@@ -72,11 +72,6 @@ main() {
    doxygen
    popd
 
-   show_header "Run Doxygen for IPC extension"
-   pushd extensions/nanoarrow_ipc/src/apidoc
-   doxygen
-   popd
-
    show_header "Run Doxygen for device extension"
    pushd extensions/nanoarrow_device/src/apidoc
    doxygen

ci/scripts/coverage.sh

@@ -81,11 +81,9 @@ function main() {
 
     # Build + run tests with gcov for IPC extension
     show_header "Build + test nanoarrow_ipc"
-    mkdir "${SANDBOX_DIR}/nanoarrow_ipc"
-    pushd "${SANDBOX_DIR}/nanoarrow_ipc"
 
-    cmake "${TARGET_NANOARROW_DIR}/extensions/nanoarrow_ipc" \
-        -DNANOARROW_IPC_BUILD_TESTS=ON -DNANOARROW_IPC_CODE_COVERAGE=ON
+    cmake "${TARGET_NANOARROW_DIR}" \
+        -DNANOARROW_IPC=ON -DNANOARROW_BUILD_TESTS=ON -DNANOARROW_CODE_COVERAGE=ON
     cmake --build .
     CTEST_OUTPUT_ON_FAILURE=1 ctest .
 

dev/release/rat_exclude_files.txt

@@ -12,6 +12,6 @@ r/tests/testthat/_snaps/*.md
 r/cran-comments.md
 dist/flatcc/*
 dist/flatcc.c
-extensions/nanoarrow_ipc/src/nanoarrow/nanoarrow_ipc_flatcc_generated.h
-extensions/nanoarrow_ipc/thirdparty/*
+src/nanoarrow/nanoarrow_ipc_flatcc_generated.h
+thirdparty/*
 python/src/nanoarrow/dlpack_abi.h

dev/release/verify-release-candidate.sh

@@ -246,17 +246,15 @@ test_c() {
   test_cmake_project build . -DNANOARROW_BUILD_TESTS=ON
 
   show_header "Build and test C IPC extension"
-  test_cmake_project build-ipc extensions/nanoarrow_ipc -DNANOARROW_IPC_BUILD_TESTS=ON
+  test_cmake_project build . -DNANOARROW_BUILD_TESTS=ON -DNANOARROW_IPC=ON
 }
 
 test_c_bundled() {
   show_header "Build test bundled C library"
   test_cmake_project build-bundled . -DNANOARROW_BUILD_TESTS=ON -DNANOARROW_BUNDLE=ON
 
   show_header "Build and test bundled C IPC extension"
-  test_cmake_project build-ipc extensions/nanoarrow_ipc \
-    -DNANOARROW_IPC_BUILD_TESTS=ON \
-    -DNANOARROW_IPC_BUNDLE=ON
+  test_cmake_project build-ipc . -DNANOARROW_BUILD_TESTS=ON -DNANOARROW_BUNDLE=ON
 }
 
 test_r() {

docs/source/conf.py

@@ -66,7 +66,7 @@ def get_version():
 # Breathe configuration
 breathe_projects = {
     "nanoarrow_c": "../../src/apidoc/xml",
-    "nanoarrow_ipc": "../../extensions/nanoarrow_ipc/src/apidoc/xml",
+    "nanoarrow_ipc": "../../src/apidoc/xml",
     "nanoarrow_device": "../../extensions/nanoarrow_device/src/apidoc/xml",
 }
 breathe_default_project = "nanoarrow_c"

examples/cmake-ipc/CMakeLists.txt

@@ -31,8 +31,8 @@ fetchcontent_declare(# The name 'nanoarrow' is important here: it allows the IPC
                      SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/../..)
 fetchcontent_makeavailable(nanoarrow)
 
-fetchcontent_declare(nanoarrow_ipc_example_cmake
-                     SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/../../extensions/nanoarrow_ipc)
+fetchcontent_declare(nanoarrow_ipc_example_cmake SOURCE_DIR
+                                                 ${CMAKE_CURRENT_LIST_DIR}/../../)
 fetchcontent_makeavailable(nanoarrow_ipc_example_cmake)
 
 # Add the library and link it against nanoarrow and nanoarrow_ipc

examples/vendored-ipc/README.md

@@ -64,7 +64,7 @@ popd
 # Then, build and install nanoarrow_ipc
 mkdir build_ipc
 pushd build_ipc
-cmake ../../../extensions/nanoarrow_ipc -DNANOARROW_IPC_BUNDLE=ON
+cmake ../../.. -DNANOARROW_BUNDLE=ON -DNANOARROW_IPC=ON
 cmake --build .
 cmake --install . --prefix=../src/nanoarrow
 popd

python/bootstrap.py

@@ -230,9 +230,7 @@ def copy_or_generate_nanoarrow_c():
             dst[device_file],
         )
 
-    ipc_source_dir = source_dir / "extensions/nanoarrow_ipc"
-
-    for cmake_project in [source_dir, ipc_source_dir]:
+    for cmake_project in [source_dir, source_dir]:
         with tempfile.TemporaryDirectory() as build_dir:
             try:
                 subprocess.run(
@@ -242,8 +240,8 @@ def copy_or_generate_nanoarrow_c():
                         build_dir,
                         "-S",
                         cmake_project,
-                        "-DNANOARROW_IPC_BUNDLE=ON",
                         "-DNANOARROW_BUNDLE=ON",
+                        "-DNANOARROW_IPC=ON",
                         "-DNANOARROW_NAMESPACE=PythonPkg",
                     ]
                 )