Change directory structure

chinfeng · Feb 21, 2021 · 4fab0c3 · 4fab0c3
1 parent 1f8c517
commit 4fab0c3
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git 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
diff --git a/clubhouse.py → clubhouse/clubhouse.py b/clubhouse.py → clubhouse/clubhouse.py
diff --git 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",