Merge branch 'main' into feat/dropFileTypeRestriction

deepset-ai · Feb 11, 2025 · f578070 · f578070
2 parents a59e19d + 35eb319
commit f578070
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 4 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -7,9 +7,30 @@ updates:
       interval: "weekly"
     commit-message:
       prefix: "build: "
+    groups:
+      python-production-updates:
+        dependency-type: "production"
+        update-types:
+          - "major"
+          - "minor"
+          - "patch"
+      python-development-updates:
+        dependency-type: "development"
+        update-types:
+          - "major"
+          - "minor"
+          - "patch"
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
       interval: "weekly"
     commit-message:
       prefix: "ci: "
+    groups:
+      # Specify a name for the group, which will be used in pull request titles
+      # and branch names
+      ci-updates:
+        update-types:
+          - "minor"
+          - "patch"
+          - "major"
diff --git a/.github/workflows/compliance.yml b/.github/workflows/compliance.yml
@@ -34,14 +34,14 @@ jobs:
 
       - name: Send license report to Fossa
         # This will collect all necessary information (mostly used dependencies) and send it to the Fossa API
-        uses: fossas/fossa-action@09bcf127dc0ccb4b5a023f6f906728878e8610ba # Use a specific version if locking is preferred
+        uses: fossas/fossa-action@93a52ecf7c3ac7eb40f5de77fd69b1a19524de94 # Use a specific version if locking is preferred
         with:
           api-key: ${{ secrets.FOSSA_LICENSE_SCAN_TOKEN }}
 
       - name: Check license compliance
         # This will poll the Fossa API until they have processed the information which we've sent in the previous step
         # and fail if Fossa found an issue with the licences of our dependencies.
-        uses: fossas/fossa-action@09bcf127dc0ccb4b5a023f6f906728878e8610ba # Use a specific version if locking is preferred
+        uses: fossas/fossa-action@93a52ecf7c3ac7eb40f5de77fd69b1a19524de94 # Use a specific version if locking is preferred
         with:
           api-key: ${{ secrets.FOSSA_LICENSE_SCAN_TOKEN }}
           run-tests: true

diff --git a/pyproject.toml b/pyproject.toml
@@ -26,7 +26,7 @@ dependencies = [
   "httpx==0.27.2",
   "python-dotenv==1.0.1",
   "typer==0.12.5",
-  "tenacity==8.3.0",
+  "tenacity==9.0.0",
   "aiohttp==3.10.10",
   "aiofiles==23.2.1",
   "tabulate==0.9.0",
@@ -60,7 +60,7 @@ dependencies = [
   "structlog==24.2.0",
   "httpx==0.27.2",
   "python-dotenv==1.0.1",
-  "tenacity==8.3.0",
+  "tenacity==9.0.0",
   "aiohttp==3.10.10",
   "pyrate-limiter==3.6.0",