From 475b8425a0434856622f2fe76b6d6e2aa6333866 Mon Sep 17 00:00:00 2001 From: Matt Behrens Date: Mon, 2 Apr 2018 21:15:42 -0400 Subject: [PATCH] refactor invocation --- fediplay/__init__.py | 2 ++ fediplay/__main__.py | 5 +++-- setup.py | 8 +++++--- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/fediplay/__init__.py b/fediplay/__init__.py index e69de29..efc95f8 100644 --- a/fediplay/__init__.py +++ b/fediplay/__init__.py @@ -0,0 +1,2 @@ +from fediplay.cli import cli + diff --git a/fediplay/__main__.py b/fediplay/__main__.py index 24e1e55..080ae5a 100644 --- a/fediplay/__main__.py +++ b/fediplay/__main__.py @@ -1,5 +1,6 @@ '''Hook for running fediplay module as a script.''' -from fediplay.main import main +from fediplay.cli import cli + +cli() -main() diff --git a/setup.py b/setup.py index 75f6395..a71a4e5 100644 --- a/setup.py +++ b/setup.py @@ -2,17 +2,19 @@ from setuptools import setup setup( name='fediplay', - version='0.1', + version='2.0', py_modules=['fediplay'], install_requires=[ - 'Mastodon.py', + 'click', 'cssselect', 'lxml', + 'Mastodon.py', + 'python-dotenv', 'youtube-dl' ], entry_points={ 'console_scripts': [ - 'fediplay = fediplay.cli:cli' + 'fediplay = fediplay:cli' ] } )