From b6469a547e6550cfd2c3336f60f5e3978f1236b5 Mon Sep 17 00:00:00 2001 From: Kolja Beigel Date: Thu, 3 Oct 2024 13:02:31 +0200 Subject: [PATCH 1/5] Update pyproject.toml --- pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 3919d1d0f3..e09c79ab30 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,8 +1,8 @@ [build-system] requires = [ - "setuptools", + "setuptools<74", "setuptools-scm", - "cython~=0.29.30", + "cython", "numpy>=2.0.0", ] build-backend = "setuptools.build_meta" From 595ac6fda3f0731c3c35718ed676a15db36a821d Mon Sep 17 00:00:00 2001 From: Kolja Beigel Date: Thu, 3 Oct 2024 17:08:10 +0200 Subject: [PATCH 2/5] Update pyproject.toml --- pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index e09c79ab30..bffb4134e1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [build-system] requires = [ - "setuptools<74", + "setuptools", "setuptools-scm", "cython", "numpy>=2.0.0", @@ -44,7 +44,7 @@ classifiers = [ ] dependencies = [ # Core - "numpy>=1.25.2", + "numpy>=1.25.2,<2", "cython>=0.29.30", "scipy>=1.11.2", "torch>=2.4", From fb5bc0c91ca059c1cf677b461c185f96bc6cea69 Mon Sep 17 00:00:00 2001 From: Kolja Beigel Date: Thu, 3 Oct 2024 18:08:23 +0200 Subject: [PATCH 3/5] Update pyproject.toml --- pyproject.toml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index bffb4134e1..5c7c2a3e12 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -45,7 +45,7 @@ classifiers = [ dependencies = [ # Core "numpy>=1.25.2,<2", - "cython>=0.29.30", + "cython==3.0.11", # Added exact version "scipy>=1.11.2", "torch>=2.4", "torchaudio", @@ -73,7 +73,10 @@ dependencies = [ "encodec>=0.1.1", # XTTS "num2words>=0.5.11", - "spacy[ja]>=3" + "spacy[ja]==3.7.5", # Added exact version + "soxr==0.4.0", # Added exact version + "scikit-learn==1.5.1", # Added exact version + "contourpy==1.2.1", # Added exact version ] [project.optional-dependencies] From ad8c9cb1bd90ca1541201fdd25b2b9f32df39ab4 Mon Sep 17 00:00:00 2001 From: Kolja Beigel Date: Thu, 3 Oct 2024 20:25:34 +0200 Subject: [PATCH 4/5] Update pyproject.toml --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 5c7c2a3e12..9e52cd71f9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -68,7 +68,7 @@ dependencies = [ "gruut[de,es,fr]>=2.4.0", # Tortoise "einops>=0.6.0", - "transformers>=4.42.0,<4.43.0", + "transformers>=4.42.0", # Bark "encodec>=0.1.1", # XTTS From b720dbe518cd84b40161cf2e1ab1079da52746a0 Mon Sep 17 00:00:00 2001 From: Enno Hermann Date: Fri, 4 Oct 2024 11:41:38 +0200 Subject: [PATCH 5/5] build: simplify requirement restrictions --- pyproject.toml | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 9e52cd71f9..7c297fbffb 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -2,7 +2,7 @@ requires = [ "setuptools", "setuptools-scm", - "cython", + "cython>=3.0.0", "numpy>=2.0.0", ] build-backend = "setuptools.build_meta" @@ -44,8 +44,8 @@ classifiers = [ ] dependencies = [ # Core - "numpy>=1.25.2,<2", - "cython==3.0.11", # Added exact version + "numpy>=1.25.2", + "cython>=3.0.0", "scipy>=1.11.2", "torch>=2.4", "torchaudio", @@ -68,15 +68,12 @@ dependencies = [ "gruut[de,es,fr]>=2.4.0", # Tortoise "einops>=0.6.0", - "transformers>=4.42.0", + "transformers>=4.42.0,<4.43.0", # Bark "encodec>=0.1.1", # XTTS "num2words>=0.5.11", - "spacy[ja]==3.7.5", # Added exact version - "soxr==0.4.0", # Added exact version - "scikit-learn==1.5.1", # Added exact version - "contourpy==1.2.1", # Added exact version + "spacy[ja]>=3,<3.8", ] [project.optional-dependencies]