pr review

Author: Jacobsolawetz

roboflow/__init__.py

@@ -121,19 +121,14 @@ def login(workspace=None, force=False):
             json.dump(r_login, f, indent=2)
 
     else:
-        raise RuntimeError("Error logging in")
+        r_login.raise_for_status()
 
     return None
     # we could eventually return the workspace object here
     # return Roboflow().workspace()
 
-
-# import roboflow
-# roboflow.#action
-
 active_workspace = None
 
-
 def initialize_roboflow():
     global active_workspace
 
@@ -150,15 +145,6 @@ def initialize_roboflow():
 
         return active_workspace
 
-
-def train():
-    operate_workspace = initialize_roboflow()
-
-    # check if project or version is set
-
-    print("training from " + operate_workspace.name)
-
-
 def load_model(model_url):
     operate_workspace = initialize_roboflow()
 

roboflow/config.py

@@ -1,18 +1,6 @@
 import json
 import os
 
-# default configuration location
-conf_location = os.getenv(
-    "ROBOFLOW_CONFIG_DIR", default=os.getenv("HOME") + "/.config/roboflow/config.json"
-)
-
-# read config file for roboflow if logged in from python or CLI
-if os.path.exists(conf_location):
-    with open(conf_location) as f:
-        config = json.load(f)
-else:
-    config = {}
-
 
 def get_conditional_configuration_variable(key, default):
     """Retrieves the configuration variable conditionally.
@@ -25,6 +13,19 @@ def get_conditional_configuration_variable(key, default):
     Returns:
         string: The value of the conditional configuration variable.
     """
+    
+    # default configuration location
+    conf_location = os.getenv(
+        "ROBOFLOW_CONFIG_DIR", default=os.getenv("HOME") + "/.config/roboflow/config.json"
+    )
+
+    # read config file for roboflow if logged in from python or CLI
+    if os.path.exists(conf_location):
+        with open(conf_location) as f:
+            config = json.load(f)
+    else:
+        config = {}
+
     if os.getenv(key) != None:
         return os.getenv(key)
     elif key in config.keys():

setup.py

@@ -17,7 +17,7 @@
     install_requires = fh.read().split('\n')
 
 setuptools.setup(
-    name="roboflowtestpypi",
+    name="roboflow",
     version=version,
     author="Roboflow",
     author_email="[email protected]",