From 4ae27d2a00951430517d1a834749f1719675e95d Mon Sep 17 00:00:00 2001 From: Morgan McMillian Date: Fri, 19 Nov 2021 15:14:24 -0800 Subject: [PATCH] python package --- partybot/__init__.py | 0 database.py => partybot/database.py | 0 models.py => partybot/models.py | 0 partybot-pnut.py => partybot/pnutbot.py | 10 ++++++---- setup.py | 18 ++++++++++++++++++ 5 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 partybot/__init__.py rename database.py => partybot/database.py (100%) rename models.py => partybot/models.py (100%) rename partybot-pnut.py => partybot/pnutbot.py (99%) create mode 100644 setup.py diff --git a/partybot/__init__.py b/partybot/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/database.py b/partybot/database.py similarity index 100% rename from database.py rename to partybot/database.py diff --git a/models.py b/partybot/models.py similarity index 100% rename from models.py rename to partybot/models.py diff --git a/partybot-pnut.py b/partybot/pnutbot.py similarity index 99% rename from partybot-pnut.py rename to partybot/pnutbot.py index e8a383a..0528c89 100644 --- a/partybot-pnut.py +++ b/partybot/pnutbot.py @@ -10,11 +10,10 @@ import random import re import argparse -# from database import db_session, init_db from sqlalchemy import create_engine, and_ from sqlalchemy.orm import scoped_session, sessionmaker from sqlalchemy.ext.declarative import declarative_base -from models import Base, Karma, Optout, Queue, Preferences, MdnpRequests +from partybot.models import Base, Karma, Optout, Queue, Preferences, MdnpRequests _startup = threading.Event() _shutdown = threading.Event() @@ -353,8 +352,7 @@ def on_open(ws): t = threading.Thread(target=run) t.start() -if __name__ == "__main__": - +def main(): logger = logging.getLogger() a_parser = argparse.ArgumentParser() a_parser.add_argument( @@ -394,3 +392,7 @@ if __name__ == "__main__": while r: _error.clear() r = ws.run_forever() + +if __name__ == "__main__": + main() + diff --git a/setup.py b/setup.py new file mode 100644 index 0000000..c835fd4 --- /dev/null +++ b/setup.py @@ -0,0 +1,18 @@ +from setuptools import setup + +setup( + name='partybot', + py_modules=['models','pnutbot'], + install_requires=[ + 'PyYAML', + 'pnutpy', + 'requests', + 'SQLAlchemy', + 'websocket-client', + ], + entry_points={ + 'console_scripts': [ + 'partybot = partybot.pnutbot:main' + ] + }, +)