iterating [skip ci]

single-cell-data · Nov 22, 2024 · 9ed772a · 9ed772a
1 parent bf75568
commit 9ed772a
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/.github/workflows/libtiledb-ci.yml b/.github/workflows/libtiledb-ci.yml
@@ -19,7 +19,7 @@ jobs:
     - name: Checkout TileDB-SOMA
       uses: actions/checkout@v4
     - name: Build libTileDB-SOMA
-      run: TILEDBSOMA_COVERAGE="--coverage" ./scripts/bld --no-tiledb-deprecated=true --werror=true
+      run: TILEDBSOMA_COVERAGE="--coverage" ./scripts/bld --werror=true
     - name: Run libTileDB-SOMA unittests
       run: ctest --test-dir build/libtiledbsoma -C Release --verbose --rerun-failed --output-on-failure
     - name: Upload coverage to Codecov

diff --git a/.github/workflows/python-ci-single.yml b/.github/workflows/python-ci-single.yml
@@ -104,7 +104,7 @@ jobs:
 #        key: libtiledbsoma-build-dist-${{ inputs.os }}-${{ inputs.python_version }}-${{ hashFiles('libtiledbsoma', 'scripts/bld') }}
 
     - name: Install tiledbsoma
-      run: pip -v install -e apis/python[all] -C "--build-option=--no-tiledb-deprecated"
+      run: pip -v install -e apis/python[all]
       env:
         CC: ${{ inputs.cc }}
         CXX: ${{ inputs.cxx }}

diff --git a/.github/workflows/r-python-interop-testing.yml b/.github/workflows/r-python-interop-testing.yml
@@ -77,7 +77,7 @@ jobs:
           cache-dependency-path: ./apis/python/setup.py
 
       - name: Install tiledbsoma
-        run: pip -v install -e apis/python[all] -C "--build-option=--no-tiledb-deprecated "
+        run: pip -v install -e apis/python[all]
 
       - name: Show Python package versions
         run: |

diff --git a/libtiledbsoma/src/CMakeLists.txt b/libtiledbsoma/src/CMakeLists.txt
@@ -108,7 +108,7 @@ target_link_options(TILEDB_SOMA_GEOMETRY_OBJECTS
 
 target_compile_definitions(TILEDB_SOMA_GEOMETRY_OBJECTS
   PRIVATE
-  -DTILEDB_NO_API_DEPRECATION_WARNINGS
+  -DTILEDB_REMOVE_DEPRECATIONS
 )
 
 target_compile_options(TILEDB_SOMA_GEOMETRY_OBJECTS

diff --git a/scripts/bld b/scripts/bld
@@ -11,8 +11,10 @@ arg() { echo "$1" | sed "s/^${2-[^=]*=}//" | sed "s/:/;/g"; }
 build="Release"
 prefix=""
 tiledb=""
-cmake_verbose="false"
-no_tiledb_deprecated="false"
+# XXX TEMP DO NOT COMMIT
+# cmake_verbose="false"
+cmake_verbose="true"
+allow_tiledb_deprecated="false"
 werror="false"
 
 while test $# != 0; do
@@ -21,7 +23,7 @@ while test $# != 0; do
   --prefix=*) prefix=$(arg "$1");;
   --tiledb=*) tiledb=$(arg "$1");;
   --cmake-verbose=*) cmake_verbose=$(arg "$1");;
-  --no-tiledb-deprecated=*) no_tiledb_deprecated=$(arg "$1");;
+  --allow-tiledb-deprecated=*) allow_tiledb_deprecated=$(arg "$1");;
   --werror=*) werror=$(arg "$1");;
   esac
   shift
@@ -70,7 +72,7 @@ elif [ "$werror" = "true" ]; then
 
 fi
 
-if [ "$no_tiledb_deprecated" = "true" ]; then
+if [ "$allow_tiledb_deprecated" = "true" ]; then
     extra_opts+=" -DTILEDB_REMOVE_DEPRECATIONS=OFF"
 fi