Skip to content

Commit b916f6d

Browse files
committed
PR comments/fixes
1 parent dbb8fba commit b916f6d

File tree

5 files changed

+2
-25
lines changed

5 files changed

+2
-25
lines changed

.github/workflows/ci-r-python-interop.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,6 @@ jobs:
125125
fi
126126
127127
- name: Install tiledbsoma
128-
# TILEDB_REMOVE_DEPRECATIONS is already set to ON in pyproject.toml
129128
run: pip -v install -e apis/python[all]
130129

131130
- name: Show Python package versions

.github/workflows/python-dependency-variation.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@ jobs:
102102
fi
103103
104104
- name: Install tiledbsoma
105-
# TILEDB_REMOVE_DEPRECATIONS is already set to ON in pyproject.toml
106105
run: pip -v install -e apis/python[all]
107106
env:
108107
CC: ${{ matrix.cc }}

.github/workflows/python-remote-storage.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -96,14 +96,7 @@ jobs:
9696
# If you'reiterating on the testing framework itself, install from PyPI to avoid the
9797
# time-consuming build. If you're trying to evaluate the code modified by a PR,
9898
# install from source.
99-
#
100-
# From PyPI:
101-
# run: pip install tiledbsoma==1.15.7
102-
#
103-
# From source:
104-
# TILEDB_REMOVE_DEPRECATIONS is already set to ON in pyproject.toml
10599
run: pip -v install -e apis/python[all]
106-
#
107100
env:
108101
CC: ${{ matrix.cc }}
109102

.github/workflows/test-python.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ jobs:
9191
uses: actions/download-artifact@v4
9292
with:
9393
name: cpp-build-release-${{ inputs.os }}
94-
continue-on-error: true
9594

9695
- name: Set up test data
9796
run: make data
@@ -104,7 +103,6 @@ jobs:
104103
cache-dependency-path: ./apis/python/pyproject.toml
105104

106105
- name: Install tiledbsoma
107-
# TILEDB_REMOVE_DEPRECATIONS is already set to ON in pyproject.toml
108106
run: pip -v install -e apis/python[all]
109107
env:
110108
CC: ${{ inputs.cc }}

apis/python/CMakeLists.txt

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -37,17 +37,15 @@ if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/tiledbsoma/_version.py")
3737
set(VERSION_STRING "${CMAKE_MATCH_1}")
3838
message(STATUS "Package version (from setuptools_scm): ${VERSION_STRING}")
3939
else()
40-
set(VERSION_STRING "0.0.0.dev0")
41-
message(WARNING "Could not parse version from _version.py, using default")
40+
message(FATAL_ERROR "Could not parse version from _version.py")
4241
endif()
4342
elseif(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/RELEASE-VERSION")
4443
# Fallback to RELEASE-VERSION file if it exists (matches version.py convention)
4544
file(READ "${CMAKE_CURRENT_SOURCE_DIR}/RELEASE-VERSION" VERSION_STRING)
4645
string(STRIP "${VERSION_STRING}" VERSION_STRING)
4746
message(STATUS "Package version (from RELEASE-VERSION file): ${VERSION_STRING}")
4847
else()
49-
set(VERSION_STRING "0.0.0.dev0")
50-
message(WARNING "No version file found, using default version")
48+
message(FATAL_ERROR "No version file found, using default version")
5149
endif()
5250

5351
# Build libtiledbsoma using ExternalProject
@@ -304,11 +302,6 @@ elseif(UNIX)
304302
message(FATAL_ERROR \"Could not find libtiledbsoma.so in ${LIBTILEDBSOMA_INSTALL_PREFIX}/lib or ${LIBTILEDBSOMA_INSTALL_PREFIX}/lib64\")
305303
endif()
306304
")
307-
elseif(WIN32)
308-
install(FILES ${LIBTILEDBSOMA_INSTALL_PREFIX}/bin/tiledbsoma.dll
309-
DESTINATION tiledbsoma
310-
OPTIONAL
311-
)
312305
endif()
313306

314307
# Install TileDB shared libraries if not provided externally
@@ -333,10 +326,5 @@ if(NOT DEFINED ENV{TILEDB_PATH})
333326
message(FATAL_ERROR \"Could not find libtiledb.so in ${LIBTILEDBSOMA_INSTALL_PREFIX}/lib or ${LIBTILEDBSOMA_INSTALL_PREFIX}/lib64\")
334327
endif()
335328
")
336-
elseif(WIN32)
337-
install(FILES ${LIBTILEDBSOMA_INSTALL_PREFIX}/bin/tiledb.dll
338-
DESTINATION tiledbsoma
339-
)
340-
endif()
341329
endif()
342330

0 commit comments

Comments
 (0)