Merge branch 'develop' into 'fb-leap-1490/audioultra-vs-overlays'

Workflow run: https://github.com/HumanSignal/label-studio/actions/runs/11441710066
HumanSignal · Oct 21, 2024 · 86ba083 · 86ba083
2 parents 967cc66 + 72e84da
commit 86ba083
Show file tree

Hide file tree

Showing 33 changed files with 826 additions and 1,249 deletions.
diff --git a/.github/workflows/follow-merge-upstream-repo-sync.yml b/.github/workflows/follow-merge-upstream-repo-sync.yml
@@ -82,7 +82,7 @@ jobs:
         continue-on-error: true
         uses: ./.github/actions-hub/actions/git-merge
         with:
-          base_branch: ${{ steps.get-branch.outputs.base_name }}
+          base_branch: ${{ steps.get-branch.outputs.base_branch_name }}
           head_branch: ${{ steps.get-branch.outputs.branch_name }}
           our_files: "pyproject.toml poetry.lock web"
           working_directory: "${{ env.UPSTREAM_REPO_WORKDIR }}"

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -14,15 +14,16 @@ env:
 jobs:
   run_pytest_sqlite:
     name: LS SQLite Ubuntu
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
       matrix:
         python-version:
-          - '3.8'
           - '3.9'
           - '3.10'
           - '3.11'
+          - '3.12'
+          - '3.13'
 
     env:
       DJANGO_SETTINGS_MODULE: core.settings.label_studio
@@ -54,7 +55,7 @@ jobs:
       - name: Install OS dependencies
         run: |
           sudo apt-get update
-          sudo apt-get install libffi7 libldap2-dev libsasl2-dev libssl-dev libxml2-dev libxslt-dev python3-dev
+          sudo apt-get install libffi8 libldap2-dev libsasl2-dev libssl-dev libxml2-dev libxslt-dev python3-dev
 
       - name: Set up Poetry
         uses: snok/install-poetry@v1
@@ -76,7 +77,7 @@ jobs:
 
   run_pytest_postgresql:
     name: LS PostgreSQL Ubuntu
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
       matrix:
@@ -138,7 +139,7 @@ jobs:
       - name: Install OS dependencies
         run: |
           sudo apt-get update
-          sudo apt-get install libffi7 libldap2-dev libsasl2-dev libssl-dev libxml2-dev libxslt-dev python3-dev
+          sudo apt-get install libffi8 libldap2-dev libsasl2-dev libssl-dev libxml2-dev libxslt-dev python3-dev
 
       - name: Set up Poetry
         uses: snok/install-poetry@v1
@@ -176,7 +177,6 @@ jobs:
       fail-fast: false
       matrix:
         python-version:
-          - '3.8'
           - '3.9'
 
     # required for poetry action
@@ -218,15 +218,6 @@ jobs:
       - name: Install Python dependencies
         run: poetry install --with test
 
-      - name: Fix sqlite.dll for python < 3.9
-        if: ${{ contains(matrix.python-version, '3.8') }}
-        run: |
-          set PYTHONIOENCODING=utf-8
-          set PYTHONLEGACYWINDOWSSTDIO=utf-8
-          bash -c "poetry run label-studio init my_project --agree-fix-sqlite --force-fix-sqlite"
-          cp sqlite3.dll %pythonLocation%/DLLs/sqlite3.dll
-        shell: cmd
-
       - name: Init project
         run: |
           set PYTHONIOENCODING=utf-8

diff --git a/docs/netlify.toml b/docs/netlify.toml
@@ -1,3 +1,9 @@
+[[redirects]]
+from = "/redirect/guide/*"
+to = "/guide/:splat"
+status = 301
+force = true
+
 [[redirects]]
 from = "https://heartex-docs.netlify.app/api/*"
 to = "https://app.heartex.com/docs/api/:splat"