Merge branch 'master' into dependabot/pip/types-psutil-6.1.0.20241102

.github/workflows/build.yml

@@ -35,7 +35,7 @@ jobs:
             artifact_name: capa.exe
             asset_name: windows
             python_version: '3.10'
-          - os: macos-12
+          - os: macos-13
             # use older macOS for assumed better portability
             artifact_name: capa
             asset_name: macos

.github/workflows/tests.yml

@@ -88,7 +88,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-20.04, windows-2019, macos-12]
+        os: [ubuntu-20.04, windows-2019, macos-13]
         # across all operating systems
         python-version: ["3.10", "3.11"]
         include:

CHANGELOG.md

@@ -28,6 +28,7 @@
 - fix saving of base address @mr-tz
 
 ### Development
+- CI: use macos-13 since macos-12 is deprecated and will be removed on December 3rd, 2024 #2173 @mr-tz
 
 ### Raw diffs
 - [capa v7.4.0...master](https://github.com/mandiant/capa/compare/v7.4.0...master)

pyproject.toml

@@ -156,7 +156,7 @@ build = [
 ]
 scripts = [
     "jschema_to_python==1.2.3",
-    "psutil==6.0.0",
+    "psutil==6.1.0",
     "stix2==3.0.1",
     "sarif_om==1.0.4",
     "requests==2.32.3",