Merge remote-tracking branch 'bbannier/topic/bbannier/bring-btest-bac…

…k-from-the-death'

* bbannier/topic/bbannier/bring-btest-back-from-the-death:
  Pull in `btest` when installing package manager

CHANGES

@@ -1,3 +1,15 @@
+3.0.1-33 | 2024-05-13 13:52:59 -0700
+
+  * Pull in `btest` when installing package manager (Benjamin Bannier, Corelight)
+
+    This reverts a24124d2f298b306e47d43a8aa0361f98ede9a04 where we moved
+    `btest` into a dev dependency which would not be installed by default.
+    While this would have been unobservable for users getting their `zkg`
+    via Zeek (which also provides `btest`), or who install `zkg` via `pipx`
+    (which even previously would never have linked the pulled in `btest`
+    into the prefix), it might break users installing via `pip` into a
+    random prefix.
+
 3.0.1-31 | 2024-05-08 09:57:29 -0700
 
   * Make requirements.txt match pyproject file (Tim Wojtulewicz, Corelight)

VERSION

@@ -1 +1 @@
-3.0.1-31
+3.0.1-33

doc/man/zkg.1

@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "ZKG" "1" "May 08, 2024" "3.0.1-31" "Zeek Package Manager"
+.TH "ZKG" "1" "May 13, 2024" "3.0.1-33" "Zeek Package Manager"
 .SH NAME
 zkg \- Zeek Package Manager
 .sp

pyproject.toml

@@ -37,11 +37,12 @@ classifiers = [
 dependencies = [
     "GitPython>=3.1.43",
     "semantic_version>=2.10.0",
+    # Technically not a zkg dependency, but typically expected by users to be present.
+    "btest>=1.1",
 ]
 
 [project.optional-dependencies]
 dev = [
-    "btest>=1.1",
     "Sphinx>=7.2.6",
     "sphinx_rtd_theme>=2.0.0",
 ]

requirements.txt

@@ -3,7 +3,8 @@
 # Requirements for general zkg usage
 GitPython>=3.1.43
 semantic_version>=2.10.0
-# Requirements for development (e.g. building docs)
+# Technically not a zkg dependency, but typically expected by users to be present.
 btest>=1.1
+# Requirements for development (e.g. building docs)
 Sphinx>=7.2.6
 sphinx_rtd_theme>=2.0.0

zeekpkg/__init__.py

@@ -9,7 +9,7 @@
 
 import logging
 
-__version__ = "3.0.1-31"
+__version__ = "3.0.1-33"
 __all__ = ["manager", "package", "source", "template", "uservar"]  # noqa: F405
 
 LOG = logging.getLogger(__name__)