Merge branch 'topic/bbannier/pyproject-config'

* topic/bbannier/pyproject-config:
  Move project configuration to `pyproject.toml`

.github/workflows/test.yml

@@ -33,7 +33,7 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install pytest websocket-client
+          pip install -e '.[dev]'
       - name: Run unit tests
         run: pytest
 

CHANGES

@@ -1,3 +1,7 @@
+1.3.1-21 | 2024-07-08 22:24:21 -0700
+
+  * Move project configuration to `pyproject.toml` (Benjamin Bannier, Corelight)
+
 1.3.1-19 | 2024-07-08 22:23:02 -0700
 
   * fix cpu_affinity field type (Victor Dvornikov)

VERSION

@@ -1 +1 @@
-1.3.1-19
+1.3.1-21

pyproject.toml

@@ -0,0 +1,47 @@
+[project]
+name = "zeek-client"
+dynamic = ["version"]
+description = "A CLI for Zeek's Management Framework"
+dependencies = [
+    "websocket-client>=1.8.0",
+]
+readme = "README.md"
+requires-python = ">= 3.8"
+license = {text = "3-clause BSD License"}
+
+classifiers = [
+    "Development Status :: 4 - Beta",
+    "Environment :: Console",
+    "License :: OSI Approved :: BSD License",
+    "Operating System :: POSIX :: Linux",
+    "Operating System :: MacOS :: MacOS X",
+    "Programming Language :: Python :: 3",
+    "Topic :: System :: Networking :: Monitoring",
+    "Topic :: Utilities",
+]
+
+keywords=[
+    "zeek",
+    "management",
+    "client",
+    "cluster",
+]
+
+[[project.maintainers]]
+name = "The Zeek Project"
+email = "[email protected]"
+
+[project.urls]
+Repository = "https://github.com/zeek/zeek-client"
+
+[project.optional-dependencies]
+dev = [
+    "pytest>=8.1.1",
+]
+
+[build-system]
+requires = ["setuptools"]
+
+[tool.setuptools]
+packages = ["zeekclient"]
+script-files = ["zeek-client"]

setup.py

@@ -1,39 +1,11 @@
 from setuptools import setup
 
 
-def get_readme():
-    with open("README.md", encoding="utf-8") as readme:
-        return readme.read()
-
-
 def get_version():
     with open("VERSION", encoding="utf-8") as version:
         return version.read().replace("-", ".dev", 1).strip()
 
 
 setup(
-    name="zeek-client",
     version=get_version(),
-    description="A CLI for Zeek's Management Framework",
-    long_description=get_readme(),
-    long_description_content_type="text/markdown",
-    license="3-clause BSD License",
-    keywords="zeek management client cluster",
-    maintainer="The Zeek Project",
-    maintainer_email="[email protected]",
-    url="https://github.com/zeek/zeek-client",
-    scripts=["zeek-client"],
-    packages=["zeekclient"],
-    install_requires=["websocket-client"],
-    python_requires=">=3.7.0",
-    classifiers=[
-        "Development Status :: 4 - Beta",
-        "Environment :: Console",
-        "License :: OSI Approved :: BSD License",
-        "Operating System :: POSIX :: Linux",
-        "Operating System :: MacOS :: MacOS X",
-        "Programming Language :: Python :: 3",
-        "Topic :: System :: Networking :: Monitoring",
-        "Topic :: Utilities",
-    ],
 )

zeekclient/__init__.py

@@ -26,7 +26,7 @@
 
 from .logs import LOG
 
-__version__ = "1.3.1-19"
+__version__ = "1.3.1-21"
 __all__ = [
     "brokertypes",
     "cli",