From f4c16e123e04bf34d5aceb972b9ca5bab11ff94d Mon Sep 17 00:00:00 2001 From: Behnam Robatmili Date: Mon, 8 Jan 2024 16:32:26 -0800 Subject: [PATCH] Reseting somacore version to the latest --- .github/workflows/r-python-interop-testing.yml | 3 --- apis/python/setup.py | 4 ---- apis/python/src/tiledbsoma/_experiment.py | 1 - libtiledbsoma/src/reindexer/example.py | 3 ++- 4 files changed, 2 insertions(+), 9 deletions(-) diff --git a/.github/workflows/r-python-interop-testing.yml b/.github/workflows/r-python-interop-testing.yml index 434f219495..c58aacfeda 100644 --- a/.github/workflows/r-python-interop-testing.yml +++ b/.github/workflows/r-python-interop-testing.yml @@ -59,9 +59,6 @@ jobs: FILE=$(ls -1t *.tar.gz | head -n 1) R CMD INSTALL $FILE - - name: Install tiledb - run: Rscript -e 'remotes::install_version("tiledb", "0.22.0")' - - name: Show R package versions run: Rscript -e 'tiledbsoma::show_package_versions()' diff --git a/apis/python/setup.py b/apis/python/setup.py index 968f26ae81..78f475870e 100644 --- a/apis/python/setup.py +++ b/apis/python/setup.py @@ -40,7 +40,6 @@ import version # noqa E402 - # tiledb_dir and libtiledbsoma_dir may be specified by either environment variable # or command-line argument. If both are provided, the latter wins. @@ -296,9 +295,6 @@ def run(self): "scipy", "somacore==1.0.7", "tiledb~=0.25.0", - # "somacore==1.0.4", # temporarily change for this PR! TODO will be reversed before landing - "somacore @ git+https://github.com/single-cell-data/SOMA.git@b47bbc87f6fa37aed6a7b30c3ac0ddca4bc9fc6c", - "tiledb~=0.24.0", "typing-extensions", # Note "-" even though `import typing_extensions` ], extras_require={ diff --git a/apis/python/src/tiledbsoma/_experiment.py b/apis/python/src/tiledbsoma/_experiment.py index 4b15bc86a2..c2b3c94936 100644 --- a/apis/python/src/tiledbsoma/_experiment.py +++ b/apis/python/src/tiledbsoma/_experiment.py @@ -76,7 +76,6 @@ def _set_create_metadata(cls, handle: Wrapper[Any]) -> None: handle.metadata["dataset_type"] = "soma" return super()._set_create_metadata(handle) - # in tiledbsoma def axis_query( # type: ignore self, measurement_name: str, diff --git a/libtiledbsoma/src/reindexer/example.py b/libtiledbsoma/src/reindexer/example.py index b07f020cb9..1bf6ca5b9f 100644 --- a/libtiledbsoma/src/reindexer/example.py +++ b/libtiledbsoma/src/reindexer/example.py @@ -18,4 +18,5 @@ def main(): print(f"End to end time {t2 - t1}") -main() +if __name__ == "__main__": + main()