Revert dependabot breaking changes and update workflow

ImperialCollegeLondon · Nov 1, 2024 · 3efb65c · 3efb65c
1 parent 4beae03
commit 3efb65c
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 37 deletions.
diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml
@@ -13,7 +13,9 @@ jobs:
     if: ${{ github.event.pull_request.user.login == 'dependabot[bot]' || github.event.pull_request.user.login == 'pre-commit-ci[bot]' }}
     steps:
       - name: Enable auto-merge for Dependabot PRs
-        run: gh pr merge --auto --merge "$PR_URL"
+        run: |
+          gh pr review --approve "$PR_URL"
+          gh pr merge --auto --merge "$PR_URL"
         env:
           PR_URL: ${{ github.event.pull_request.html_url }}
           # GitHub provides this variable in the CI env. You don't

diff --git a/dev-requirements.txt b/dev-requirements.txt
@@ -13,6 +13,7 @@ asgiref==3.7.2
     #   coldfront
     #   django
     #   django-simple-history
+    #   django-stubs
 attrs==24.2.0
     # via pytest-mypy
 bibtexparser==1.4.1
@@ -43,11 +44,11 @@ click==8.1.7
     # via pip-tools
 coldfront==1.1.6
     # via imperial_coldfront_plugin (pyproject.toml)
-coverage[toml]==7.6.3
+coverage[toml]==7.6.4
     # via pytest-cov
 crispy-bootstrap4==2024.1
     # via coldfront
-cryptography==43.0.1
+cryptography==43.0.3
     # via
     #   josepy
     #   mozilla-django-oidc
@@ -75,9 +76,9 @@ django-crispy-forms==2.1
     #   crispy-bootstrap4
 django-environ==0.11.2
     # via coldfront
-django-model-utils==5.0.0
+django-model-utils==4.4.0
     # via coldfront
-django-picklefield==3.2
+django-picklefield==3.1
     # via
     #   coldfront
     #   django-q
@@ -91,9 +92,9 @@ django-split-settings==1.3.0
     # via coldfront
 django-sslserver==0.22
     # via coldfront
-django-stubs==5.1.0
+django-stubs==5.0.0
     # via imperial_coldfront_plugin (pyproject.toml)
-django-stubs-ext==5.1.0
+django-stubs-ext==5.1.1
     # via
     #   django-stubs
     #   imperial_coldfront_plugin (pyproject.toml)
@@ -133,9 +134,8 @@ josepy==1.14.0
     # via mozilla-django-oidc
 mozilla-django-oidc==4.0.1
     # via imperial_coldfront_plugin (pyproject.toml)
-mypy==1.12.0
+mypy==1.13.0
     # via
-    #   django-stubs
     #   imperial_coldfront_plugin (pyproject.toml)
     #   pytest-mypy
 mypy-extensions==1.0.0
@@ -173,7 +173,7 @@ pytest==8.3.3
     #   pytest-django
     #   pytest-mock
     #   pytest-mypy
-pytest-cov==5.0.0
+pytest-cov==6.0.0
     # via imperial_coldfront_plugin (pyproject.toml)
 pytest-django==4.9.0
     # via imperial_coldfront_plugin (pyproject.toml)
@@ -201,7 +201,7 @@ requests==2.31.0
     #   coldfront
     #   doi2bib
     #   mozilla-django-oidc
-ruff==0.6.9
+ruff==0.7.2
     # via imperial_coldfront_plugin (pyproject.toml)
 six==1.16.0
     # via
@@ -214,14 +214,10 @@ sqlparse==0.4.4
     #   django
 text-unidecode==1.3
     # via coldfront
-toml==0.10.2
-    # via django-stubs
-types-python-dateutil==2.9.0.20241003
+types-python-dateutil==2.8.19.20240106
     # via
     #   arrow
     #   coldfront
-types-pytz==2024.2.0.20241003
-    # via django-stubs
 types-pyyaml==6.0.12.20240917
     # via django-stubs
 typing-extensions==4.10.0
@@ -230,11 +226,11 @@ typing-extensions==4.10.0
     #   django-stubs
     #   django-stubs-ext
     #   mypy
-urllib3==2.2.3
+urllib3==2.2.1
     # via
     #   coldfront
     #   requests
-virtualenv==20.27.0
+virtualenv==20.27.1
     # via pre-commit
 wcwidth==0.2.13
     # via

diff --git a/doc-requirements.txt b/doc-requirements.txt
@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with Python 3.12
+# This file is autogenerated by pip-compile with Python 3.11
 # by the following command:
 #
 #    pip-compile --extra=doc --output-file=doc-requirements.txt
@@ -47,7 +47,7 @@ colorama==0.4.6
     #   mkdocs-material
 crispy-bootstrap4==2024.1
     # via coldfront
-cryptography==43.0.1
+cryptography==43.0.3
     # via
     #   josepy
     #   mozilla-django-oidc
