Merge branch 'main' into dependabot/pip/docs/sphinx-7.3.7

rearc · Jun 3, 2024 · d7942f9 · d7942f9
2 parents f243c46 + fe50afa
commit d7942f9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -71,7 +71,7 @@ jobs:
           repository_url: https://test.pypi.org/legacy/
 
       - name: Publish the release notes
-        uses: release-drafter/release-drafter@v5.23.0
+        uses: release-drafter/release-drafter@v6.0.0
         with:
           publish: ${{ steps.check-version.outputs.tag != '' }}
           tag: ${{ steps.check-version.outputs.tag }}

diff --git a/docs/requirements.txt b/docs/requirements.txt
@@ -1,3 +1,8 @@
+<<<<<<< dependabot/pip/docs/sphinx-7.3.7
 furo==2022.12.7
 sphinx==7.3.7
+=======
+furo==2024.5.6
+sphinx==5.3.0
+>>>>>>> main
 myst_parser==3.0.1