Remove Repackaging

MANIFEST.in

@@ -1 +1 @@
-recursive-include src/rustplus *.png
+recursive-include rustplus *.png

rustplus/__init__.py

@@ -9,9 +9,8 @@
 from .exceptions import *
 from .conversation import ConversationFactory, Conversation, ConversationPrompt
 from .utils import *
-from .module_info import ModuleInfo
 
-__name__ = ModuleInfo.__module_name__
-__author__ = ModuleInfo.__author__
-__version__ = ModuleInfo.__version__
-__support__ = ModuleInfo.__support__
+__name__ = "rustplus"
+__author__ = "olijeffers0n"
+__version__ = "5.3.27"
+__support__ = "Discord: https://discord.gg/nQqJe8qvP8"

rustplus/api/remote/rustws.py

@@ -80,7 +80,7 @@ def close(self) -> None:
 
         self.connection_status = CLOSING
         self.shutdown()
-        #super().close()
+        # super().close()
         self.connection_status = CLOSED
 
     async def send_message(self, message: AppRequest) -> None:

rustplus/utils/rust_utils.py

@@ -4,9 +4,8 @@
 import string
 
 from ..api.structures import RustTime
-from ..module_info import ModuleInfo
 
-icons_path = f"rustplus{'.V' + str(ModuleInfo.__version__.replace('.', '_')) if not ModuleInfo.__dev__ else ''}.api.icons"
+icons_path = "rustplus.api.icons"
 
 
 def format_time(protobuf) -> RustTime:

setup.py

@@ -1,44 +1,37 @@
 from setuptools import setup, find_packages
 
+version = ""
+with open("rustplus/__init__.py") as input_file:
+    for line in input_file.readlines():
+        if line.startswith("__version__"):
+            version = line.strip("__version__ =").strip().strip('"')
+            break
 
-def main() -> None:
-    version = ""
-    with open("src/rustplus/__init__.py") as input_file:
-        for line in input_file.readlines():
-            if line.startswith("__version__"):
-                version = line.strip("__version__ =").strip().strip('"')
-                break
+with open("README.md", errors='ignore') as input_file:
+    readme = input_file.read()
 
-    with open("README.md", errors='ignore') as input_file:
-        readme = input_file.read()
-
-    setup(
-        name='rustplus',
-        author='olijeffers0n',
-        url='https://github.com/olijeffers0n/rustplus',
-        project_urls={
-            "Issue tracker": "https://github.com/olijeffers0n/rustplus/issues",
-        },
-        package_dir={"": "src"},
-        version=version,
-        packages=find_packages(where='src'),
-        license='MIT',
-        description='A python wrapper for the Rust Plus API',
-        long_description=readme,
-        include_package_data=True,
-        long_description_content_type='text/markdown',
-        install_requires=[
-            "websocket_client",
-            "Pillow",
-            "protobuf==4.21.1",
-            "asyncio",
-            "rustPlusPushReceiver==0.4.1",
-            "http-ece",
-            "requests"
-        ],
-        python_requires='>=3.7.0',
-    )
-
-
-if __name__ == "__main__":
-    main()
+setup(
+    name='rustplus',
+    author='olijeffers0n',
+    url='https://github.com/olijeffers0n/rustplus',
+    project_urls={
+        "Issue tracker": "https://github.com/olijeffers0n/rustplus/issues",
+    },
+    version=version,
+    packages=find_packages(include=['rustplus', 'rustplus.*']),
+    license='MIT',
+    description='A python wrapper for the Rust Plus API',
+    long_description=readme,
+    include_package_data=True,
+    long_description_content_type='text/markdown',
+    install_requires=[
+        "websocket_client",
+        "Pillow",
+        "protobuf==4.21.1",
+        "asyncio",
+        "rustPlusPushReceiver==0.4.1",
+        "http-ece",
+        "requests"
+    ],
+    python_requires='>=3.7.0',
+)