.gitignore

@@ -22,4 +22,3 @@ dr.botzo.markov
 *.swp
 *.urls
 *~
-_version.py

acro/ircplugin.py

@@ -1,4 +1,5 @@
 """An acromania style game for IRC."""
+
 import logging
 import random
 import threading
@@ -8,34 +9,40 @@ from irc.client import NickMask, is_channel
 
 from ircbot.lib import Plugin
 
-logger = logging.getLogger('acro.ircplugin')
+
+log = logging.getLogger('acro.ircplugin')
 
 
 class Acro(Plugin):
+
     """Play a game where users come up with silly definitions for randomly-generated acronyms."""
 
     class AcroGame(object):
+    
         """Track game details."""
-
+    
         def __init__(self):
             """Initialize basic stuff."""
+    
             # running state
             self.state = 0
             self.quit = False
             self.scores = dict()
             self.rounds = []
             self.channel = ''
-
+    
     class AcroRound(object):
+    
         """Track a particular round of a game."""
-
+    
         def __init__(self):
             """Initialize basic stuff."""
+    
             self.acro = ""
             self.submissions = dict()
             self.sub_shuffle = []
             self.votes = dict()
-
+    
             # default options
             self.seconds_to_submit = 60
             self.seconds_to_vote = 45
@@ -44,6 +51,7 @@ class Acro(Plugin):
 
     def __init__(self, bot, connection, event):
         """Set up the game tracking and such."""
+
         # game state
         self.game = self.AcroGame()
 
@@ -51,6 +59,7 @@ class Acro(Plugin):
 
     def start(self):
         """Set up handlers."""
