I broke the pip package during rebase (ucbrise#174)

* fixed broken pip package

* added curdir back in

* fixed var referenced before assignment issue

management/check_and_write_deps.py → clipper_admin/check_and_write_deps.py

@@ -81,6 +81,7 @@ def check_solvability_write_deps(env_path, directory, platform,
             pip_deps = dependencies
 
     # Check for conflicts and existence of packages
+    missing_packages = None
     try:
         try:
             # This call doesn't install anything; it checks the solvability of package dependencies.
@@ -99,7 +100,7 @@ def check_solvability_write_deps(env_path, directory, platform,
         print(unsat_e)
         return False
 
-    if missing_packages:
+    if missing_packages is not None:
         print(
             "The following packages in your conda environment aren't available in the linux-64 conda channel the container will use:"
         )

clipper_admin/clipper_manager.py

@@ -12,10 +12,9 @@
 from sklearn.externals import joblib
 from cStringIO import StringIO
 import sys
-cur_dir = os.path.dirname(os.path.abspath(__file__))
-sys.path.insert(0, os.path.abspath('%s../../containers/python/' % cur_dir))
 from pywrencloudpickle import CloudPickler
 import time
+cur_dir = os.path.dirname(os.path.abspath(__file__))
 
 MODEL_REPO = "/tmp/clipper-models"
 DOCKER_NW = "clipper_nw"

setup.py

@@ -3,7 +3,7 @@
 
 setup(
     name='clipper_admin',
-    version='0.1',
+    version='0.1.1',
     description='Admin commands for the Clipper prediction-serving system',
     author='Dan Crankshaw',
     author_email='[email protected]',