adjust for jupyter

neofarm/lib.py

@@ -2,7 +2,7 @@ import requests
 from oauthlib.oauth2 import BackendApplicationClient
 from requests_oauthlib import OAuth2Session, OAuth2
 import jsonapi_requests
-from orm.my_meta import MyMeta
+from . orm.my_meta import MyMeta
 
 
 # constants:
@@ -28,12 +28,18 @@ def init_api():
         'TIMEOUT': 1,
     })
 	jsonapi_requests.configuration.default = api
-	return api
 
 api = init_api()
 MyMeta.set_api(api)
 # these have to be defined after MyMeta.api is set for the correct value to be inherited
-from orm.log import *
+from . orm.log import *
-from orm.asset import *
+from . orm.asset import *
-from orm.quantity import *
+from . orm.quantity import *
-from orm.taxonomy import *
+from . orm.taxonomy import *
+import neofarm.lib as neo
+import sys
+try:
+    del sys.modules['neofarm.lib']
+except AttributeError:
+    pass
+import neofarm.lib as neo

neofarm/orm/asset.py

@@ -1,5 +1,5 @@
 import jsonapi_requests
-from orm.my_meta import MyMeta
+from . my_meta import MyMeta
 
 class Asset(jsonapi_requests.orm.ApiModel):
 	class Meta(MyMeta):

neofarm/orm/log.py

@@ -1,5 +1,5 @@
 import jsonapi_requests
-from orm.my_meta import MyMeta
+from . my_meta import MyMeta
 
 class Log(jsonapi_requests.orm.ApiModel):
 	class Meta(MyMeta):

neofarm/orm/quantity.py

@@ -1,5 +1,5 @@
 import jsonapi_requests
-from orm.my_meta import MyMeta
+from . my_meta import MyMeta
 
 class Quantity(jsonapi_requests.orm.ApiModel):
 	class Meta(MyMeta):

neofarm/orm/taxonomy.py

@@ -1,5 +1,5 @@
 import jsonapi_requests
-from orm.my_meta import MyMeta
+from . my_meta import MyMeta
 
 class Taxonomy(jsonapi_requests.orm.ApiModel):
 	class Meta(MyMeta):