Merge branch 'master' into master

mandiant · Oct 23, 2024 · 20654c2 · 20654c2
2 parents ac411f3 + 7d983af
commit 20654c2
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml
@@ -13,7 +13,10 @@ permissions:
 jobs:
   check_changelog:
     # no need to check for dependency updates via dependabot
-    if: github.actor != 'dependabot[bot]' && github.actor != 'dependabot-preview[bot]'
+    # github.event.pull_request.user.login refers to PR author
+    if: |
+      github.event.pull_request.user.login != 'dependabot[bot]' &&
+      github.event.pull_request.user.login != 'dependabot-preview[bot]'
     runs-on: ubuntu-latest
     env:
       NO_CHANGELOG: '[x] No CHANGELOG update needed'

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -186,6 +186,7 @@ Special thanks to our repeat and new contributors:
 - CI: update tests.yml workflow to exclude web and documentation files #2263 @s-ff
 - CI: update build.yml workflow to exclude web and documentation files #2270 @s-ff
 - CI: add web releases workflow #2455 @s-ff
+- CI: skip changelog.yml for dependabot PRs #2471
 
 ### Raw diffs
 

diff --git a/pyproject.toml b/pyproject.toml
@@ -114,7 +114,7 @@ dev = [
     # we want all developer environments to be consistent.
     # These dependencies are not used in production environments
     # and should not conflict with other libraries/tooling.
-    "pre-commit==3.5.0",
+    "pre-commit==4.0.1",
     "pytest==8.0.0",
     "pytest-sugar==1.0.0",
     "pytest-instafail==0.5.0",
@@ -131,9 +131,9 @@ dev = [
     "flake8-use-pathlib==0.3.0",
     "flake8-copyright==0.2.4",
     "ruff==0.6.4",
-    "black==24.8.0",
+    "black==24.10.0",
     "isort==5.13.2",
-    "mypy==1.11.2",
+    "mypy==1.12.1",
     "mypy-protobuf==3.6.0",
     "PyGithub==2.4.0",
     # type stubs for mypy
@@ -151,7 +151,7 @@ build = [
     # These dependencies are not used in production environments
     # and should not conflict with other libraries/tooling.
     "pyinstaller==6.10.0",
-    "setuptools==75.1.0",
+    "setuptools==75.2.0",
     "build==1.2.2"
 ]
 scripts = [

diff --git a/requirements.txt b/requirements.txt
@@ -31,15 +31,15 @@ pydantic==2.9.2
 # but dependabot updates these separately (which is broken) and is annoying,
 # so we rely on pydantic to pull in the right version of pydantic-core.
 # pydantic-core==2.23.4
-xmltodict==0.13.0
+xmltodict==0.14.2
 pyelftools==0.31
 pygments==2.18.0
 python-flirt==0.8.10
 pyyaml==6.0.2
 rich==13.9.2
 ruamel-yaml==0.18.6
 ruamel-yaml-clib==0.2.8
-setuptools==75.1.0
+setuptools==75.2.0
 six==1.16.0
 sortedcontainers==2.4.0
 viv-utils==0.7.11