From e2b2c7930660d53c0aa8988b6c320aafec1179ae Mon Sep 17 00:00:00 2001
From: Tim Wojtulewicz <tim@corelight.com>
Date: Mon, 10 Mar 2025 08:28:54 -0700
Subject: [PATCH] Merge remote-tracking branch
 'origin/topic/timw/ci-macos-upgrade-pip'

* origin/topic/timw/ci-macos-upgrade-pip:
  CI: Unconditionally upgrade pip on macOS

(cherry picked from commit e8d91c8227f95eda002a3cb2675cb64863871ebc)
---
 CHANGES             | 6 ++++++
 VERSION             | 2 +-
 ci/macos/prepare.sh | 6 ++----
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/CHANGES b/CHANGES
index 6102fe5bf8..38c658d7e4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,9 @@
+7.0.5-7 | 2025-03-18 16:21:31 -0700
+
+  * CI: Unconditionally upgrade pip on macOS (Tim Wojtulewicz, Corelight)
+
+    (cherry picked from commit e8d91c8227f95eda002a3cb2675cb64863871ebc)
+
 7.0.5-6 | 2025-03-18 16:20:53 -0700
 
   * ci/init-external-repo.sh: Use regex to match macos cirrus task (Arne Welzel, Corelight)
diff --git a/VERSION b/VERSION
index 543be1f276..0bf6871cb0 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-7.0.5-6
+7.0.5-7
diff --git a/ci/macos/prepare.sh b/ci/macos/prepare.sh
index a96833f75f..864b2e86e0 100755
--- a/ci/macos/prepare.sh
+++ b/ci/macos/prepare.sh
@@ -9,8 +9,6 @@ brew update
 brew upgrade cmake
 brew install openssl@3 swig bison flex ccache libmaxminddb
 
-if [ $(sw_vers -productVersion | cut -d '.' -f 1) -lt 14 ]; then
-    python3 -m pip install --upgrade pip
-fi
-
+# Upgrade pip so we have the --break-system-packages option.
+python3 -m pip install --upgrade pip
 python3 -m pip install --user --break-system-packages websockets