+
         self.connection.reactor.add_global_regex_handler(['pubmsg', 'privmsg'], r'^!acro\s+status$',
                                                          self.handle_status, -20)
         self.connection.reactor.add_global_regex_handler(['pubmsg', 'privmsg'], r'^!acro\s+start$',
@@ -66,6 +75,7 @@ class Acro(Plugin):
 
     def stop(self):
         """Tear down handlers."""
+
         self.connection.reactor.remove_global_regex_handler(['pubmsg', 'privmsg'], self.handle_status)
         self.connection.reactor.remove_global_regex_handler(['pubmsg', 'privmsg'], self.handle_start)
         self.connection.reactor.remove_global_regex_handler(['pubmsg', 'privmsg'], self.handle_submit)
@@ -76,6 +86,7 @@ class Acro(Plugin):
 
     def handle_status(self, connection, event, match):
         """Return the status of the currently-running game, if there is one."""
+
         if self.game.state == 0:
             return self.bot.reply(event, "there currently isn't a game running.")
         else:
@@ -83,6 +94,7 @@ class Acro(Plugin):
 
     def handle_start(self, connection, event, match):
         """Start the game, notify the channel, and begin timers."""
+
         if self.game.state != 0:
             return self.bot.reply(event, "the game is already running.")
         else:
@@ -93,6 +105,7 @@ class Acro(Plugin):
 
     def handle_submit(self, connection, event, match):
         """Take a submission for an acro."""
+
         nick = NickMask(event.source).nick
         submission = match.group(1)
 
@@ -100,6 +113,7 @@ class Acro(Plugin):
 
     def handle_vote(self, connection, event, match):
         """Take a vote for an acro."""
+
         nick = NickMask(event.source).nick
         vote = match.group(1)
 
@@ -107,22 +121,26 @@ class Acro(Plugin):
 
     def handle_quit(self, connection, event, match):
         """Quit the game after the current round ends."""
+
         if self.game.state != 0:
             self.game.quit = True
             return self.bot.reply(event, "the game will end after the current round.")
 
     def thread_do_process_submissions(self, sleep_time):
         """Wait for players to provide acro submissions, and then kick off voting."""
+
         time.sleep(sleep_time)
         self._start_voting()
 
     def thread_do_process_votes(self):
         """Wait for players to provide votes, and then continue or quit."""
+
         time.sleep(self.game.rounds[-1].seconds_to_vote)
         self._end_current_round()
 
     def _start_new_game(self, channel):
         """Begin a new game, which will have multiple rounds."""
+
         self.game.state = 1
         self.game.channel = channel
         self.bot.reply(None, "starting a new game of acro. it will run until you tell it to quit.",
@@ -132,12 +150,12 @@ class Acro(Plugin):
 
     def _start_new_round(self):
         """Start a new round for play."""
+
         self.game.state = 2
         self.game.rounds.append(self.AcroRound())
         acro = self._generate_acro()
         self.game.rounds[-1].acro = acro
-        sleep_time = (self.game.rounds[-1].seconds_to_submit +
-                      (self.game.rounds[-1].seconds_to_submit_step * (len(acro)-3)))
+        sleep_time = self.game.rounds[-1].seconds_to_submit + (self.game.rounds[-1].seconds_to_submit_step * (len(acro)-3))
 
         self.bot.reply(None, "the round has started! your acronym is '{0:s}'. "
                              "submit within {1:d} seconds via !acro submit [meaning]".format(acro, sleep_time),
@@ -148,16 +166,17 @@ class Acro(Plugin):
         t.start()
 
     @staticmethod
-    def _generate_acro():       # noqa: C901
+    def _generate_acro():
         """Generate an acro to play with.
 
         Letter frequencies pinched from
         http://www.math.cornell.edu/~mec/2003-2004/cryptography/subs/frequencies.html
         """
+
         acro = []
         # generate acro 3-8 characters long
-        for i in range(1, random.SystemRandom.randint(4, 9)):
-            letter = random.SystemRandom.randint(1, 182303)
+        for i in range(1, random.randint(4, 9)):
+            letter = random.randint(1, 182303)
             if letter <= 21912:
                 acro.append('E')
             elif letter <= 38499:
@@ -215,6 +234,7 @@ class Acro(Plugin):
 
     def _take_acro_submission(self, nick, submission):
         """Take an acro submission and record it."""
+
         if self.game.state == 2:
             sub_acro = self._turn_text_into_acro(submission)
 
@@ -227,6 +247,7 @@ class Acro(Plugin):
     @staticmethod
     def _turn_text_into_acro(text):
         """Turn text into an acronym."""
+
         words = text.split()
         acro = []
         for w in words:
@@ -235,9 +256,10 @@ class Acro(Plugin):
 
     def _start_voting(self):
         """Begin the voting period."""
+
         self.game.state = 3
         self.game.rounds[-1].sub_shuffle = list(self.game.rounds[-1].submissions.keys())
-        random.SystemRandom.shuffle(self.game.rounds[-1].sub_shuffle)
+        random.shuffle(self.game.rounds[-1].sub_shuffle)
         self.bot.reply(None, "here are the results. vote with !acro vote [number]", explicit_target=self.game.channel)
         self._print_round_acros()
 
@@ -247,19 +269,21 @@ class Acro(Plugin):
 
     def _print_round_acros(self):
         """Take the current round's acros and spit them to the channel."""
+
         i = 0
         for s in self.game.rounds[-1].sub_shuffle:
-            logger.debug("%s is %s", str(i), s)
+            log.debug("%s is %s", str(i), s)
             self.bot.reply(None, "   {0:d}: {1:s}".format(i+1, self.game.rounds[-1].submissions[s]),
                            explicit_target=self.game.channel)
             i += 1
 
     def _take_acro_vote(self, nick, vote):
         """Take an acro vote and record it."""
+
         if self.game.state == 3:
             acros = self.game.rounds[-1].submissions
             if int(vote) > 0 and int(vote) <= len(acros):
-                logger.debug("%s is %s", vote,  self.game.rounds[-1].sub_shuffle[int(vote)-1])
+                log.debug("%s is %s", vote,  self.game.rounds[-1].sub_shuffle[int(vote)-1])
                 key = self.game.rounds[-1].sub_shuffle[int(vote)-1]
 
                 if key != nick:
@@ -272,6 +296,7 @@ class Acro(Plugin):
 
     def _end_current_round(self):
         """Clean up and output for ending the current round."""
+
         self.game.state = 4
         self.bot.reply(None, "voting's over! here are the scores for the round:", explicit_target=self.game.channel)
         self._print_round_scores()
@@ -283,6 +308,7 @@ class Acro(Plugin):
 
     def _print_round_scores(self):
         """For the acros in the round, find the votes for them."""
+
         i = 0
         for s in list(self.game.rounds[-1].submissions.keys()):
             votes = [x for x in list(self.game.rounds[-1].votes.values()) if x == s]
@@ -292,6 +318,7 @@ class Acro(Plugin):
 
     def _add_round_scores_to_game_scores(self):
         """Apply the final round scores to the totall scores for the game."""
+
         for s in list(self.game.rounds[-1].votes.values()):
             votes = [x for x in list(self.game.rounds[-1].votes.values()) if x == s]
             if s in list(self.game.scores.keys()):
@@ -301,6 +328,7 @@ class Acro(Plugin):
 
     def _continue_or_quit(self):
         """Decide whether the game should continue or quit."""
+
         if self.game.state == 4:
             if self.game.quit:
                 self._end_game()
@@ -309,6 +337,7 @@ class Acro(Plugin):
 
     def _end_game(self):
         """Clean up the entire game."""
+
         self.game.state = 0
         self.game.quit = False
         self.bot.reply(None, "game's over! here are the final scores:", explicit_target=self.game.channel)
@@ -316,6 +345,7 @@ class Acro(Plugin):
 
     def _print_game_scores(self):
         """Print the final calculated scores."""
+
         for s in list(self.game.scores.keys()):
             self.bot.reply(None, "   {0:s}: {1:d}".format(s, self.game.scores[s]), explicit_target=self.game.channel)
 

dr_botzo/__init__.py

@@ -1 +1,4 @@
-"""Set up the core bot."""
+"""Set up the version number of the bot."""
+from ._version import get_versions
+__version__ = get_versions()['version']
+del get_versions

dr_botzo/_version.py

@@ -0,0 +1,520 @@
+
+# This file helps to compute a version number in source trees obtained from
+# git-archive tarball (such as those provided by githubs download-from-tag
+# feature). Distribution tarballs (built by setup.py sdist) and build
+# directories (produced by setup.py build) will contain a much shorter file
+# that just contains the computed version number.
+
+# This file is released into the public domain. Generated by
+# versioneer-0.18 (https://github.com/warner/python-versioneer)
+
+"""Git implementation of _version.py."""
+
+import errno
+import os
+import re
+import subprocess
+import sys
+
+
+def get_keywords():
+    """Get the keywords needed to look up the version information."""
+    # these strings will be replaced by git during git-archive.
+    # setup.py/versioneer.py will grep for the variable names, so they must
+    # each be defined on a line of their own. _version.py will just call
+    # get_keywords().
+    git_refnames = "$Format:%d$"
+    git_full = "$Format:%H$"
+    git_date = "$Format:%ci$"
+    keywords = {"refnames": git_refnames, "full": git_full, "date": git_date}
+    return keywords
+
+
+class VersioneerConfig:
+    """Container for Versioneer configuration parameters."""
+
+
+def get_config():
+    """Create, populate and return the VersioneerConfig() object."""
+    # these strings are filled in when 'setup.py versioneer' creates
+    # _version.py
+    cfg = VersioneerConfig()
+    cfg.VCS = "git"
+    cfg.style = "pep440"
+    cfg.tag_prefix = "v"
+    cfg.parentdir_prefix = "None"
+    cfg.versionfile_source = "dr_botzo/_version.py"
+    cfg.verbose = False
+    return cfg
+
+
+class NotThisMethod(Exception):
+    """Exception raised if a method is not valid for the current scenario."""
+
+
+LONG_VERSION_PY = {}
+HANDLERS = {}
+
+
+def register_vcs_handler(vcs, method):  # decorator
+    """Decorator to mark a method as the handler for a particular VCS."""
+    def decorate(f):
+        """Store f in HANDLERS[vcs][method]."""
+        if vcs not in HANDLERS:
+            HANDLERS[vcs] = {}
+        HANDLERS[vcs][method] = f
+        return f
+    return decorate
+
+
+def run_command(commands, args, cwd=None, verbose=False, hide_stderr=False,
+                env=None):
+    """Call the given command(s)."""
+    assert isinstance(commands, list)
+    p = None
+    for c in commands:
+        try:
+            dispcmd = str([c] + args)
+            # remember shell=False, so use git.cmd on windows, not just git
+            p = subprocess.Popen([c] + args, cwd=cwd, env=env,
+                                 stdout=subprocess.PIPE,
+                                 stderr=(subprocess.PIPE if hide_stderr
+                                         else None))
+            break
+        except EnvironmentError:
+            e = sys.exc_info()[1]
+            if e.errno == errno.ENOENT:
+                continue
+            if verbose:
+                print("unable to run %s" % dispcmd)
+                print(e)
+            return None, None
+    else:
+        if verbose:
+            print("unable to find command, tried %s" % (commands,))
+        return None, None
+    stdout = p.communicate()[0].strip()
+    if sys.version_info[0] >= 3:
+        stdout = stdout.decode()
+    if p.returncode != 0:
+        if verbose:
+            print("unable to run %s (error)" % dispcmd)
+            print("stdout was %s" % stdout)
+        return None, p.returncode
+    return stdout, p.returncode
+
+
+def versions_from_parentdir(parentdir_prefix, root, verbose):
+    """Try to determine the version from the parent directory name.
+
+    Source tarballs conventionally unpack into a directory that includes both
+    the project name and a version string. We will also support searching up
+    two directory levels for an appropriately named parent directory
+    """
+    rootdirs = []
+
+    for i in range(3):
+        dirname = os.path.basename(root)
+        if dirname.startswith(parentdir_prefix):
+            return {"version": dirname[len(parentdir_prefix):],
+                    "full-revisionid": None,
+                    "dirty": False, "error": None, "date": None}
+        else:
+            rootdirs.append(root)
+            root = os.path.dirname(root)  # up a level
+
+    if verbose:
+        print("Tried directories %s but none started with prefix %s" %
+              (str(rootdirs), parentdir_prefix))
+    raise NotThisMethod("rootdir doesn't start with parentdir_prefix")
+
+
+@register_vcs_handler("git", "get_keywords")
+def git_get_keywords(versionfile_abs):
+    """Extract version information from the given file."""
+    # the code embedded in _version.py can just fetch the value of these
+    # keywords. When used from setup.py, we don't want to import _version.py,
+    # so we do it with a regexp instead. This function is not used from
+    # _version.py.
+    keywords = {}
+    try:
+        f = open(versionfile_abs, "r")
+        for line in f.readlines():
+            if line.strip().startswith("git_refnames ="):
+                mo = re.search(r'=\s*"(.*)"', line)
+                if mo:
+                    keywords["refnames"] = mo.group(1)
+            if line.strip().startswith("git_full ="):
+                mo = re.search(r'=\s*"(.*)"', line)
+                if mo:
+                    keywords["full"] = mo.group(1)
+            if line.strip().startswith("git_date ="):
+                mo = re.search(r'=\s*"(.*)"', line)
+                if mo:
+                    keywords["date"] = mo.group(1)
+        f.close()
+    except EnvironmentError:
+        pass
+    return keywords
+
+
+@register_vcs_handler("git", "keywords")
+def git_versions_from_keywords(keywords, tag_prefix, verbose):
+    """Get version information from git keywords."""
+    if not keywords:
+        raise NotThisMethod("no keywords at all, weird")
+    date = keywords.get("date")
+    if date is not None:
+        # git-2.2.0 added "%cI", which expands to an ISO-8601 -compliant
+        # datestamp. However we prefer "%ci" (which expands to an "ISO-8601
+        # -like" string, which we must then edit to make compliant), because
+        # it's been around since git-1.5.3, and it's too difficult to
+        # discover which version we're using, or to work around using an
+        # older one.
+        date = date.strip().replace(" ", "T", 1).replace(" ", "", 1)
+    refnames = keywords["refnames"].strip()
+    if refnames.startswith("$Format"):
+        if verbose:
+            print("keywords are unexpanded, not using")
+        raise NotThisMethod("unexpanded keywords, not a git-archive tarball")
+    refs = set([r.strip() for r in refnames.strip("()").split(",")])
+    # starting in git-1.8.3, tags are listed as "tag: foo-1.0" instead of
+    # just "foo-1.0". If we see a "tag: " prefix, prefer those.
+    TAG = "tag: "
+    tags = set([r[len(TAG):] for r in refs if r.startswith(TAG)])
+    if not tags:
+        # Either we're using git < 1.8.3, or there really are no tags. We use
+        # a heuristic: assume all version tags have a digit. The old git %d
+        # expansion behaves like git log --decorate=short and strips out the
+        # refs/heads/ and refs/tags/ prefixes that would let us distinguish
+        # between branches and tags. By ignoring refnames without digits, we
+        # filter out many common branch names like "release" and
+        # "stabilization", as well as "HEAD" and "master".
+        tags = set([r for r in refs if re.search(r'\d', r)])
+        if verbose:
+            print("discarding '%s', no digits" % ",".join(refs - tags))
+    if verbose:
+        print("likely tags: %s" % ",".join(sorted(tags)))
+    for ref in sorted(tags):
+        # sorting will prefer e.g. "2.0" over "2.0rc1"
+        if ref.startswith(tag_prefix):
+            r = ref[len(tag_prefix):]
+            if verbose:
+                print("picking %s" % r)
+            return {"version": r,
+                    "full-revisionid": keywords["full"].strip(),
+                    "dirty": False, "error": None,
+                    "date": date}
+    # no suitable tags, so version is "0+unknown", but full hex is still there
+    if verbose:
+        print("no suitable tags, using unknown + full revision id")
+    return {"version": "0+unknown",
+            "full-revisionid": keywords["full"].strip(),
+            "dirty": False, "error": "no suitable tags", "date": None}
+
+
+@register_vcs_handler("git", "pieces_from_vcs")
+def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command):
+    """Get version from 'git describe' in the root of the source tree.
+
+    This only gets called if the git-archive 'subst' keywords were *not*
+    expanded, and _version.py hasn't already been rewritten with a short
+    version string, meaning we're inside a checked out source tree.
+    """
+    GITS = ["git"]
+    if sys.platform == "win32":
+        GITS = ["git.cmd", "git.exe"]
+
+    out, rc = run_command(GITS, ["rev-parse", "--git-dir"], cwd=root,
+                          hide_stderr=True)
+    if rc != 0:
+        if verbose:
+            print("Directory %s not under git control" % root)
+        raise NotThisMethod("'git rev-parse --git-dir' returned error")
+
+    # if there is a tag matching tag_prefix, this yields TAG-NUM-gHEX[-dirty]
+    # if there isn't one, this yields HEX[-dirty] (no NUM)
+    describe_out, rc = run_command(GITS, ["describe", "--tags", "--dirty",
+                                          "--always", "--long",
+                                          "--match", "%s*" % tag_prefix],
+                                   cwd=root)
+    # --long was added in git-1.5.5
+    if describe_out is None:
+        raise NotThisMethod("'git describe' failed")
+    describe_out = describe_out.strip()
+    full_out, rc = run_command(GITS, ["rev-parse", "HEAD"], cwd=root)
+    if full_out is None:
+        raise NotThisMethod("'git rev-parse' failed")
+    full_out = full_out.strip()
+
+    pieces = {}
+    pieces["long"] = full_out
+    pieces["short"] = full_out[:7]  # maybe improved later
+    pieces["error"] = None
+
+    # parse describe_out. It will be like TAG-NUM-gHEX[-dirty] or HEX[-dirty]
+    # TAG might have hyphens.
+    git_describe = describe_out
+
+    # look for -dirty suffix
+    dirty = git_describe.endswith("-dirty")
+    pieces["dirty"] = dirty
+    if dirty:
+        git_describe = git_describe[:git_describe.rindex("-dirty")]
+
+    # now we have TAG-NUM-gHEX or HEX
+
+    if "-" in git_describe:
+        # TAG-NUM-gHEX
+        mo = re.search(r'^(.+)-(\d+)-g([0-9a-f]+)$', git_describe)
+        if not mo:
+            # unparseable. Maybe git-describe is misbehaving?
+            pieces["error"] = ("unable to parse git-describe output: '%s'"
+                               % describe_out)
+            return pieces
+
+        # tag
+        full_tag = mo.group(1)
+        if not full_tag.startswith(tag_prefix):
+            if verbose:
+                fmt = "tag '%s' doesn't start with prefix '%s'"
+                print(fmt % (full_tag, tag_prefix))
+            pieces["error"] = ("tag '%s' doesn't start with prefix '%s'"
+                               % (full_tag, tag_prefix))
+            return pieces
+        pieces["closest-tag"] = full_tag[len(tag_prefix):]
+
+        # distance: number of commits since tag
+        pieces["distance"] = int(mo.group(2))
+
+        # commit: short hex revision ID
+        pieces["short"] = mo.group(3)
+
+    else:
+        # HEX: no tags
+        pieces["closest-tag"] = None
+        count_out, rc = run_command(GITS, ["rev-list", "HEAD", "--count"],
+                                    cwd=root)
+        pieces["distance"] = int(count_out)  # total number of commits
+
+    # commit date: see ISO-8601 comment in git_versions_from_keywords()
+    date = run_command(GITS, ["show", "-s", "--format=%ci", "HEAD"],
+                       cwd=root)[0].strip()
+    pieces["date"] = date.strip().replace(" ", "T", 1).replace(" ", "", 1)
+
+    return pieces
+
+
+def plus_or_dot(pieces):
+    """Return a + if we don't already have one, else return a ."""
+    if "+" in pieces.get("closest-tag", ""):
+        return "."
+    return "+"
+
+
+def render_pep440(pieces):
+    """Build up version string, with post-release "local version identifier".
+
+    Our goal: TAG[+DISTANCE.gHEX[.dirty]] . Note that if you
+    get a tagged build and then dirty it, you'll get TAG+0.gHEX.dirty
+
+    Exceptions:
+    1: no tags. git_describe was just HEX. 0+untagged.DISTANCE.gHEX[.dirty]
+    """
+    if pieces["closest-tag"]:
+        rendered = pieces["closest-tag"]
+        if pieces["distance"] or pieces["dirty"]:
+            rendered += plus_or_dot(pieces)
+            rendered += "%d.g%s" % (pieces["distance"], pieces["short"])
+            if pieces["dirty"]:
+                rendered += ".dirty"
+    else:
+        # exception #1
+        rendered = "0+untagged.%d.g%s" % (pieces["distance"],
+                                          pieces["short"])
+        if pieces["dirty"]:
+            rendered += ".dirty"
+    return rendered
+
+
+def render_pep440_pre(pieces):
+    """TAG[.post.devDISTANCE] -- No -dirty.
+
+    Exceptions:
+    1: no tags. 0.post.devDISTANCE
+    """
+    if pieces["closest-tag"]:
+        rendered = pieces["closest-tag"]
+        if pieces["distance"]:
+            rendered += ".post.dev%d" % pieces["distance"]
+    else:
+        # exception #1
+        rendered = "0.post.dev%d" % pieces["distance"]
+    return rendered
+
+
+def render_pep440_post(pieces):
+    """TAG[.postDISTANCE[.dev0]+gHEX] .
+
+    The ".dev0" means dirty. Note that .dev0 sorts backwards
+    (a dirty tree will appear "older" than the corresponding clean one),
+    but you shouldn't be releasing software with -dirty anyways.
+
+    Exceptions:
+    1: no tags. 0.postDISTANCE[.dev0]
+    """
+    if pieces["closest-tag"]:
+        rendered = pieces["closest-tag"]
+        if pieces["distance"] or pieces["dirty"]:
+            rendered += ".post%d" % pieces["distance"]
+            if pieces["dirty"]:
+                rendered += ".dev0"
+            rendered += plus_or_dot(pieces)
+            rendered += "g%s" % pieces["short"]
+    else:
+        # exception #1
+        rendered = "0.post%d" % pieces["distance"]
+        if pieces["dirty"]:
+            rendered += ".dev0"
+        rendered += "+g%s" % pieces["short"]
+    return rendered
+
+
+def render_pep440_old(pieces):
+    """TAG[.postDISTANCE[.dev0]] .
+
+    The ".dev0" means dirty.
+
+    Eexceptions:
+    1: no tags. 0.postDISTANCE[.dev0]
+    """
+    if pieces["closest-tag"]:
+        rendered = pieces["closest-tag"]
+        if pieces["distance"] or pieces["dirty"]:
+            rendered += ".post%d" % pieces["distance"]
+            if pieces["dirty"]:
+                rendered += ".dev0"
+    else:
+        # exception #1
+        rendered = "0.post%d" % pieces["distance"]
+        if pieces["dirty"]:
+            rendered += ".dev0"
+    return rendered
+
+
+def render_git_describe(pieces):
+    """TAG[-DISTANCE-gHEX][-dirty].
+
+    Like 'git describe --tags --dirty --always'.
+
+    Exceptions:
+    1: no tags. HEX[-dirty]  (note: no 'g' prefix)
+    """
+    if pieces["closest-tag"]:
+        rendered = pieces["closest-tag"]
+        if pieces["distance"]:
+            rendered += "-%d-g%s" % (pieces["distance"], pieces["short"])
+    else:
+        # exception #1
+        rendered = pieces["short"]
+    if pieces["dirty"]:
+        rendered += "-dirty"
+    return rendered
+
+
+def render_git_describe_long(pieces):
+    """TAG-DISTANCE-gHEX[-dirty].
+
+    Like 'git describe --tags --dirty --always -long'.
+    The distance/hash is unconditional.
+
+    Exceptions:
+    1: no tags. HEX[-dirty]  (note: no 'g' prefix)
+    """
+    if pieces["closest-tag"]:
+        rendered = pieces["closest-tag"]
+        rendered += "-%d-g%s" % (pieces["distance"], pieces["short"])
+    else:
+        # exception #1
+        rendered = pieces["short"]
+    if pieces["dirty"]:
+        rendered += "-dirty"
+    return rendered
+
+
+def render(pieces, style):
+    """Render the given version pieces into the requested style."""
+    if pieces["error"]:
+        return {"version": "unknown",
+                "full-revisionid": pieces.get("long"),
+                "dirty": None,
+                "error": pieces["error"],
+                "date": None}
+
+    if not style or style == "default":
+        style = "pep440"  # the default
+
+    if style == "pep440":
+        rendered = render_pep440(pieces)
+    elif style == "pep440-pre":
+        rendered = render_pep440_pre(pieces)
+    elif style == "pep440-post":
+        rendered = render_pep440_post(pieces)
+    elif style == "pep440-old":
+        rendered = render_pep440_old(pieces)
+    elif style == "git-describe":
+        rendered = render_git_describe(pieces)
+    elif style == "git-describe-long":
+        rendered = render_git_describe_long(pieces)
+    else:
+        raise ValueError("unknown style '%s'" % style)
+
+    return {"version": rendered, "full-revisionid": pieces["long"],
+            "dirty": pieces["dirty"], "error": None,
+            "date": pieces.get("date")}
+
+
+def get_versions():
+    """Get version information or return default if unable to do so."""
+    # I am in _version.py, which lives at ROOT/VERSIONFILE_SOURCE. If we have
+    # __file__, we can work backwards from there to the root. Some
+    # py2exe/bbfreeze/non-CPython implementations don't do __file__, in which
+    # case we can only use expanded keywords.
+
+    cfg = get_config()
+    verbose = cfg.verbose
+
+    try:
+        return git_versions_from_keywords(get_keywords(), cfg.tag_prefix,
+                                          verbose)
+    except NotThisMethod:
+        pass
+
+    try:
+        root = os.path.realpath(__file__)
+        # versionfile_source is the relative path from the top of the source
+        # tree (where the .git directory might live) to this file. Invert
+        # this to find the root from __file__.
+        for i in cfg.versionfile_source.split('/'):
+            root = os.path.dirname(root)
+    except NameError:
+        return {"version": "0+unknown", "full-revisionid": None,
+                "dirty": None,
+                "error": "unable to find root of source tree",
+                "date": None}
+
+    try:
+        pieces = git_pieces_from_vcs(cfg.tag_prefix, root, verbose)
+        return render(pieces, cfg.style)
+    except NotThisMethod:
+        pass
+
+    try:
+        if cfg.parentdir_prefix:
+            return versions_from_parentdir(cfg.parentdir_prefix, root, verbose)
+    except NotThisMethod:
+        pass
+
+    return {"version": "0+unknown", "full-revisionid": None,
+            "dirty": None,
+            "error": "unable to compute version", "date": None}

ircbot/bot.py

@@ -20,7 +20,7 @@ from irc.dict import IRCDict
 from jaraco.stream import buffer
 
 import ircbot.lib as ircbotlib
-from dr_botzo._version import __version__
+from dr_botzo import __version__
 from ircbot.models import Alias, IrcChannel, IrcPlugin, IrcServer
 
 log = logging.getLogger('ircbot.bot')

pyproject.toml

@@ -1,80 +0,0 @@
-[build-system]
-requires = ["setuptools>=61.0", "setuptools_scm[toml]>=6.2"]
-build-backend = "setuptools.build_meta"
-
-[project]
-name = "dr.botzo"
-description = "A modularized IRC bot with a Django backend."
-readme = "README.md"
-license = {text = "GPL-3.0"}
-authors = [
-	{name = "Brian S. Stephan", email = "bss@incorporeal.org"},
-]
-requires-python = ">=3.10,<3.12"
-dependencies = ["Django<5.1", "django-bootstrap3", "django-extensions", "djangorestframework", "irc", "parsedatetime", "ply",
-                "python-dateutil", "python-mpd2", "pytz", "zalgo-text"]
-dynamic = ["version"]
-classifiers = [
-	"Framework :: Django",
-	"Programming Language :: Python :: 3",
-	"License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
-	"Operating System :: OS Independent",
-    "Topic :: Communications :: Chat :: Internet Relay Chat",
-]
-
-[project.urls]
-"Homepage" = "https://git.incorporeal.org/bss/dr.botzo"
-"Changelog" = "https://git.incorporeal.org/bss/dr.botzo/releases"
-"Bug Tracker" = "https://git.incorporeal.org/bss/dr.botzo/issues"
-
-
-[project.optional-dependencies]
-dev = ["bandit", "dlint", "flake8", "flake8-blind-except", "flake8-builtins", "flake8-docstrings",
-       "flake8-executable", "flake8-fixme", "flake8-isort", "flake8-logging-format", "flake8-mutable",
-       "flake8-pyproject", "pip-tools", "pytest", "pytest-cov", "pytest-django", "reuse", "safety", "tox"]
-
-[tool.flake8]
-enable-extensions = "G,M"
-exclude = [".tox/", "dr_botzo/_version.py", "**/migrations/"]
-extend-ignore = "T101"
-max-complexity = 10
-max-line-length = 120
-
-[tool.isort]
-line_length = 120
-
-# TODO: mypy
-[tool.mypy]
-ignore_missing_imports = true
-
-[tool.pytest.ini_options]
-python_files = ["*_tests.py", "tests.py", "test_*.py"]
-DJANGO_SETTINGS_MODULE = "dr_botzo.settings"
-django_find_project = false
-
-# I think this can go away if I switch to a src/ based repo
-[tool.setuptools]
-packages = [
-    "acro",
-    "countdown",
-    "dice",
-    "dispatch",
-    "dr_botzo",
-    "facts",
-    "history",
-    "ircbot",
-    "karma",
-    "markov",
-    "mpdbot",
-    "pi",
-    "races",
-    "seen",
-    "static",
-    "storycraft",
-    "text_manip",
-    "transform",
-    "weather",
-]
-
-[tool.setuptools_scm]
-write_to = "dr_botzo/_version.py"

requirements/requirements-dev.in

@@ -0,0 +1,29 @@
+-r requirements.in
+
+# testing runner, test reporting, packages used during testing (e.g. requests-mock), etc.
+pytest
+pytest-cov
+pytest-django
+
+# linting and other static code analysis
+bandit
+dlint
+flake8                      # flake8 and plugins, for local dev linting in vim
+flake8-blind-except
+flake8-builtins
+flake8-docstrings
+flake8-executable
+flake8-fixme
+flake8-isort
+flake8-logging-format
+flake8-mutable
+safety
+
+# maintenance utilities and tox
+pip-tools                   # pip-compile
+tox<4                       # CI stuff
+tox-wheel                   # build wheels in tox
+versioneer                  # automatic version numbering
+
+# license/copyright tooling
+reuse

requirements/requirements-dev.txt

@@ -2,234 +2,217 @@
 # This file is autogenerated by pip-compile with Python 3.11
 # by the following command:
 #
-#    pip-compile --extra=dev --output-file=requirements/requirements-dev.txt
+#    pip-compile --output-file=requirements/requirements-dev.txt requirements/requirements-dev.in
 #
-annotated-types==0.7.0
+annotated-types==0.6.0
     # via pydantic
 asgiref==3.8.1
     # via django
-attrs==24.2.0
-    # via reuse
-authlib==1.3.2
+authlib==1.3.0
     # via safety
 autocommand==2.2.2
     # via jaraco-text
-backports-tarfile==1.2.0
+backports-tarfile==1.1.1
     # via jaraco-context
-bandit==1.7.10
-    # via dr.botzo (pyproject.toml)
+bandit==1.7.8
+    # via -r requirements/requirements-dev.in
 binaryornot==0.4.4
     # via reuse
 boolean-py==4.0
     # via
     #   license-expression
     #   reuse
-build==1.2.2.post1
+build==1.2.1
     # via pip-tools
-cachetools==5.5.0
-    # via tox
-certifi==2024.8.30
+certifi==2024.2.2
     # via requests
-cffi==1.17.1
+cffi==1.16.0
     # via cryptography
 chardet==5.2.0
     # via
     #   binaryornot
     #   python-debian
-    #   tox
-charset-normalizer==3.4.0
+charset-normalizer==3.3.2
     # via requests
 click==8.1.7
     # via
     #   pip-tools
     #   safety
     #   typer
-colorama==0.4.6
-    # via tox
-coverage[toml]==7.6.4
+coverage[toml]==7.5.0
     # via pytest-cov
-cryptography==43.0.3
+cryptography==42.0.5
     # via authlib
-distlib==0.3.9
+distlib==0.3.8
     # via virtualenv
-django==5.0.9
+django==5.0.4
     # via
+    #   -r requirements/requirements.in
     #   django-bootstrap3
     #   django-extensions
     #   djangorestframework
-    #   dr.botzo (pyproject.toml)
-django-bootstrap3==24.3
-    # via dr.botzo (pyproject.toml)
+django-bootstrap3==24.2
+    # via -r requirements/requirements.in
 django-extensions==3.2.3
-    # via dr.botzo (pyproject.toml)
-djangorestframework==3.15.2
-    # via dr.botzo (pyproject.toml)
-dlint==0.15.0
-    # via dr.botzo (pyproject.toml)
+    # via -r requirements/requirements.in
+djangorestframework==3.15.1
+    # via -r requirements/requirements.in
+dlint==0.14.1
+    # via -r requirements/requirements-dev.in
 dparse==0.6.4b0
     # via
     #   safety
     #   safety-schemas
-filelock==3.12.4
+filelock==3.14.0
     # via
-    #   safety
     #   tox
     #   virtualenv
-flake8==7.1.1
+flake8==7.0.0
     # via
+    #   -r requirements/requirements-dev.in
     #   dlint
-    #   dr.botzo (pyproject.toml)
     #   flake8-builtins
     #   flake8-docstrings
     #   flake8-executable
     #   flake8-isort
     #   flake8-mutable
-    #   flake8-pyproject
 flake8-blind-except==0.2.1
-    # via dr.botzo (pyproject.toml)
+    # via -r requirements/requirements-dev.in
 flake8-builtins==2.5.0
-    # via dr.botzo (pyproject.toml)
+    # via -r requirements/requirements-dev.in
 flake8-docstrings==1.7.0
-    # via dr.botzo (pyproject.toml)
+    # via -r requirements/requirements-dev.in
 flake8-executable==2.1.3
-    # via dr.botzo (pyproject.toml)
+    # via -r requirements/requirements-dev.in
 flake8-fixme==1.1.1
-    # via dr.botzo (pyproject.toml)
+    # via -r requirements/requirements-dev.in
 flake8-isort==6.1.1
-    # via dr.botzo (pyproject.toml)
-flake8-logging-format==2024.24.12
-    # via dr.botzo (pyproject.toml)
+    # via -r requirements/requirements-dev.in
+flake8-logging-format==0.9.0
+    # via -r requirements/requirements-dev.in
 flake8-mutable==1.2.0
-    # via dr.botzo (pyproject.toml)
-flake8-pyproject==1.2.3
-    # via dr.botzo (pyproject.toml)
-idna==3.10
+    # via -r requirements/requirements-dev.in
+idna==3.7
     # via requests
-importlib-resources==6.4.5
-    # via irc
+inflect==7.2.1
+    # via jaraco-text
 iniconfig==2.0.0
     # via pytest
-irc==20.5.0
-    # via dr.botzo (pyproject.toml)
+irc==20.4.0
+    # via -r requirements/requirements.in
 isort==5.13.2
     # via flake8-isort
-jaraco-collections==5.1.0
+jaraco-collections==5.0.1
     # via irc
-jaraco-context==6.0.1
+jaraco-context==5.3.0
     # via jaraco-text
-jaraco-functools==4.1.0
+jaraco-functools==4.0.1
     # via
     #   irc
     #   jaraco-text
     #   tempora
 jaraco-logging==3.3.0
     # via irc
-jaraco-stream==3.0.4
+jaraco-stream==3.0.3
     # via irc
-jaraco-text==4.0.0
+jaraco-text==3.12.0
     # via
     #   irc
     #   jaraco-collections
-jinja2==3.1.4
+jinja2==3.1.3
     # via
     #   reuse
     #   safety
-license-expression==30.4.0
+license-expression==30.3.0
     # via reuse
 markdown-it-py==3.0.0
     # via rich
-markupsafe==3.0.2
+markupsafe==2.1.5
     # via jinja2
-marshmallow==3.23.0
+marshmallow==3.21.2
     # via safety
 mccabe==0.7.0
     # via flake8
 mdurl==0.1.2
     # via markdown-it-py
-more-itertools==10.5.0
+more-itertools==10.2.0
     # via
+    #   inflect
     #   irc
     #   jaraco-functools
-    #   jaraco-stream
     #   jaraco-text
-packaging==24.1
+packaging==24.0
     # via
     #   build
     #   dparse
     #   marshmallow
-    #   pyproject-api
     #   pytest
     #   safety
     #   safety-schemas
     #   tox
 parsedatetime==2.6
-    # via dr.botzo (pyproject.toml)
-pbr==6.1.0
+    # via -r requirements/requirements.in
+pbr==6.0.0
     # via stevedore
 pip-tools==7.4.1
-    # via dr.botzo (pyproject.toml)
-platformdirs==4.3.6
-    # via
-    #   tox
-    #   virtualenv
+    # via -r requirements/requirements-dev.in
+platformdirs==4.2.1
+    # via virtualenv
 pluggy==1.5.0
     # via
     #   pytest
     #   tox
 ply==3.11
-    # via dr.botzo (pyproject.toml)
-psutil==6.0.0
-    # via safety
-pycodestyle==2.12.1
+    # via -r requirements/requirements.in
+py==1.11.0
+    # via tox
+pycodestyle==2.11.1
     # via flake8
 pycparser==2.22
     # via cffi
-pydantic==2.5.3
+pydantic==2.7.1
     # via
     #   safety
     #   safety-schemas
-pydantic-core==2.14.6
+pydantic-core==2.18.2
     # via pydantic
 pydocstyle==6.3.0
     # via flake8-docstrings
 pyflakes==3.2.0
     # via flake8
-pygments==2.18.0
+pygments==2.17.2
     # via rich
-pyproject-api==1.8.0
-    # via tox
-pyproject-hooks==1.2.0
+pyproject-hooks==1.1.0
     # via
     #   build
     #   pip-tools
-pytest==8.3.3
+pytest==8.2.0
     # via
-    #   dr.botzo (pyproject.toml)
+    #   -r requirements/requirements-dev.in
     #   pytest-cov
     #   pytest-django
-pytest-cov==6.0.0
-    # via dr.botzo (pyproject.toml)
-pytest-django==4.9.0
-    # via dr.botzo (pyproject.toml)
+pytest-cov==5.0.0
+    # via -r requirements/requirements-dev.in
+pytest-django==4.8.0
+    # via -r requirements/requirements-dev.in
 python-dateutil==2.9.0.post0
-    # via
-    #   dr.botzo (pyproject.toml)
-    #   tempora
+    # via -r requirements/requirements.in
 python-debian==0.1.49
     # via reuse
 python-mpd2==3.1.1
-    # via dr.botzo (pyproject.toml)
-pytz==2024.2
+    # via -r requirements/requirements.in
+pytz==2024.1
     # via
-    #   dr.botzo (pyproject.toml)
+    #   -r requirements/requirements.in
     #   irc
-pyyaml==6.0.2
+    #   tempora
+pyyaml==6.0.1
     # via bandit
-requests==2.32.3
+requests==2.31.0
     # via safety
-reuse==4.0.3
-    # via dr.botzo (pyproject.toml)
-rich==13.9.3
+reuse==3.0.2
+    # via -r requirements/requirements-dev.in
+rich==13.7.1
     # via
     #   bandit
     #   safety
@@ -238,49 +221,61 @@ ruamel-yaml==0.18.6
     # via
     #   safety
     #   safety-schemas
-ruamel-yaml-clib==0.2.12
+ruamel-yaml-clib==0.2.8
     # via ruamel-yaml
-safety==3.2.10
-    # via dr.botzo (pyproject.toml)
-safety-schemas==0.0.8
+safety==3.2.0
+    # via -r requirements/requirements-dev.in
+safety-schemas==0.0.2
     # via safety
 shellingham==1.5.4
     # via typer
 six==1.16.0
-    # via python-dateutil
+    # via
+    #   python-dateutil
+    #   tox
 snowballstemmer==2.2.0
     # via pydocstyle
-sqlparse==0.5.1
+sqlparse==0.5.0
     # via django
-stevedore==5.3.0
+stevedore==5.2.0
     # via bandit
-tempora==5.7.0
+tempora==5.5.1
     # via
     #   irc
     #   jaraco-logging
-tomlkit==0.13.2
-    # via reuse
-tox==4.11.4
-    # via dr.botzo (pyproject.toml)
-typer==0.12.5
-    # via safety
-typing-extensions==4.12.2
+tox==3.28.0
     # via
+    #   -r requirements/requirements-dev.in
+    #   tox-wheel
+tox-wheel==1.0.0
+    # via -r requirements/requirements-dev.in
+typeguard==4.2.1
+    # via inflect
+typer==0.12.3
+    # via safety
+typing-extensions==4.11.0
+    # via
+    #   inflect
     #   pydantic
     #   pydantic-core
     #   safety
     #   safety-schemas
+    #   typeguard
     #   typer
-urllib3==2.2.3
+urllib3==2.2.1
     # via
     #   requests
     #   safety
-virtualenv==20.27.1
+versioneer==0.29
+    # via -r requirements/requirements-dev.in
+virtualenv==20.26.1
     # via tox
-wheel==0.44.0
-    # via pip-tools
+wheel==0.43.0
+    # via
+    #   pip-tools
+    #   tox-wheel
 zalgo-text==0.6
-    # via dr.botzo (pyproject.toml)
+    # via -r requirements/requirements.in
 
 # The following packages are considered to be unsafe in a requirements file:
 # pip

requirements/requirements.in

@@ -0,0 +1,11 @@
+Django                          # core
+django-bootstrap3               # bootstrap layout
+django-extensions               # more commands
+djangorestframework             # WS API
+irc                             # core
+parsedatetime                   # relative date stuff in countdown
+ply                             # dice lex/yacc compiler
+python-dateutil                 # countdown relative math
+python-mpd2                     # client for mpd
+pytz                            # timezone awareness
+zalgo-text                      # zalgoify text

requirements/requirements.txt

@@ -2,74 +2,79 @@
 # This file is autogenerated by pip-compile with Python 3.11
 # by the following command:
 #
-#    pip-compile --output-file=requirements/requirements.txt
+#    pip-compile --output-file=requirements/requirements.txt requirements/requirements.in
 #
 asgiref==3.8.1
     # via django
 autocommand==2.2.2
     # via jaraco-text
-backports-tarfile==1.2.0
+backports-tarfile==1.1.1
     # via jaraco-context
-django==5.0.9
+django==5.0.4
     # via
+    #   -r requirements/requirements.in
     #   django-bootstrap3
     #   django-extensions
     #   djangorestframework
-    #   dr.botzo (pyproject.toml)
-django-bootstrap3==24.3
-    # via dr.botzo (pyproject.toml)
+django-bootstrap3==24.2
+    # via -r requirements/requirements.in
 django-extensions==3.2.3
-    # via dr.botzo (pyproject.toml)
-djangorestframework==3.15.2
-    # via dr.botzo (pyproject.toml)
-importlib-resources==6.4.5
-    # via irc
-irc==20.5.0
-    # via dr.botzo (pyproject.toml)
-jaraco-collections==5.1.0
-    # via irc
-jaraco-context==6.0.1
+    # via -r requirements/requirements.in
+djangorestframework==3.15.1
+    # via -r requirements/requirements.in
+inflect==7.2.1
     # via jaraco-text
-jaraco-functools==4.1.0
+irc==20.4.0
+    # via -r requirements/requirements.in
+jaraco-collections==5.0.1
+    # via irc
+jaraco-context==5.3.0
+    # via jaraco-text
+jaraco-functools==4.0.1
     # via
     #   irc
     #   jaraco-text
     #   tempora
 jaraco-logging==3.3.0
     # via irc
-jaraco-stream==3.0.4
+jaraco-stream==3.0.3
     # via irc
-jaraco-text==4.0.0
+jaraco-text==3.12.0
     # via
     #   irc
     #   jaraco-collections
-more-itertools==10.5.0
+more-itertools==10.2.0
     # via
+    #   inflect
     #   irc
     #   jaraco-functools
-    #   jaraco-stream
     #   jaraco-text
 parsedatetime==2.6
-    # via dr.botzo (pyproject.toml)
+    # via -r requirements/requirements.in
 ply==3.11
-    # via dr.botzo (pyproject.toml)
+    # via -r requirements/requirements.in
 python-dateutil==2.9.0.post0
-    # via
-    #   dr.botzo (pyproject.toml)
-    #   tempora
+    # via -r requirements/requirements.in
 python-mpd2==3.1.1
-    # via dr.botzo (pyproject.toml)
-pytz==2024.2
+    # via -r requirements/requirements.in
+pytz==2024.1
     # via
-    #   dr.botzo (pyproject.toml)
+    #   -r requirements/requirements.in
     #   irc
+    #   tempora
 six==1.16.0
     # via python-dateutil
-sqlparse==0.5.1
+sqlparse==0.5.0
     # via django
-tempora==5.7.0
+tempora==5.5.1
     # via
     #   irc
     #   jaraco-logging
+typeguard==4.2.1
+    # via inflect
+typing-extensions==4.11.0
+    # via
+    #   inflect
+    #   typeguard
 zalgo-text==0.6
-    # via dr.botzo (pyproject.toml)
+    # via -r requirements/requirements.in

setup.cfg

@@ -0,0 +1,6 @@
+[versioneer]
+VCS = git
+style = pep440
+versionfile_source = dr_botzo/_version.py
+versionfile_build = dr_botzo/_version.py
+tag_prefix = v

setup.py

@@ -0,0 +1,30 @@
+"""Setuptools configuration."""
+import os
+
+from setuptools import find_packages, setup
+
+import versioneer
+
+HERE = os.path.dirname(os.path.abspath(__file__))
+
+
+def extract_requires():
+    """Get package requirements from the .in file."""
+    with open(os.path.join(HERE, 'requirements/requirements.in'), 'r') as reqs:
+        return [line.split(' ')[0] for line in reqs if not line[0] == '-']
+
+
+setup(
+    name="dr.botzo",
+    description="A Django-backed IRC bot that also provides a WS framework for other bots to call.",
+    url="https://git.incorporeal.org/bss/dr.botzo",
+    license='GPLv3',
+    author="Brian S. Stephan",
+    author_email="bss@incorporeal.org",
+    version=versioneer.get_version(),
+    cmdclass=versioneer.get_cmdclass(),
+    packages=find_packages(),
+    include_package_data=True,
+    zip_safe=False,
+    install_requires=extract_requires(),
+)

tests/test_dice_roller.py

@@ -1,30 +0,0 @@
-"""Test the dice parsing and generator."""
-from unittest import mock
-
-from django.test import TestCase
-
-import dice.roller
-
-
-class DiceRollerTestCase(TestCase):
-    """Test that a variety of dice rolls can be parsed."""
-
-    def setUp(self):
-        """Create the dice roller."""
-        self.roller = dice.roller.DiceRoller()
-
-    def test_standard_rolls(self):
-        """Roll a variety of normal rolls."""
-        with mock.patch('random.randint', return_value=5):
-            result = self.roller.do_roll('1d20')
-        self.assertEqual(result, '5 (5[5])')
-
-        with mock.patch('random.randint', side_effect=[5, 6]):
-            result = self.roller.do_roll('2d20')
-        self.assertEqual(result, '11 (11[5,6])')
-
-        with mock.patch('random.randint', side_effect=[1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3,
-                                                       4, 4, 4, 4, 5, 5, 5, 5, 6, 6, 6, 6]):
-            result = self.roller.do_roll('6#3/4d6')
-        self.assertEqual(result, '3 (3[1,1,1,1]), 6 (6[2,2,2,2]), 9 (9[3,3,3,3]), '
-                         '12 (12[4,4,4,4]), 15 (15[5,5,5,5]), 18 (18[6,6,6,6])')

tox.ini

@@ -4,11 +4,21 @@
 # and then run "tox" from this directory.
 
 [tox]
-isolated_build = true
-envlist = begin,py310,py311,coverage,security,lint
+envlist = begin,py310,py311,coverage,security,lint,bundle
 
 [testenv]
-allow_externals = pytest, coverage
+# build a wheel and test it
+wheel = true
+wheel_build_env = build
+
+# whitelist commands we need
+whitelist_externals = cp
+
+# install everything via requirements-dev.txt, so that developer environment
+# is the same as the tox environment (for ease of use/no weird gotchas in
+# local dev results vs. tox results) and also to avoid ticky-tacky maintenance
+# of "oh this particular env has weird results unless I install foo" --- just
+# shotgun blast install everything everywhere
 deps =
     -rrequirements/requirements-dev.txt
 
@@ -104,6 +114,12 @@ commands =
     flake8
     - flake8 --disable-noqa --ignore= --select=E,W,F,C,D,A,G,B,I,T,M,DUO
 
+[testenv:bundle]
+# take extra actions (build sdist, sphinx, whatever) to completely package the app
+commands =
+    cp -r {distdir} .
+    python setup.py sdist
+
 [coverage:paths]
 source =
     ./
@@ -136,3 +152,26 @@ include =
 
 omit =
     **/_version.py
+
+[flake8]
+enable-extensions = G,M
+exclude =
+    .tox/
+    versioneer.py
+    _version.py
+    **/migrations/
+extend-ignore = T101
+max-complexity = 10
+max-line-length = 120
+
+[isort]
+line_length = 120
+
+[pytest]
+python_files =
+    *_tests.py
+    tests.py
+    test_*.py
+log_level=DEBUG
+DJANGO_SETTINGS_MODULE = dr_botzo.settings
+django_find_project = false