Add pyproject remove setup.py commands

.github/workflows/release.yml

@@ -13,11 +13,11 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: 3.7
-      - name: Install dependencies
-        run: pip install twine
+          python-version: 3.9
+      - name: Install build and twine
+        run: pip install build twine
       - name: Build package
-        run: python setup.py sdist
+        run: python -m build
       - name: Publish package to PyPI
         uses: pypa/[email protected]
         with:

.gitignore

@@ -5,7 +5,6 @@
 *coverage_html_report*
 .coverage
 .coverage.*
-.python-version
 .vscode
 __stdout__
 docs/_build
@@ -24,5 +23,6 @@ dist/
 tests/searchcommands/apps/app_with_logging_configuration/*.log
 *.observed
 venv/
+.venv/
 .tox
 test-reports/

.python-version

@@ -0,0 +1 @@
+3.9

README.md

@@ -48,13 +48,9 @@ Use `pip`:
 
     [sudo] pip install splunk-sdk
 
-Install the Python egg:
-
-    [sudo] pip install --egg splunk-sdk
-
 Install the sources you cloned from GitHub:
 
-    [sudo] python setup.py install
+    [sudo] python -m pip install .
 
 ## Testing Quickstart
 

docker-compose.yml

@@ -1,9 +1,8 @@
-version: '3.6'
-
 services:
     splunk:
         image: "splunk/splunk:${SPLUNK_VERSION}"
         container_name: splunk
+        platform: linux/amd64
         environment:
             - SPLUNK_START_ARGS=--accept-license
             - SPLUNK_HEC_TOKEN=11111111-1111-1111-1111-1111111111113

pyproject.toml

@@ -0,0 +1,37 @@
+[build-system]
+requires = ["setuptools>=68.0.0"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "splunk-sdk"
+dynamic = ["version"]
+authors = [{ name = "Splunk, Inc.", email = "[email protected]" }]
+license.file = "LICENSE"
+requires-python = ">=3.7"
+description = "The Splunk Software Development Kit for Python"
+readme = "README.md"
+dependencies = ["deprecation>=2.1.0"]
+classifiers = [
+    "Programming Language :: Python",
+    "Development Status :: 6 - Mature",
+    "Environment :: Other Environment",
+    "Intended Audience :: Developers",
+    "Operating System :: OS Independent",
+    "Topic :: Software Development :: Libraries :: Python Modules",
+    "Topic :: Software Development :: Libraries :: Application Frameworks",
+]
+
+[project.urls]
+Homepage = "http://github.com/splunk/splunk-sdk-python"
+
+
+[project.optional-dependencies]
+test = ["tox>=4.8.0", "pytest>=7.4.4"]
+build = ["twine", "build"]
+
+[tool.setuptools]
+packages = ["splunklib", "splunklib.modularinput", "splunklib.searchcommands"]
+
+
+[tool.setuptools.exclude-package-data]
+"*" = ["tests/*"]

setup.py

@@ -16,39 +16,12 @@
 
 from setuptools import setup
 
-import splunklib
 
-setup(
-    author="Splunk, Inc.",
+def get_version():
+    with open("splunklib/__init__.py") as f:
+        for line in f:
+            if line.startswith("__version__"):
+                return line.split("=")[1].strip().strip('"').strip("'")
 
-    author_email="[email protected]",
 
-    description="The Splunk Software Development Kit for Python.",
-
-    license="http://www.apache.org/licenses/LICENSE-2.0",
-
-    name="splunk-sdk",
-
-    packages = ["splunklib",
-                "splunklib.modularinput",
-                "splunklib.searchcommands"],
-
-    install_requires=[
-            "deprecation",
-        ],
-
-    url="http://github.com/splunk/splunk-sdk-python",
-
-    version=splunklib.__version__,
-
-    classifiers = [
-        "Programming Language :: Python",
-        "Development Status :: 6 - Mature",
-        "Environment :: Other Environment",
-        "Intended Audience :: Developers",
-        "License :: OSI Approved :: Apache Software License",
-        "Operating System :: OS Independent",
-        "Topic :: Software Development :: Libraries :: Python Modules",
-        "Topic :: Software Development :: Libraries :: Application Frameworks",
-    ],
-)
+setup(version=get_version())

splunklib/__init__.py

@@ -16,19 +16,21 @@
 
 import logging
 
-DEFAULT_LOG_FORMAT = '%(asctime)s, Level=%(levelname)s, Pid=%(process)s, Logger=%(name)s, File=%(filename)s, ' \
-                     'Line=%(lineno)s, %(message)s'
-DEFAULT_DATE_FORMAT = '%Y-%m-%d %H:%M:%S %Z'
+
+DEFAULT_LOG_FORMAT = (
+    "%(asctime)s, Level=%(levelname)s, Pid=%(process)s, Logger=%(name)s, File=%(filename)s, "
+    "Line=%(lineno)s, %(message)s"
+)
+DEFAULT_DATE_FORMAT = "%Y-%m-%d %H:%M:%S %Z"
 
 
 # To set the logging level of splunklib
 # ex. To enable debug logs, call this method with parameter 'logging.DEBUG'
 # default logging level is set to 'WARNING'
-def setup_logging(level, log_format=DEFAULT_LOG_FORMAT, date_format=DEFAULT_DATE_FORMAT):
-    logging.basicConfig(level=level,
-                        format=log_format,
-                        datefmt=date_format)
+def setup_logging(
+    level, log_format=DEFAULT_LOG_FORMAT, date_format=DEFAULT_DATE_FORMAT
+):
+    logging.basicConfig(level=level, format=log_format, datefmt=date_format)
 
 
-__version_info__ = (2, 1, 0)
-__version__ = ".".join(map(str, __version_info__))
+__version__ = "2.1.0"