Merge remote-tracking branch 'origin/topic/timw/git-python-dep'

* origin/topic/timw/git-python-dep:
  Make requirements.txt match pyproject file

CHANGES

@@ -1,3 +1,10 @@
+3.0.1-31 | 2024-05-08 09:57:29 -0700
+
+  * Make requirements.txt match pyproject file (Tim Wojtulewicz, Corelight)
+
+    Notably, the two versions listed here are the current releases. The current
+    setting causes RTD to fail since it can't find versions newer than those.
+
 3.0.1-29 | 2024-05-08 09:38:06 -0700
 
   * Remove python2 `urlparse` (Benjamin Bannier)

VERSION

@@ -1 +1 @@
-3.0.1-29
+3.0.1-31

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-29" "Zeek Package Manager"
+.TH "ZKG" "1" "May 08, 2024" "3.0.1-31" "Zeek Package Manager"
 .SH NAME
 zkg \- Zeek Package Manager
 .sp

requirements.txt

@@ -1,8 +1,8 @@
 # NOTE: Dependencies should go into `pyproject.toml`. We keep this file to e.g., support RTD.
 
 # Requirements for general zkg usage
-GitPython>3.1.43
-semantic_version>2.10.0
+GitPython>=3.1.43
+semantic_version>=2.10.0
 # Requirements for development (e.g. building docs)
 btest>=1.1
 Sphinx>=7.2.6

zeekpkg/__init__.py

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