Migrated to setup.cfg

And updated user-agent string with version

Author: c0d3rman

setup.cfg

@@ -0,0 +1,33 @@
+[metadata]
+name = drbot
+version = attr: drbot.__version__
+author = c0d3rman
+description = DrBot - A modular Reddit bot to cure your moderation woes.
+long_description = file: README.md
+long_description_content_type = text/markdown
+license = CC BY-SA 4.0
+license_files = LICENSE
+url = https://github.com/c0d3rman/DrBot
+classifiers =
+    Development Status :: 3 - Alpha
+    Intended Audience :: Developers
+    License :: Free To Use But Restricted
+    Natural Language :: English
+    Programming Language :: Python
+    Programming Language :: Python :: 3
+    Programming Language :: Python :: 3 :: Only
+    Topic :: Communications
+    Typing :: Typed
+
+[options]
+package_dir=
+    =src
+packages=find:
+install_requires =
+    praw
+    prawcore
+    schedule
+    tomlkit
+
+[options.packages.find]
+where=src

setup.py

@@ -1,18 +1,3 @@
-from setuptools import setup, find_packages
+import setuptools
 
-with open("README.md", "r") as fh:
-    long_description = fh.read()
-
-setup(
-    name='drbot',
-    version='2.0.0',
-    description='DrBot - A modular Reddit bot to cure your moderation woes.',
-    long_description=long_description,
-    long_description_content_type='text/markdown',
-    url='https://github.com/c0d3rman/DRBOT',
-    author='c0d3rman',
-    license='CC BY-SA 4.0',
-    package_dir={"": "src"},
-    packages=find_packages(where="src"),
-    install_requires=["praw", "prawcore", "schedule", "tomlkit"],
-)
+setuptools.setup()

src/drbot/__init__.py

@@ -1,7 +1,10 @@
+__version__ = "2.0.0"
+__version_info__ = tuple(int(i) for i in __version__.split(".") if i.isdigit())
+
 from .settings import settings
 from .log import log
 from .reddit import reddit
 from . import util
 from .DrBot import DrBot
 
-__all__ = ["settings", "log", "reddit", "util", "DrBot"]
+__all__ = ("settings", "log", "reddit", "util", "DrBot")

src/drbot/botlings/__init__.py

@@ -1,4 +1,4 @@
 from ..Botling import Botling
 from .ModmailLinker import ModmailLinker
 
-__all__ = ["Botling", "ModmailLinker"]
+__all__ = ("Botling", "ModmailLinker")

src/drbot/reddit.py

@@ -5,6 +5,7 @@
 from uuid import uuid4
 import praw
 import prawcore
+from drbot import __version__
 from .settings import settings
 from .log import log, ModmailLoggingHandler, TemplateLoggingFormatter, BASE_FORMAT
 from .util import Singleton
@@ -142,14 +143,14 @@ def is_mod(self, username: str | praw.reddit.models.Redditor) -> bool:
     reddit = DrReddit(client_id=settings.reddit_auth.drbot_client_id,
                       client_secret=None,
                       refresh_token=settings.reddit_auth._refresh_token,
-                      user_agent="DrBot")
+                      user_agent=f"DrBot v{__version__}")
 elif settings.reddit_auth.manual._username != "":
     log.debug(f"Logging in to reddit using username + password + client_secret... (client id '{settings.reddit_auth.drbot_client_id}')")
     reddit = DrReddit(client_id=settings.reddit_auth.drbot_client_id,
                       client_secret=settings.reddit_auth.manual._client_secret,
                       username=settings.reddit_auth.manual._username,
                       password=settings.reddit_auth.manual._password,
-                      user_agent=f"DrBot")
+                      user_agent=f"DrBot v{__version__}")
 else:
     e = RuntimeError("You need to set a login method in settings/secrets.toml!")
     log.critical(e)

src/drbot/streams/__init__.py

@@ -5,4 +5,4 @@
 from .CommentStream import CommentStream
 from .ModlogStream import ModlogStream
 
-__all__ = ["Stream", "SubStream", "ModmailStream", "PostStream", "CommentStream", "ModlogStream"]
+__all__ = ("Stream", "SubStream", "ModmailStream", "PostStream", "CommentStream", "ModlogStream")