From 5f69b9a3763ad017633a27405f2ee4a8b0337c38 Mon Sep 17 00:00:00 2001 From: Alex Murkoff <413x1nkp@gmail.com> Date: Sun, 9 Jun 2024 18:56:01 +0700 Subject: [PATCH] chore(structure): rename requirements files (#14) * chore(structure): rename requirements files all of the requirements under `requirements/` have requirements-* in their name, which just looks dirty since all of the requirements are already in the `requirements` dir. therefore to have cleaner project, it's better to rename all the req files to just contain info on what each of them does * fix(unitest): update requirements file used in the unitest workflow --- .github/workflows/unitest.yml | 2 +- Dockerfile | 2 +- requirements/{requirements-amd.txt => amd.txt} | 0 requirements/{requirements-dml.txt => dml.txt} | 0 requirements/{requirements-gui-dml.txt => gui-dml.txt} | 0 requirements/{requirements-gui.txt => gui.txt} | 0 requirements/{requirements-ipex.txt => ipex.txt} | 0 requirements/{requirements.txt => main.txt} | 0 requirements/{requirements-py311.txt => py311.txt} | 0 run.sh | 2 +- 10 files changed, 3 insertions(+), 3 deletions(-) rename requirements/{requirements-amd.txt => amd.txt} (100%) rename requirements/{requirements-dml.txt => dml.txt} (100%) rename requirements/{requirements-gui-dml.txt => gui-dml.txt} (100%) rename requirements/{requirements-gui.txt => gui.txt} (100%) rename requirements/{requirements-ipex.txt => ipex.txt} (100%) rename requirements/{requirements.txt => main.txt} (100%) rename requirements/{requirements-py311.txt => py311.txt} (100%) diff --git a/.github/workflows/unitest.yml b/.github/workflows/unitest.yml index 85679ec..aa56fbe 100644 --- a/.github/workflows/unitest.yml +++ b/.github/workflows/unitest.yml @@ -25,7 +25,7 @@ jobs: python -m pip install --upgrade setuptools python -m pip install --upgrade wheel pip install torch torchvision torchaudio - pip install -r requirements/requirements.txt + pip install -r requirements/main.txt rvcmd -notrs -w 1 -notui assets/all - name: Test step 1 & 2 run: | diff --git a/Dockerfile b/Dockerfile index a16d970..1b30c7c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,7 +27,7 @@ RUN update-alternatives --install /usr/bin/python python /usr/bin/python3.9 1 COPY . . -RUN python3 -m pip install --no-cache-dir -r requirements/requirements.txt +RUN python3 -m pip install --no-cache-dir -r requirements/main.txt RUN aria2c --console-log-level=error -c -x 16 -s 16 -k 1M https://huggingface.co/lj1995/VoiceConversionWebUI/resolve/main/pretrained_v2/D40k.pth -d assets/pretrained_v2/ -o D40k.pth RUN aria2c --console-log-level=error -c -x 16 -s 16 -k 1M https://huggingface.co/lj1995/VoiceConversionWebUI/resolve/main/pretrained_v2/G40k.pth -d assets/pretrained_v2/ -o G40k.pth diff --git a/requirements/requirements-amd.txt b/requirements/amd.txt similarity index 100% rename from requirements/requirements-amd.txt rename to requirements/amd.txt diff --git a/requirements/requirements-dml.txt b/requirements/dml.txt similarity index 100% rename from requirements/requirements-dml.txt rename to requirements/dml.txt diff --git a/requirements/requirements-gui-dml.txt b/requirements/gui-dml.txt similarity index 100% rename from requirements/requirements-gui-dml.txt rename to requirements/gui-dml.txt diff --git a/requirements/requirements-gui.txt b/requirements/gui.txt similarity index 100% rename from requirements/requirements-gui.txt rename to requirements/gui.txt diff --git a/requirements/requirements-ipex.txt b/requirements/ipex.txt similarity index 100% rename from requirements/requirements-ipex.txt rename to requirements/ipex.txt diff --git a/requirements/requirements.txt b/requirements/main.txt similarity index 100% rename from requirements/requirements.txt rename to requirements/main.txt diff --git a/requirements/requirements-py311.txt b/requirements/py311.txt similarity index 100% rename from requirements/requirements-py311.txt rename to requirements/py311.txt diff --git a/run.sh b/run.sh index 3885522..80221d3 100755 --- a/run.sh +++ b/run.sh @@ -11,7 +11,7 @@ if [ -d ".venv" ]; then . .venv/bin/activate else echo "Create venv..." - requirements_file="requirements/requirements.txt" + requirements_file="requirements/main.txt" # Check if Python 3.8 is installed if ! (command -v python3.8 >/dev/null 2>&1 || pyenv versions --bare | grep -q "3.8"); then