Skip to content

Commit af8861f

Browse files
authored
Pin version to 0.0.7 (#104)
Set fixed version in pyproject.toml for next release. setuptools_scm is not working in CI for some reason; there, it only generates wheels tagged `tiledb_vector_search-0.1.dev1...`. cibuildwheel works fine locally and generates wheels with correct tag `0.0.7.dev...`. It might be due to different pwd when cibuildwheel is executed from the action, but I haven't managed to make it work yet: ``` 2023-07-26T18:19:07.3024980Z Source in ./apis/python has version 0.1.dev1+g650af29, which satisfies requirement tiledb-vector-search==0.1.dev1+g650af29 from file:///Users/runner/work/TileDB-Vector-Search/TileDB-Vector-Search/apis/python ``` Also create branch filters for the wheel build job to avoid excess storage use.
1 parent 650af29 commit af8861f

File tree

4 files changed

+15
-10
lines changed

4 files changed

+15
-10
lines changed

.github/workflows/build_wheels.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
name: Build wheels
22

3-
on: [push, pull_request]
3+
on:
4+
push:
5+
branches:
6+
- release-*
7+
- refs/tags/*
8+
pull_request:
9+
branches:
10+
- '*wheel*' # must quote since "*" is a YAML reserved character; we want a string
411

512
jobs:
613
build_wheels:
@@ -13,6 +20,7 @@ jobs:
1320

1421
steps:
1522
- uses: actions/checkout@v3
23+
1624
- name: 'Brew setup on macOS' # x-ref c8e49ba8f8b9ce
1725
if: ${{ startsWith(matrix.os, 'macos-') == true }}
1826
run: |

apis/python/pyproject.toml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
[project]
22
name = "tiledb-vector-search"
3-
dynamic = ["version"]
3+
version = "0.0.7"
4+
#dynamic = ["version"]
45
description = "TileDB Vector Search Python client"
56
license = { text = "MIT" }
67
readme = "./README.md"
@@ -33,21 +34,19 @@ repository = "https://github.com/TileDB-Inc/tiledb-vector-search"
3334

3435
[build-system]
3536
requires = [
36-
"setuptools>=42", "wheel", "setuptools_scm>=6",
37+
"setuptools>=42", "wheel", "setuptools_scm[toml]>=6",
3738
"scikit-build>=0.13", "pybind11[global]>=2.10",
3839
"cmake"
3940
]
4041
build-backend = "setuptools.build_meta"
4142

4243
[tool.setuptools]
4344
zip-safe = false
44-
45-
[tool.setuptools.packages.find]
46-
where = ["src"]
45+
#packages = ["tiledb.vector_search"]
4746

4847
[tool.setuptools_scm]
4948
root = "../.."
50-
write_to = "apis/python/src/tiledb/vector_search/version.py"
49+
#write_to = "apis/python/src/tiledb/vector_search/version.py"
5150

5251
[tool.ruff]
5352
extend-select = ["I"]

apis/python/setup.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,4 +62,5 @@ def get_cmake_overrides():
6262
cmake_args=cmake_args,
6363
cmake_install_target="install-libtiledbvectorsearch",
6464
cmake_install_dir="src/tiledb/vector_search",
65+
use_scm_version={"root": "../../", "relative_to": __file__},
6566
)

src/cmake/Superbuild.cmake

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,14 +67,11 @@ set(INHERITED_CMAKE_ARGS
6767
-DBUILD_TESTS=${BUILD_TESTS}
6868
-DPython_FIND_REGISTRY=${Python_FIND_REGISTRY}
6969
-DPYTHON_VERSION_STRING=${PYTHON_VERSION_STRING}
70-
-DPYTHON_EXECUTABLE=${PYTHON_EXECUTABLE}
7170
-DPYTHON_LIBRARY=${PYTHON_LIBRARY}
7271
-DPYTHON_INCLUDE_DIR=${PYTHON_INCLUDE_DIR}
7372
-DPython_EXECUTABLE=${Python_EXECUTABLE}
7473
-DPython_ROOT_DIR=${Python_ROOT_DIR}
7574
-DPython_INCLUDE_DIR=${Python_INCLUDE_DIR}
76-
-DPython3_EXECUTABLE=${Python3_EXECUTABLE}
77-
-DPython3_ROOT_DIR=${Python3_ROOT_DIR}
7875
-DPython3_FIND_REGISTRY=${Python3_FIND_REGISTRY}
7976
-DPython3_INCLUDE_DIR=${Python3_INCLUDE_DIR}
8077
-Dpybind11_DIR=${pybind11_DIR}

0 commit comments

Comments
 (0)