Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Save new-shape feature-flag enable for 1.15.0 #3260

Merged
merged 1 commit into from
Oct 30, 2024
Merged

Save new-shape feature-flag enable for 1.15.0 #3260

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/python-ci-single.yml
View file
Open in desktop
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: 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
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: 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: 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=true; 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
View file
Open in desktop
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: export SOMA_R_NEW_SHAPE=false && cd apis/r/tests && Rscript testthat.R
run: 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: cd apis/r/tests && Rscript testthat.R
run: export SOMA_R_NEW_SHAPE=true && 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
View file
Open in desktop
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") != "false"
NEW_SHAPE_FEATURE_FLAG_ENABLED = os.getenv("SOMA_PY_NEW_SHAPE") is not None
6 changes: 3 additions & 3 deletions apis/r/R/Init.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,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") == "false") {
.pkgenv[["use_current_domain_transitional_internal_only"]] <- FALSE
} else {
if (Sys.getenv("SOMA_R_NEW_SHAPE") != "") {
.pkgenv[["use_current_domain_transitional_internal_only"]] <- TRUE
} else {
.pkgenv[["use_current_domain_transitional_internal_only"]] <- FALSE
}
}

Expand Down
Loading