Merge branch 'main' into dependabot/pip/weaviate-client-4.4.2

langchain-ai · Feb 7, 2024 · 724295f · 724295f
2 parents 9d7e900 + 417e672
commit 724295f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/.github/workflows/dependabot-auto-merge.yml b/.github/workflows/dependabot-auto-merge.yml
@@ -16,7 +16,7 @@ jobs:
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
       - name: Enable auto-merge for Dependabot PRs
-        run: gh pr merge --auto --merge "$PR_URL"
+        run: gh pr merge --auto --squash "$PR_URL"
         env:
           PR_URL: ${{github.event.pull_request.html_url}}
           GH_TOKEN: ${{secrets.GITHUB_TOKEN}}
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -20,7 +20,7 @@ pytest = "^7.3.0"
 freezegun = "^1.2.2"
 pytest-mock  = "^3.10.0"
 syrupy = "^4.0.2"
-pytest-watcher = "^0.3.4"
+pytest-watcher = ">=0.3.4,<0.5.0"
 pytest-asyncio = ">=0.21.1,<0.24.0"
 langchain = ">=0.0.352,<0.1.6"
 pytest-docker = ">=2.0.1,<4.0.0"