Merge pull request #1139 from Vidalnt/uvfix

Switch Linux environment to astral uv

Author: blaisewf

.github/workflows/pre_compiled.yml

@@ -58,69 +58,4 @@ jobs:
           path_in_repo=f'Compiled/Windows/ApplioV{version}.zip',
           repo_id=repo_id,
           token=token)
-          "
-  Linux:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        python-version: ["3.11.13"]
-
-    steps:
-      - uses: actions/checkout@v4
-      - name: Free up space on runner
-        run: |
-          sudo rm -rf /usr/share/dotnet
-          sudo rm -rf /opt/ghc
-          sudo rm -rf "/usr/local/share/boost"
-          sudo rm -rf "$AGENT_TOOLSDIRECTORY"
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v5
-        with:
-          python-version: ${{ matrix.python-version }}
-      - name: Read version from config.json
-        id: get-version
-        run: |
-          version=$(jq -r '.version' assets/config.json)
-          echo "version=$version" >> $GITHUB_OUTPUT
-      - name: Create virtual environment
-        run: |
-          pip install huggingface_hub
-          python -m venv .venv
-          . .venv/bin/activate
-          python -m ensurepip
-          python -m pip install "pip<24.1"
-          python -m pip install -r requirements.txt
-          python -m pip install torch==2.7.1 torchvision torchaudio==2.7.1 --upgrade --index-url https://download.pytorch.org/whl/cu128
-          python core.py "prerequisites" --pretraineds_hifigan "True" --models "True" --exe "True"
-          find . -type f -name '*.py[co]' -delete -o -type d -name __pycache__ -delete
-          deactivate
-          rm -f .venv/bin/Activate.ps1 .venv/bin/activate .venv/bin/activate.csh .venv/bin/activate.fish .venv/bin/pip .venv/bin/pip3 .venv/bin/pip3.10 .venv/bin/python .venv/bin/python3 .venv/bin/python3.10
-      - name: Clean up unnecessary files
-        run: |
-          rm -f LICENSE run-tensorboard.bat run-install.bat run-applio.bat run-install.sh requirements.txt .gitignore
-          rm -rf .github .git
-      - name: Create ZIP file
-        run: |
-          zip -9 -r ApplioV${{ steps.get-version.outputs.version }}.zip .
-      - name: Upload Linux Compiled
-        env:
-          HF_TOKEN: ${{ secrets.HF_TOKEN }}
-          version: ${{ steps.get-version.outputs.version }}
-        run: |
-          python -c "
-          import os
-          from huggingface_hub import login, upload_file
-
-          token = os.getenv('HF_TOKEN')
-          version = os.getenv('version')
-          login(token)
-          repo_id = 'IAHispano/Applio'
-          repo_file_path = f'ApplioV{version}.zip'
-
-          upload_file(
-          commit_message=f'{version}',
-          path_or_fileobj=repo_file_path,
-          path_in_repo=f'Compiled/Linux/ApplioV{version}.zip',
-          repo_id=repo_id,
-          token=token)
-          "
+          "

run-install.sh

@@ -13,13 +13,13 @@ log_message() {
 
 # Function to find a suitable Python version
 find_python() {
-    for py in python3.10 python3 python; do
+    for py in python3.11 python3 python; do
         if command -v "$py" > /dev/null 2>&1; then
             echo "$py"
             return
         fi
     done
-    log_message "No compatible Python installation found. Please install Python 3.10."
+    log_message "No compatible Python installation found. Please install Python 3.11."
     exit 1
 }
 
@@ -96,7 +96,8 @@ create_venv() {
     log_message "Creating virtual environment..."
     py=$(find_python)
 
-    "$py" -m venv .venv
+    curl -LsSf https://astral.sh/uv/install.sh | sh
+    uv venv .venv --python 3.11
 
     log_message "Activating virtual environment..."
     source .venv/bin/activate
@@ -115,7 +116,7 @@ create_venv() {
 
     log_message "Installing dependencies..."
     if [ -f "requirements.txt" ]; then
-        python -m pip install -r requirements.txt --extra-index-url https://download.pytorch.org/whl/cu128
+        python -m pip install -r requirements.txt --extra-index-url https://download.pytorch.org/whl/cu128 --index-strategy unsafe-best-match
     else
         log_message "requirements.txt not found. Please ensure it exists."
         exit 1
@@ -158,27 +159,27 @@ if [ "$(uname)" = "Darwin" ]; then
     # Add more detailed Python version check
     log_message "Checking Python versions..."
     log_message "python3 path: $(which python3)"
-    log_message "python3.10 path: $(which python3.10 2>/dev/null || echo 'not found')"
+    log_message "python3.11 path: $(which python3.11 2>/dev/null || echo 'not found')"
 
-    if command -v python3.10 >/dev/null 2>&1; then
-        python_version=$(python3.10 --version | awk '{print $2}' | cut -d'.' -f1,2)
+    if command -v python3.11 >/dev/null 2>&1; then
+        python_version=$(python3.11 --version | awk '{print $2}' | cut -d'.' -f1,2)
     else
         python_version=$(python3 --version | awk '{print $2}' | cut -d'.' -f1,2)
     fi
 
     log_message "Detected Python version: $python_version"
 
-    if [ "$python_version" = "3.10" ]; then
-        log_message "Found compatible Python 3.10"
+    if [ "$python_version" = "3.11" ]; then
+        log_message "Found compatible Python 3.11"
     else
-        log_message "Python version $python_version is not 3.10. Installing Python 3.10 using Homebrew..."
-        brew install python@3.10
-        export PATH="$(brew --prefix)/opt/python@3.10/bin:$PATH"
+        log_message "Python version $python_version is not 3.11. Installing Python 3.11 using Homebrew..."
+        brew install python@3.11
+        export PATH="$(brew --prefix)/opt/python@3.11/bin:$PATH"
         # Verify the installed version
         log_message "Verifying installed Python version..."
-        python_version=$(python3.10 --version | awk '{print $2}' | cut -d'.' -f1,2)
-        if [ "$python_version" != "3.10" ]; then
-            log_message "Failed to install Python 3.10. Current version: $python_version"
+        python_version=$(python3.11 --version | awk '{print $2}' | cut -d'.' -f1,2)
+        if [ "$python_version" != "3.11" ]; then
+            log_message "Failed to install Python 3.11. Current version: $python_version"
             exit 1
         fi
     fi