From 4fab0c3276eb961909e199a65aba1fdb4ecb59b4 Mon Sep 17 00:00:00 2001 From: Harold Kim Date: Mon, 22 Feb 2021 03:23:26 +0900 Subject: [PATCH] Change directory structure --- cli.py | 2 +- clubhouse/__init__.py | 0 clubhouse.py => clubhouse/clubhouse.py | 0 setup.py | 17 +++++++++-------- 4 files changed, 10 insertions(+), 9 deletions(-) create mode 100644 clubhouse/__init__.py rename clubhouse.py => clubhouse/clubhouse.py (100%) diff --git a/cli.py b/cli.py index 5aa6eaa..c941fd9 100644 --- a/cli.py +++ b/cli.py @@ -13,7 +13,7 @@ import keyboard from rich.table import Table from rich.console import Console -from clubhouse import Clubhouse +from clubhouse.clubhouse import Clubhouse # Set some global variables try: diff --git a/clubhouse/__init__.py b/clubhouse/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/clubhouse.py b/clubhouse/clubhouse.py similarity index 100% rename from clubhouse.py rename to clubhouse/clubhouse.py diff --git a/setup.py b/setup.py index 6f14a6b..56d6c39 100644 --- a/setup.py +++ b/setup.py @@ -4,14 +4,19 @@ setup.py For pypi """ -from distutils.core import setup -with open("README.md", "r", encoding="utf-8") as fh: +from setuptools import setup + +def _requires_from_file(filename): + return open(filename).read().splitlines() + + +with open("README.md", "r") as fh: long_description = fh.read() setup( name="clubhouse-py", packages=["clubhouse-py"], - version="304", + version="304.0.0", license="MIT", description=("Clubhouse API written in Python. Standalone client included." + "For reference and education purposes only."), @@ -28,11 +33,7 @@ "clubhouse-api", "clubhouse-lib", ], - install_requires=[ - "keyboard", - "requests", - "rich", - ], + install_requires=_requires_from_file("requirements.txt"), classifiers=[ "Development Status :: 5 - Production/Stable", "Intended Audience :: Developers",