Merge branch 'master' into color_correlation

APN-Pucky · May 28, 2024 · ca2bc78 · ca2bc78
2 parents 76a317a + e4fe369
commit ca2bc78
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 39 deletions.
diff --git a/.github/workflows/dependabot.yml b/.github/workflows/dependabot.yml
@@ -10,7 +10,13 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ github.actor == 'dependabot[bot]' }}
     steps:
+      - name: Dependabot metadata
+        id: dependabot-metadata
+        uses: dependabot/fetch-metadata@v1.1.1
+        with:
+          github-token: "${{ secrets.GITHUB_TOKEN }}"
       - name: Enable auto-merge for Dependabot PRs
+        if: ${{ steps.dependabot-metadata.outputs.update-type != 'version-update:semver-major' }}
         run: gh pr merge --auto --merge "$PR_URL"
         env:
           PR_URL: ${{github.event.pull_request.html_url}}

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -43,7 +43,7 @@ pyfeyn2 = ">=2.3.6"
 pyqgraf = ">=0.0.14"
 #pyqgraf = {path= "../pyqgraf", develop = true }
 
-poetry-dynamic-versioning = {extras = ["plugin"], version = ">=0.21.1,<1.3.0"}
+poetry-dynamic-versioning = {extras = ["plugin"], version = ">=0.21.1,<1.4.0"}
 
 [build-system]
 requires = ["poetry-core>=1.0.0", "poetry-dynamic-versioning"]