Merge branch 'topic/timw/python-executable-path'

* topic/timw/python-executable-path: Use the right CMake variable for python executable
zeek · Aug 7, 2023 · 81e8c48 · 81e8c48
2 parents 4b61af7 + 5b45841
commit 81e8c48
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 5 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,9 @@
+2.5.0-37 | 2023-08-07 09:32:38 -0700
+
+  * Use the right CMake variable for python executable (Tim Wojtulewicz, Corelight)
+
+  * Revert update to Python 3.7 (Tim Wojtulewicz, Corelight)
+
 2.5.0-34 | 2023-08-02 11:35:59 -0700
 
   * Remove usage of FindRequiredPackage (Tim Wojtulewicz, Corelight)

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.5.0-34
+2.5.0-37
diff --git a/ZeekControl/ssh_runner.py b/ZeekControl/ssh_runner.py
@@ -14,7 +14,7 @@
 
 def get_muxer(shell):
     # The full path of the Python interpreter.  Configured by CMake.
-    pythonpath = "@PYTHON_EXECUTABLE@"
+    pythonpath = "@Python_EXECUTABLE@"
 
     muxer = r"""
 import os,sys,subprocess,signal,select,json
@@ -352,4 +352,3 @@ def shutdown_all(self):
         self.masters = {}
 
     __del__ = shutdown_all
-
diff --git a/configure b/configure
@@ -128,7 +128,7 @@ while [ $# -ne 0 ]; do
             append_cache_entry PCAP_ROOT_DIR    PATH    $optarg
             ;;
         --with-python=*)
-            append_cache_entry PYTHON_EXECUTABLE    PATH    $optarg
+            append_cache_entry Python_EXECUTABLE    PATH    $optarg
             ;;
         --with-python-lib=*)
             append_cache_entry PYTHON_LIBRARY       PATH    $optarg

diff --git a/doc/main.rst b/doc/main.rst
@@ -3,7 +3,7 @@
 .. Note: This file includes further autogenerated ones.
 ..
 .. Version number is filled in automatically.
-.. |version| replace:: 2.5.0-34
+.. |version| replace:: 2.5.0-37
 
 ===========
 ZeekControl