From e3164aaa5ac5aa9a6ad1d64cbf474bfccc765785 Mon Sep 17 00:00:00 2001
From: Justin Campbell <campb303@purdue.edu>
Date: Wed, 9 Jun 2021 14:55:43 -0400
Subject: [PATCH] Remove logging and allow packages installed from src
 directory

---
 setup.py | 81 ++++++++++++++++++++++++--------------------------------
 1 file changed, 34 insertions(+), 47 deletions(-)

diff --git a/setup.py b/setup.py
index bc5fc39..0d4f679 100644
--- a/setup.py
+++ b/setup.py
@@ -1,46 +1,34 @@
-import setuptools, logging
-from pathlib import Path
-
-# Configure the logger
-logger_name = "webqueueapi_install_log"
-logger = logging.getLogger(logger_name)
-logger.setLevel(logging.DEBUG)
-
-# See Formatting Details: https://docs.python.org/3/library/logging.html#logrecord-attributes
-# Example: Jan 28 2021 12:19:28 venv-manager : [INFO] Message
-log_message_format = "%(asctime)s %(name)s : [%(levelname)s] %(message)s"
-# See Time Formatting Details: https://docs.python.org/3.6/library/time.html#time.strftime
-# Example: Jan 28 2021 12:19:28
-log_time_format = "%b %d %Y %H:%M:%S"
-log_formatter = logging.Formatter(log_message_format, log_time_format)
-
-# Configure output to stdout
-stream_handler = logging.StreamHandler()
-stream_handler.setFormatter(log_formatter)
-stream_handler.setLevel(logging.INFO)
-logger.addHandler(stream_handler)
-
-# Configure out to logfile, located in '/tmp/webqueueapi install log.log'
-log_file_path = Path(f"/tmp/{logger_name}.log")
-file_handler = logging.FileHandler(log_file_path)
-file_handler.setFormatter(log_formatter)
-logger.addHandler(file_handler)
-
-logger.debug("Attempting to install webqueue2-api package")
-
-setuptools.setup(
-    name="webqueue2-api",
+from setuptools import setup, find_packages
+
+# Define Dependencies for Extra Requires
+conditional_dependencies = {
+    "dev":[
+        "pylint"
+    ],
+    "docs": [
+        "mkdocs",
+        "mkdocs-material",
+        "mkautodoc",
+        "mkdocs-awesome-pages-plugin"
+    ],
+}
+
+def get_all_dependencies():
+    """Returns a single array of all dependencies."""
+    dependencies = []
+    for condition in conditional_dependencies.keys():
+        dependencies += conditional_dependencies[condition]
+    return dependencies
+
+setup(
+    name="webqueue2api",
     version="0.9.1",
     description="A library for managing Purdue ECN's queue system.",
-    py_modules=['api', 'ECNQueue'],
     python_requires='>=3.6',
+    packages=find_packages(where="src"),
+    package_dir={"": "src"},
     install_requires = [
-        # General Utilities
-        "pipdeptree",
         "gunicorn",
-        "pylint",
-
-        # API 
         "python-dotenv",
         "Flask-RESTful",
         "python-dateutil",
@@ -49,12 +37,11 @@
         "PyJWT == 1.*",
         # Custom version of python-ldap without SASL requirements
         "python-ldap @ git+https://github.itap.purdue.edu/ECN/python-ldap/@python-ldap-3.3.1",
-
-        # API Documentation
-        "mkdocs",
-        "mkdocs-material",
-        "mkautodoc"
-    ]
-)
-
-logger.info("webqueue2-api package installed sucessfully")
\ No newline at end of file
+        "easyad",
+    ],
+    extras_require={
+        "dev": conditional_dependencies["dev"],
+        "docs": conditional_dependencies["docs"],
+        "all": get_all_dependencies()
+    }
+)
\ No newline at end of file