Merge branch 'main' into charles/df-iter-2

Eventual-Inc · Jun 21, 2023 · bdba77b · bdba77b
2 parents 8c9c796 + 1c49647
commit bdba77b
Show file tree

Hide file tree

Showing 94 changed files with 4,235 additions and 2,445 deletions.
diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
@@ -68,15 +68,15 @@ jobs:
     - name: Build library and Test with pytest
       run: |
         source activate
-        source <(cargo llvm-cov show-env --export-prefix)
-        export CARGO_TARGET_DIR=$CARGO_LLVM_COV_TARGET_DIR
-        export CARGO_INCREMENTAL=1
-        cargo llvm-cov clean --workspace
+        # source <(cargo llvm-cov show-env --export-prefix)
+        # export CARGO_TARGET_DIR=$CARGO_LLVM_COV_TARGET_DIR
+        # export CARGO_INCREMENTAL=1
+        # cargo llvm-cov clean --workspace
         maturin develop
         mkdir -p report-output && pytest --cov=daft --ignore tests/integration --durations=50
         coverage combine -a --data-file='.coverage' || true
         coverage xml -o ./report-output/coverage-${{ runner.os }}-${{ matrix.python-version }}-${{ matrix.daft-runner }}.xml
-        cargo llvm-cov --no-run --lcov --output-path report-output/rust-coverage-${{ runner.os }}-${{ matrix.python-version }}-${{ matrix.daft-runner }}.lcov
+        # cargo llvm-cov --no-run --lcov --output-path report-output/rust-coverage-${{ runner.os }}-${{ matrix.python-version }}-${{ matrix.daft-runner }}.lcov
       env:
         DAFT_RUNNER: ${{ matrix.daft-runner }}
 
@@ -156,10 +156,6 @@ jobs:
     - name: Build library in release mode and run TPCH integration tests
       run: |
         source activate
-        source <(cargo llvm-cov show-env --export-prefix)
-        export CARGO_TARGET_DIR=$CARGO_LLVM_COV_TARGET_DIR
-        export CARGO_INCREMENTAL=1
-        cargo llvm-cov clean --workspace
         maturin develop --release
         pytest tests/integration/ --durations=50
       env:

diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml
@@ -17,7 +17,7 @@ on:
 
 env:
   PACKAGE_NAME: getdaft
-  PYTHON_VERSION: '3.7' # to build abi3 wheels
+  PYTHON_VERSION: 3.7.16   # to build abi3 wheels
   DAFT_ANALYTICS_ENABLED: '0'
 
   IS_PUSH: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') && ( ! endsWith(github.ref, 'dev0')) }}