Merge 8bad946 into 98d3ad7

CHANGELOG

@@ -1,5 +1,12 @@
 # Changelog
 
+## v0.9.0
+
+### Improvements
+
+- Models deployment doesn't depend on pip._internal anymore.
+- Package size reduced.
+
 ## v0.8.13
 
 ### Improvements
@@ -8,7 +15,6 @@
 - Documentation updates with referencing Tableau Help pages.
 - Added Client.remove() method for deleting deployed models.
 
-
 ### Bug Fixes
 
 - Fixed failing Ctrl+C handler.

docs/server-config.md

@@ -92,7 +92,6 @@ at [`logging.config` documentation page](https://docs.python.org/3.6/library/log
   through the `/query` method, or using the `tabpy.query(...)` syntax with
   the `/evaluate` method.
 
-
 ### Configuration File Example
 
 **Note:** _Always use absolute paths for the configuration paths
@@ -211,31 +210,31 @@ Passwords in the password file are hashed with PBKDF2.
 with hosting OS mechanisms. Ideally the file should only be accessible
 for reading with the account under which TabPy runs and TabPy admin account.**
 
-There is a `tabpy-user-management` command provided with `tabpy`
+There is a `tabpy-user` command provided with `tabpy`
  package to operate with accounts in the password file. Run
-`tabpy-user-management -h` to see how to use it.
+`tabpy-user -h` to see how to use it.
 
 After making any changes to the password file, TabPy needs to be restarted.
 
 ### Adding an Account
 
-To add an account run `tabpy-user-management add`
+To add an account run `tabpy-user add`
 command  providing user name, password (optional) and password file:
 
 ```sh
-tabpy-user-management add -u <username> -p <password> -f <pwdfile>
+tabpy-user add -u <username> -p <password> -f <pwdfile>
 ```
 
 If the (recommended) `-p` argument is not provided a password for the user name
 will be generated and displayed in the command line.
 
 ### Updating an Account
 
-To update the password for an account run `tabpy-user-management update`
+To update the password for an account run `tabpy-user update`
 command:
 
 ```sh
-tabpy-user-management update -u <username> -p <password> -f <pwdfile>
+tabpy-user update -u <username> -p <password> -f <pwdfile>
 ```
 
 If the (recommended) `-p` agrument is not provided a password for the user name

setup.py

@@ -39,6 +39,8 @@ def read(fname):
             "Intended Audience :: Science/Research",
             "License :: OSI Approved :: MIT License",
             "Programming Language :: Python :: 3.6",
+            "Programming Language :: Python :: 3.7",
+            "Programming Language :: Python :: 3.8",
             "Topic :: Scientific/Engineering",
             "Topic :: Scientific/Engineering :: Information Analysis",
             "Operating System :: Microsoft :: Windows",
@@ -48,7 +50,7 @@ def read(fname):
         ],
         platforms=["Windows", "Linux", "Mac OS-X", "Unix"],
         keywords=["tabpy tableau"],
-        packages=find_packages(exclude=["docs", "misc", "tests"]),
+        packages=find_packages(exclude=["docs", "misc"]),
         package_data={
             "tabpy": [
                 "VERSION",
@@ -71,13 +73,18 @@ def read(fname):
             "future",
             "genson",
             "jsonschema",
-            "simplejson",
+            "nltk",
+            "numpy",
+            "pandas",
             "pyopenssl",
             "python-dateutil",
             "requests",
+            "scipy",
             "simplejson",
             "singledispatch",
             "six",
+            "sklearn",
+            "textblob",
             "tornado",
             "urllib3",
         ],

tabpy/VERSION

@@ -1 +1 @@
-0.8.13
+0.9.0

tabpy/models/deploy_models.py

@@ -7,15 +7,7 @@
 from tabpy.models.utils import setup_utils
 
 
-def install_dependencies(packages):
-    pip_arg = ["install"] + packages + ["--no-cache-dir"]
-    from pip._internal import main
-    pip._internal.main(pip_arg)
-
-
 def main():
-    install_dependencies(["sklearn", "pandas", "numpy", "textblob", "nltk", "scipy"])
-    print("==================================================================")
     # Determine if we run python or python3
     if platform.system() == "Windows":
         py = "python"