Reorganize tox

spotify · Oct 1, 2023 · e2dd22b · e2dd22b
1 parent 0e6c23b
commit e2dd22b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -74,5 +74,5 @@ universal = true
 requires = [
 	"setuptools>=40.8.0",
 	"wheel",
-	"cython",
+	"cython<3",
 ]
diff --git a/tox.ini b/tox.ini
@@ -1,24 +1,24 @@
 [tox]
-envlist = py37,py38,py39,py310,minimal,manifest,check-formatting,lint,mypy
+envlist = py37,py38,py39,py310,py311,full,manifest,check-formatting,lint,mypy
 skipsdist = True
 usedevelop = True
 
-# Tests with TF
+# Tests with the minimal package (either coreml/onnx/tflite)
 [testenv]
-deps = -e .[dev]
+deps = -e .[test]
 commands =
-    pytest tests {posargs}
+    pytest tests --ignore tests/test_nn.py {posargs}
 setenv =
     SOURCE = {toxinidir}/basic_pitch
     TEST_SOURCE = {toxinidir}/tests
     LINE_LENGTH = "120"
 
-# Tests with the minimal package (either coreml/onnx/tflite)
-[testenv:minimal]
-deps = -e .[test]
-basepython=3.10
+# Tests with TF
+[testenv:full]
+deps = -e .[dev]
+basepython=3.8
 commands =
-    pytest tests --ignore tests/test_nn.py {posargs}
+    pytest tests {posargs}
 setenv =
     SOURCE = {toxinidir}/basic_pitch
     TEST_SOURCE = {toxinidir}/tests