Merge remote-tracking branch 'origin/topic/timw/python-upgrade'

* origin/topic/timw/python-upgrade: Update cmake submodule to master [nomail] Remove old obsolete travis.yml Require python 3.9
zeek · Dec 10, 2024 · 0d52fbb · 0d52fbb
2 parents 7e8f6a3 + 40584eb
commit 0d52fbb
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 28 deletions.
diff --git a/.travis.yml b/.travis.yml
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,13 @@
+0.93-22 | 2024-12-10 16:18:56 -0700
+
+  * Update cmake submodule to master [nomail] (Tim Wojtulewicz, Corelight)
+
+  * Remove old obsolete travis.yml (Tim Wojtulewicz, Corelight)
+
+  * Require python 3.9 (Tim Wojtulewicz, Corelight)
+
+  * Revert update to Python 3.7 (Tim Wojtulewicz, Corelight)
+
 0.93-14 | 2023-08-02 10:59:05 -0700
 
   * Update cmake submodule to deprecate FindRequiredPackage (Tim Wojtulewicz, Corelight)

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -5,7 +5,7 @@ include(cmake/CommonCMakeConfig.cmake)
 ########################################################################
 ## Dependency Configuration
 
-find_package(Python 3.5 REQUIRED Interpreter)
+find_package(Python 3.9 REQUIRED Interpreter)
 
 if (NOT SUBNETTREE_FOUND)
     # the check for SubnetTree is ignored if SubnetTree_FOUND is set

diff --git a/README b/README
@@ -1,7 +1,7 @@
 ..	-*- mode: rst-mode -*-
 ..
 .. Version number is filled in automatically.
-.. |version| replace:: 0.93-14
+.. |version| replace:: 0.93-22
 
 ====================================================
 trace-summary - Generating network traffic summaries
@@ -73,7 +73,7 @@ second from a Zeek connection log::
 Prerequisites
 -------------
 
-* This script requires Python 3.5 or newer.
+* This script requires Python 3.9 or newer.
 
 * The `pysubnettree
   <https://github.com/zeek/pysubnettree>`_ Python

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.93-14
+0.93-22
diff --git a/cmake b/cmake
diff --git a/trace-summary b/trace-summary
@@ -15,7 +15,7 @@ import optparse
 import random
 import subprocess
 
-VERSION = "0.93-14" # Automatically filled in.
+VERSION = "0.93-22" # Automatically filled in.
 
 random.seed()