Skip to content

Commit f3f26ac

Browse files
committed
Merge branch 'main' into feature_HNSW_tiered_index
2 parents 00a6157 + d28fe7d commit f3f26ac

File tree

4 files changed

+8
-38
lines changed

4 files changed

+8
-38
lines changed

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ endif
152152
#----------------------------------------------------------------------------------------------
153153

154154
pybind:
155-
$(SHOW)python3 -m poetry build
155+
$(SHOW)poetry build
156156
.PHONY: pybind
157157

158158
#----------------------------------------------------------------------------------------------
@@ -186,8 +186,8 @@ valgrind:
186186
#----------------------------------------------------------------------------------------------
187187

188188
flow_test:
189-
$(SHOW)$(MAKE) pybind
190-
$(SHOW)tox -e flowenv
189+
$(SHOW)poetry install
190+
$(SHOW)poetry run pytest tests/flow -v -s
191191

192192
.PHONY: flow_test
193193

pyproject.toml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
name = "VecSim"
33
version = "0.0.1"
44
description = "Python library around collection of vector similarity algorithms"
5-
build = "setup.py"
65

76
packages = [
87
{ include = 'src'}
@@ -28,8 +27,6 @@ python = "^3.8"
2827

2928
[tool.poetry.dev-dependencies]
3029
numpy = "^1.21"
31-
tox = "^3.25.0"
32-
tox-poetry = "^0.4.0"
3330
hnswlib = "^0.6.2"
3431
pytest = "^6.2.4"
3532
scipy = "^1.9.1"
@@ -39,3 +36,7 @@ h5py = "^3.7.0"
3936
[build-system]
4037
requires = ["poetry-core>=1.0.0", "setuptools"]
4138
build-backend = "poetry.core.masonry.api"
39+
40+
[tool.poetry.build]
41+
script = "setup.py"
42+
generate-setup-file = true

requirements.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
11
pip>=21.1
2-
poetry==1.1.15
3-
tox>=3.25.0
4-
tox-poetry>=0.4.1
2+
poetry==1.4.2

tox.ini

Lines changed: 0 additions & 29 deletions
This file was deleted.

0 commit comments

Comments
 (0)