Skip to content

Commit

Permalink
[ci] Default the new-shape feature to enabled, still testing both (#3230
Browse files Browse the repository at this point in the history
)

* [ci] Run R/Python interop tests with new/shape flag off/on

* dataframe domain at create

* [ci] Defaut the new-shape feature to true, still testing both
  • Loading branch information
johnkerl authored Oct 24, 2024
1 parent dd2a418 commit 87975b4
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/python-ci-single.yml
Original file line number Diff line number Diff line change
Expand Up @@ -133,14 +133,14 @@ jobs:
# Setting PYTHONPATH ensures the tests load the in-tree source code under apis/python/src
# instead of the copy we `pip install`ed to site-packages above. That's needed for the code
# coverage analysis to work.
run: PYTHONPATH=$(pwd)/apis/python/src python -m pytest --cov=apis/python/src --cov-report=xml apis/python/tests -v --durations=20 --maxfail=50
run: export SOMA_PY_NEW_SHAPE=false; PYTHONPATH=$(pwd)/apis/python/src python -m pytest --cov=apis/python/src --cov-report=xml apis/python/tests -v --durations=20 --maxfail=50

- name: Run pytests for Python with new shape
shell: bash
# Setting PYTHONPATH ensures the tests load the in-tree source code under apis/python/src
# instead of the copy we `pip install`ed to site-packages above. That's needed for the code
# coverage analysis to work.
run: export SOMA_PY_NEW_SHAPE=true; PYTHONPATH=$(pwd)/apis/python/src python -m pytest --cov=apis/python/src --cov-report=xml apis/python/tests -v --durations=20 --maxfail=50
run: PYTHONPATH=$(pwd)/apis/python/src python -m pytest --cov=apis/python/src --cov-report=xml apis/python/tests -v --durations=20 --maxfail=50

- name: Report coverage to Codecov
if: inputs.report_codecov
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/r-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -150,12 +150,12 @@ jobs:

- name: Test without new shape
if: ${{ matrix.covr == 'no' }}
run: cd apis/r/tests && Rscript testthat.R
run: export SOMA_R_NEW_SHAPE=false && cd apis/r/tests && Rscript testthat.R

# https://github.com/single-cell-data/TileDB-SOMA/issues/2407
- name: Test with new shape
if: ${{ matrix.covr == 'no' }}
run: export SOMA_R_NEW_SHAPE=true && cd apis/r/tests && Rscript testthat.R
run: cd apis/r/tests && Rscript testthat.R

- name: Coverage
if: ${{ matrix.os == 'ubuntu-latest' && matrix.covr == 'yes' && github.event_name == 'workflow_dispatch' }}
Expand Down
2 changes: 1 addition & 1 deletion apis/python/src/tiledbsoma/_flags.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@
# removed once https://github.com/single-cell-data/TileDB-SOMA/issues/2407 is
# complete.

NEW_SHAPE_FEATURE_FLAG_ENABLED = os.getenv("SOMA_PY_NEW_SHAPE") is not None
NEW_SHAPE_FEATURE_FLAG_ENABLED = os.getenv("SOMA_PY_NEW_SHAPE") != "false"
6 changes: 3 additions & 3 deletions apis/r/R/Init.R
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@

# This is temporary for https://github.com/single-cell-data/TileDB-SOMA/issues/2407
# It will be removed once 2407 is complete.
if (Sys.getenv("SOMA_R_NEW_SHAPE") != "") {
.pkgenv[["use_current_domain_transitional_internal_only"]] <- TRUE
} else {
if (Sys.getenv("SOMA_R_NEW_SHAPE") == "false") {
.pkgenv[["use_current_domain_transitional_internal_only"]] <- FALSE
} else {
.pkgenv[["use_current_domain_transitional_internal_only"]] <- TRUE
}
}

Expand Down

0 comments on commit 87975b4

Please sign in to comment.