@@ -62,6 +62,7 @@ django==4.2.11
     #   django-q
     #   django-settings-export
     #   django-sslserver
+    #   django-stubs-ext
     #   django-su
     #   imperial_coldfront_plugin (pyproject.toml)
     #   mozilla-django-oidc
@@ -71,9 +72,9 @@ django-crispy-forms==2.1
     #   crispy-bootstrap4
 django-environ==0.11.2
     # via coldfront
-django-model-utils==5.0.0
+django-model-utils==4.4.0
     # via coldfront
-django-picklefield==3.2
+django-picklefield==3.1
     # via
     #   coldfront
     #   django-q
@@ -87,6 +88,8 @@ django-split-settings==1.3.0
     # via coldfront
 django-sslserver==0.22
     # via coldfront
+django-stubs-ext==5.1.1
+    # via imperial_coldfront_plugin (pyproject.toml)
 django-su==1.0.0
     # via coldfront
 doi2bib==0.4.0
@@ -107,7 +110,7 @@ future==1.0.0
     #   doi2bib
 ghp-import==2.1.0
     # via mkdocs
-griffe==1.4.1
+griffe==1.5.1
     # via mkdocstrings-python
 humanize==4.9.0
     # via coldfront
@@ -129,7 +132,7 @@ markdown==3.7
     #   mkdocs-material
     #   mkdocstrings
     #   pymdown-extensions
-markupsafe==3.0.1
+markupsafe==3.0.2
     # via
     #   jinja2
     #   mkdocs
@@ -158,7 +161,7 @@ mkdocs-get-deps==0.2.0
     # via mkdocs
 mkdocs-literate-nav==0.6.1
     # via imperial_coldfront_plugin (pyproject.toml)
-mkdocs-material==9.5.42
+mkdocs-material==9.5.43
     # via imperial_coldfront_plugin (pyproject.toml)
 mkdocs-material-extensions==1.3.1
     # via mkdocs-material
@@ -168,7 +171,7 @@ mkdocstrings==0.26.2
     # via
     #   imperial_coldfront_plugin (pyproject.toml)
     #   mkdocstrings-python
-mkdocstrings-python==1.12.1
+mkdocstrings-python==1.12.2
     # via imperial_coldfront_plugin (pyproject.toml)
 mozilla-django-oidc==4.0.1
     # via imperial_coldfront_plugin (pyproject.toml)
@@ -186,7 +189,7 @@ pycparser==2.22
     # via cffi
 pygments==2.18.0
     # via mkdocs-material
-pymdown-extensions==10.11.2
+pymdown-extensions==10.12
     # via
     #   mkdocs-material
     #   mkdocstrings
@@ -237,17 +240,19 @@ sqlparse==0.4.4
     #   django
 text-unidecode==1.3
     # via coldfront
-types-python-dateutil==2.9.0.20241003
+types-python-dateutil==2.8.19.20240106
     # via
     #   arrow
     #   coldfront
 typing-extensions==4.10.0
-    # via coldfront
-urllib3==2.2.3
+    # via
+    #   coldfront
+    #   django-stubs-ext
+urllib3==2.2.1
     # via
     #   coldfront
     #   requests
-watchdog==5.0.3
+watchdog==6.0.0
     # via mkdocs
 wcwidth==0.2.13
     # via

diff --git a/requirements.txt b/requirements.txt
@@ -37,7 +37,7 @@ coldfront==1.1.6
     # via imperial_coldfront_plugin (pyproject.toml)
 crispy-bootstrap4==2024.1
     # via coldfront
-cryptography==43.0.1
+cryptography==43.0.3
     # via
     #   josepy
     #   mozilla-django-oidc
@@ -62,9 +62,9 @@ django-crispy-forms==2.1
     #   crispy-bootstrap4
 django-environ==0.11.2
     # via coldfront
-django-model-utils==5.0.0
+django-model-utils==4.4.0
     # via coldfront
-django-picklefield==3.2
+django-picklefield==3.1
     # via
     #   coldfront
     #   django-q
@@ -78,7 +78,7 @@ django-split-settings==1.3.0
     # via coldfront
 django-sslserver==0.22
     # via coldfront
-django-stubs-ext==5.1.0
+django-stubs-ext==5.1.1
     # via imperial_coldfront_plugin (pyproject.toml)
 django-su==1.0.0
     # via coldfront
@@ -145,15 +145,15 @@ sqlparse==0.4.4
     #   django
 text-unidecode==1.3
     # via coldfront
-types-python-dateutil==2.9.0.20241003
+types-python-dateutil==2.8.19.20240106
     # via
     #   arrow
     #   coldfront
 typing-extensions==4.10.0
     # via
     #   coldfront
     #   django-stubs-ext
-urllib3==2.2.3
+urllib3==2.2.1
     # via
     #   coldfront
     #   requests