refactor dependencies 2

.gitignore

@@ -36,5 +36,4 @@ mlflow_backend.py
 demo4.py
 dask*/
 /.venv
-/.devcontainer
-/venv310/
+/.devcontainer

README.md

@@ -65,7 +65,7 @@ The design and simplicity of PyCaret are inspired by the emerging role of citize
 
 ## Installation
 
-PyCaret's default installation only installs hard dependencies as listed in the [requirements.txt](requirements/requirements.txt) file. 
+PyCaret's default installation only installs hard dependencies as listed in the [requirements.txt](requirements.txt) file. 
 
 ```python
 pip install pycaret

setup.py

@@ -50,5 +50,5 @@ def readme():
         "full": required_optional,
     },
     tests_require=required_test,
-    python_requires=">=3.7"
+    python_requires=">=3.7",
 )

setup_nightly.py

@@ -56,5 +56,5 @@ def readme():
         "full": required_optional,
     },
     tests_require=required_test,
-    python_requires=">=3.7"
+    python_requires=">=3.7",
 )

setup_ts_alpha.py

@@ -12,14 +12,14 @@ def readme():
     return README
 
 
-with open("requirements/requirements.txt") as f:
+with open("requirements.txt") as f:
     required = f.read().splitlines()
 
-with open("requirements-ts.txt") as f:
-    required += f.read().splitlines()
+with open("requirements-optional.txt") as f:
+    required_optional = f.read().splitlines()
 
-with open("requirements/requirements-optional.txt") as f:
-    optional_required = f.read().splitlines()
+with open("requirements-test.txt") as f:
+    required_test = f.read().splitlines()
 
 setup(
     name="pycaret-ts-alpha",
@@ -36,9 +36,22 @@ def readme():
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.9",
+        "Topic :: Scientific/Engineering :: Artificial Intelligence",
+        "License :: OSI Approved :: MIT License",
+        "Operating System :: OS Independent",
     ],
     packages=find_packages(include=["pycaret*"]),
     include_package_data=True,
     install_requires=required,
-    extras_require={"full": optional_required,},
+    extras_require={
+        "analysis": required_optional[1:9],
+        "models": required_optional[11:15],
+        "tuners": required_optional[17:22],
+        "mlops": required_optional[24:30],
+        "nlp": required_optional[32:38],
+        "full": required_optional,
+    },
+    tests_require=required_test,
+    python_requires=">=3.7",
 )