wip

acquire-project · Jan 14, 2025 · 30acc34 · 30acc34
1 parent 98b48de
commit 30acc34
Show file tree

Hide file tree

Showing 3 changed files with 183 additions and 175 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -25,15 +25,15 @@ jobs:
       matrix:
         platform:
           - "ubuntu-latest"
-          - "windows-latest"
-          - "macos-latest"
+#          - "windows-latest"
+#          - "macos-latest"
         include:
-          - platform: "ubuntu-latest"
+          - platform: "ubuntu-22.04"
             vcpkg_triplet: "x64-linux"
-          - platform: "windows-latest"
-            vcpkg_triplet: "x64-windows-static"
-          - platform: "macos-latest"
-            vcpkg_triplet: "arm64-osx"
+#          - platform: "windows-latest"
+#            vcpkg_triplet: "x64-windows-static"
+#          - platform: "macos-latest"
+#            vcpkg_triplet: "arm64-osx"
     permissions:
       actions: write
 
@@ -64,116 +64,116 @@ jobs:
         working-directory: ${{github.workspace}}/build
         run: ctest -C ${{env.BUILD_TYPE}} -L acquire-zarr --output-on-failure
 
-  test_s3:
-    name: Test S3
-    runs-on: ubuntu-latest
-    env:
-      MINIO_ROOT_USER: admin
-      MINIO_ROOT_PASSWORD: password
-      MINIO_URL: http://localhost:9000
-      MINIO_ALIAS: myminio
-      MINIO_BUCKET: acquire-test
-      MINIO_ACCESS_KEY: acquire
-      MINIO_SECRET_KEY: 12345678
-
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          submodules: true
-          ref: ${{ github.event.pull_request.head.sha }}
-
-      - name: Install minio and mcli
-        run: |
-          apt update && apt install -y tmux wget
-          wget https://dl.min.io/server/minio/release/linux-amd64/minio -O /usr/local/bin/minio
-          wget https://dl.min.io/client/mc/release/linux-amd64/mc -O /usr/local/bin/mcli
-          chmod +x /usr/local/bin/minio
-          chmod +x /usr/local/bin/mcli
-
-      - name: Start minio in tmux
-        run: |
-          tmux new -d -s minio
-          tmux send-keys -t minio "MINIO_ROOT_USER=$MINIO_ROOT_USER MINIO_ROOT_PASSWORD=$MINIO_ROOT_PASSWORD minio server /tmp/minio --console-address :9001" Enter
-          sleep 5
-          mcli alias set $MINIO_ALIAS $MINIO_URL $MINIO_ROOT_USER $MINIO_ROOT_PASSWORD
-          mcli admin user svcacct add --access-key $MINIO_ACCESS_KEY --secret-key $MINIO_SECRET_KEY $MINIO_ALIAS $MINIO_ROOT_USER
-
-      - name: Create a bucket
-        run: |
-          mcli mb $MINIO_ALIAS/$MINIO_BUCKET
-
-      - name: Install vcpkg
-        run: |
-          git clone https://github.com/microsoft/vcpkg.git
-          cd vcpkg && ./bootstrap-vcpkg.sh
-          echo "VCPKG_ROOT=${{github.workspace}}/vcpkg" >> $GITHUB_ENV
-          echo "${{github.workspace}}/vcpkg" >> $GITHUB_PATH
-          ./vcpkg integrate install
-        shell: bash
-
-      - name: Configure CMake
-        run: |
-          cmake --preset=default
-          cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
-
-      - name: Build
-        run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
-
-      - name: Test C++
-        working-directory: ${{github.workspace}}/build
-        env:
-          ZARR_S3_ENDPOINT: ${{ env.MINIO_URL }}
-          ZARR_S3_BUCKET_NAME: ${{ env.MINIO_BUCKET }}
-          ZARR_S3_ACCESS_KEY_ID: ${{ env.MINIO_ACCESS_KEY }}
-          ZARR_S3_SECRET_ACCESS_KEY: ${{ env.MINIO_SECRET_KEY }}
-        run: ctest -C ${{env.BUILD_TYPE}} -L s3 --output-on-failure
-
-      - name: Install dependencies
-        run: python -m pip install -U pip "pybind11[global]" cmake build numpy pytest
-
-      - name: Build and install Python bindings
-        run: python -m pip install ".[testing]"
-
-      - name: Test Python
-        run: python -m pytest -v -k test_stream_data_to_s3
-        
-
-  test-python:
-    name: Test Python on ${{ matrix.platform }}
-    runs-on: ${{ matrix.platform }}
-    strategy:
-      fail-fast: false
-      matrix:
-        platform:
-          - "ubuntu-latest"
-          - "windows-latest"
-          - "macos-latest"
-
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          submodules: true
-          ref: ${{ github.event.pull_request.head.sha }}
-
-      - name: Set up Python 3.11
-        uses: actions/setup-python@v4
-        with:
-          python-version: "3.11"
-
-      - name: Install vcpkg
-        run: |
-          git clone https://github.com/microsoft/vcpkg.git
-          cd vcpkg && ./bootstrap-vcpkg.sh
-          echo "VCPKG_ROOT=${{github.workspace}}/vcpkg" >> $GITHUB_ENV
-          echo "${{github.workspace}}/vcpkg" >> $GITHUB_PATH
-          ./vcpkg integrate install
-        shell: bash
-
-      - name: Install dependencies
-        run: python -m pip install -U pip "pybind11[global]" cmake build numpy pytest
-
-      - name: Build and install Python bindings
-        run: python -m pip install ".[testing]"
-
-      - name: Run tests
-        run: python -m pytest -v
+#  test_s3:
+#    name: Test S3
+#    runs-on: ubuntu-latest
+#    env:
+#      MINIO_ROOT_USER: admin
+#      MINIO_ROOT_PASSWORD: password
+#      MINIO_URL: http://localhost:9000
+#      MINIO_ALIAS: myminio
+#      MINIO_BUCKET: acquire-test
+#      MINIO_ACCESS_KEY: acquire
+#      MINIO_SECRET_KEY: 12345678
+#
+#    steps:
+#      - uses: actions/checkout@v3
+#        with:
+#          submodules: true
+#          ref: ${{ github.event.pull_request.head.sha }}
+#
+#      - name: Install minio and mcli
+#        run: |
+#          apt update && apt install -y tmux wget
+#          wget https://dl.min.io/server/minio/release/linux-amd64/minio -O /usr/local/bin/minio
+#          wget https://dl.min.io/client/mc/release/linux-amd64/mc -O /usr/local/bin/mcli
+#          chmod +x /usr/local/bin/minio
+#          chmod +x /usr/local/bin/mcli
+#
+#      - name: Start minio in tmux
+#        run: |
+#          tmux new -d -s minio
+#          tmux send-keys -t minio "MINIO_ROOT_USER=$MINIO_ROOT_USER MINIO_ROOT_PASSWORD=$MINIO_ROOT_PASSWORD minio server /tmp/minio --console-address :9001" Enter
+#          sleep 5
+#          mcli alias set $MINIO_ALIAS $MINIO_URL $MINIO_ROOT_USER $MINIO_ROOT_PASSWORD
+#          mcli admin user svcacct add --access-key $MINIO_ACCESS_KEY --secret-key $MINIO_SECRET_KEY $MINIO_ALIAS $MINIO_ROOT_USER
+#
+#      - name: Create a bucket
+#        run: |
+#          mcli mb $MINIO_ALIAS/$MINIO_BUCKET
+#
+#      - name: Install vcpkg
+#        run: |
+#          git clone https://github.com/microsoft/vcpkg.git
+#          cd vcpkg && ./bootstrap-vcpkg.sh
+#          echo "VCPKG_ROOT=${{github.workspace}}/vcpkg" >> $GITHUB_ENV
+#          echo "${{github.workspace}}/vcpkg" >> $GITHUB_PATH
+#          ./vcpkg integrate install
+#        shell: bash
+#
+#      - name: Configure CMake
+#        run: |
+#          cmake --preset=default
+#          cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
+#
+#      - name: Build
+#        run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
+#
+#      - name: Test C++
+#        working-directory: ${{github.workspace}}/build
+#        env:
+#          ZARR_S3_ENDPOINT: ${{ env.MINIO_URL }}
+#          ZARR_S3_BUCKET_NAME: ${{ env.MINIO_BUCKET }}
+#          ZARR_S3_ACCESS_KEY_ID: ${{ env.MINIO_ACCESS_KEY }}
+#          ZARR_S3_SECRET_ACCESS_KEY: ${{ env.MINIO_SECRET_KEY }}
+#        run: ctest -C ${{env.BUILD_TYPE}} -L s3 --output-on-failure
+#
+#      - name: Install dependencies
+#        run: python -m pip install -U pip "pybind11[global]" cmake build numpy pytest
+#
+#      - name: Build and install Python bindings
+#        run: python -m pip install ".[testing]"
+#
+#      - name: Test Python
+#        run: python -m pytest -v -k test_stream_data_to_s3
+#
+#
+#  test-python:
+#    name: Test Python on ${{ matrix.platform }}
+#    runs-on: ${{ matrix.platform }}
+#    strategy:
+#      fail-fast: false
+#      matrix:
+#        platform:
+#          - "ubuntu-latest"
+#          - "windows-latest"
+#          - "macos-latest"
+#
+#    steps:
+#      - uses: actions/checkout@v3
+#        with:
+#          submodules: true
+#          ref: ${{ github.event.pull_request.head.sha }}
+#
+#      - name: Set up Python 3.11
+#        uses: actions/setup-python@v4
+#        with:
+#          python-version: "3.11"
+#
+#      - name: Install vcpkg
+#        run: |
+#          git clone https://github.com/microsoft/vcpkg.git
+#          cd vcpkg && ./bootstrap-vcpkg.sh
+#          echo "VCPKG_ROOT=${{github.workspace}}/vcpkg" >> $GITHUB_ENV
+#          echo "${{github.workspace}}/vcpkg" >> $GITHUB_PATH
+#          ./vcpkg integrate install
+#        shell: bash
+#
+#      - name: Install dependencies
+#        run: python -m pip install -U pip "pybind11[global]" cmake build numpy pytest
+#
+#      - name: Build and install Python bindings
+#        run: python -m pip install ".[testing]"
+#
+#      - name: Run tests
+#        run: python -m pytest -v
diff --git a/tests/unit-tests/CMakeLists.txt b/tests/unit-tests/CMakeLists.txt
@@ -1,31 +1,31 @@
 set(project acquire-zarr)
 
 set(tests
-        create-stream
-        array-dimensions-chunk-lattice-index
-        array-dimensions-tile-group-offset
-        array-dimensions-chunk-internal-offset
-        array-dimensions-shard-index-for-chunk
-        array-dimensions-shard-internal-index
-        thread-pool-push-to-job-queue
-        s3-connection-bucket-exists
-        s3-connection-object-exists-check-false-positives
-        s3-connection-put-object
-        s3-connection-upload-multipart-object
-        file-sink-write
-        s3-sink-write
-        s3-sink-write-multipart
-        sink-creator-make-metadata-sinks
-        sink-creator-make-data-sinks
-        array-writer-downsample-writer-config
-        array-writer-write-frame-to-chunks
-        zarrv2-writer-write-even
+#        create-stream
+#        array-dimensions-chunk-lattice-index
+#        array-dimensions-tile-group-offset
+#        array-dimensions-chunk-internal-offset
+#        array-dimensions-shard-index-for-chunk
+#        array-dimensions-shard-internal-index
+#        thread-pool-push-to-job-queue
+#        s3-connection-bucket-exists
+#        s3-connection-object-exists-check-false-positives
+#        s3-connection-put-object
+#        s3-connection-upload-multipart-object
+#        file-sink-write
+#        s3-sink-write
+#        s3-sink-write-multipart
+#        sink-creator-make-metadata-sinks
+#        sink-creator-make-data-sinks
+#        array-writer-downsample-writer-config
+#        array-writer-write-frame-to-chunks
+#        zarrv2-writer-write-even
         zarrv2-writer-write-ragged-append-dim
-        zarrv2-writer-write-ragged-internal-dim
-        zarrv3-writer-write-even
-        zarrv3-writer-write-ragged-append-dim
-        zarrv3-writer-write-ragged-internal-dim
-        vectorized-file-write
+#        zarrv2-writer-write-ragged-internal-dim
+#        zarrv3-writer-write-even
+#        zarrv3-writer-write-ragged-append-dim
+#        zarrv3-writer-write-ragged-internal-dim
+#        vectorized-file-write
 )
 
 foreach (name ${tests})