Skip to content

Commit

Permalink
refactor: move requirement files into subfolder
Browse files Browse the repository at this point in the history
  • Loading branch information
eginhard committed May 6, 2024
1 parent 3826db6 commit 1fbe4dc
Show file tree
Hide file tree
Showing 11 changed files with 26 additions and 34 deletions.
4 changes: 2 additions & 2 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
include README.md
include LICENSE.txt
include requirements.*.txt
include requirements/requirements.*.txt
include *.cff
include requirements.txt
include requirements/requirements.txt
include TTS/VERSION
recursive-include TTS *.json
recursive-include TTS *.html
Expand Down
7 changes: 2 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -60,19 +60,16 @@ system-deps: ## install linux system deps
sudo apt-get install -y libsndfile1-dev

dev-deps: ## install development deps
pip install -r requirements.dev.txt
pip install -r requirements/requirements.dev.txt

doc-deps: ## install docs dependencies
pip install -r docs/requirements.txt

build-docs: ## build the docs
cd docs && make clean && make build

hub-deps: ## install deps for torch hub use
pip install -r requirements.hub.txt

deps: ## install 🐸 requirements.
pip install -r requirements.txt
pip install -r requirements/requirements.txt

install: ## install 🐸 TTS for development.
pip install -e .[all]
Expand Down
13 changes: 7 additions & 6 deletions dockerfiles/Dockerfile.dev
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,11 @@ COPY \
Makefile \
pyproject.toml \
setup.py \
requirements.dev.txt \
requirements.ja.txt \
requirements.notebooks.txt \
requirements.txt \
requirements/requirements.dev.txt \
requirements/requirements.ja.txt \
requirements/requirements.notebooks.txt \
requirements/requirements.server.txt \
requirements/requirements.txt \
/root/

# Install Project Dependencies
Expand All @@ -34,11 +35,11 @@ RUN pip install \
-r requirements.txt \
-r requirements.dev.txt \
-r requirements.ja.txt \
-r requirements.notebooks.txt
-r requirements.notebooks.txt \
-r requirements.server.txt

# Copy TTS repository contents:
COPY . /root

# Installing the TTS package itself:
RUN make install

2 changes: 1 addition & 1 deletion recipes/bel-alex73/docker-prepare-start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ set -x

cd $( dirname -- "$0"; )

cp ../../requirements*.txt docker-prepare/
cp ../../requirements/requirements*.txt docker-prepare/

docker build -t tts-learn -f docker-prepare/Dockerfile docker-prepare/

Expand Down
2 changes: 1 addition & 1 deletion recipes/bel-alex73/docker-prepare/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ RUN apt -y upgrade
RUN apt -y install --no-install-recommends pip ffmpeg openjdk-19-jre-headless

RUN mkdir /a/
ADD requirements*.txt /a/
ADD requirements/requirements*.txt /a/
WORKDIR /a/
RUN pip install -r requirements.txt -r requirements.dev.txt -r requirements.notebooks.txt
RUN pip install seaborn pydub notebook
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
1 change: 1 addition & 0 deletions requirements/requirements.server.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
flask>=2.0.1
File renamed without changes.
31 changes: 12 additions & 19 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,10 @@
# .,*++++::::::++++*,.
# ``````

import os
import itertools
import subprocess
import sys
from pathlib import Path

import numpy
import setuptools.command.build_py
Expand All @@ -33,8 +34,8 @@
if sys.version_info < (3, 9) or sys.version_info >= (3, 13):
raise RuntimeError("Trainer requires python >= 3.6 and <3.13 " "but your Python version is {}".format(sys.version))

cwd = os.path.dirname(os.path.abspath(__file__))
with open(os.path.join(cwd, "TTS", "VERSION")) as fin:
cwd = Path(__file__).resolve().parent
with open(cwd / "TTS" / "VERSION") as fin:
version = fin.read().strip()


Expand All @@ -56,15 +57,13 @@ def pip_install(package_name):
subprocess.call([sys.executable, "-m", "pip", "install", package_name])


requirements = open(os.path.join(cwd, "requirements.txt"), "r").readlines()
with open(os.path.join(cwd, "requirements.notebooks.txt"), "r") as f:
requirements_notebooks = f.readlines()
with open(os.path.join(cwd, "requirements.dev.txt"), "r") as f:
requirements_dev = f.readlines()
with open(os.path.join(cwd, "requirements.ja.txt"), "r") as f:
requirements_ja = f.readlines()
requirements_server = ["flask>=2.0.1"]
requirements_all = requirements_dev + requirements_notebooks + requirements_ja + requirements_server
rdir = cwd / "requirements"
requirements = open(rdir / "requirements.txt").readlines()
extra_requirements = {}
for extra in ("dev", "notebooks", "server", "ja"):
with open(rdir / f"requirements.{extra}.txt") as f:
extra_requirements[extra] = f.readlines()
extra_requirements["all"] = itertools.chain(extra_requirements.values())

with open("README.md", "r", encoding="utf-8") as readme_file:
README = readme_file.read()
Expand Down Expand Up @@ -111,13 +110,7 @@ def pip_install(package_name):
# 'build_ext': build_ext
},
install_requires=requirements,
extras_require={
"all": requirements_all,
"dev": requirements_dev,
"notebooks": requirements_notebooks,
"server": requirements_server,
"ja": requirements_ja,
},
extras_require=extra_requirements,
python_requires=">=3.9.0, <3.13",
entry_points={"console_scripts": ["tts=TTS.bin.synthesize:main", "tts-server = TTS.server.server:main"]},
classifiers=[
Expand Down

0 comments on commit 1fbe4dc

Please sign in to comment.