Merge branch 'james-dev' into 'master'

James dev

See merge request !14

storjstatus/storjstatus_send.py

@@ -170,7 +170,6 @@ def config_json():
 
 
 def load_settings():
-<<<<<<< HEAD
  if storjstatus_common.get_os_type() == "win":
  return load_settings_win()
  elif storjstatus_common.get_os_type() == "linux":
@@ -192,8 +191,6 @@ def load_settings_win():
 
 
 def load_settings_linux():
-=======
->>>>>>> c778c9176753976ed977fc2bf64e632f499cdfa3
  global APIKEY
  global APISECRET
  global SERVERGUID

storjstatus/version.py

-__version__ = '0.3.0'
+__version__ = '0.3.1'

update-db.py

 import os
-import setuptools
 from crate.client import connect
 
+exec(open('storjstatus/version.py').read())
+
 def main():
- exec(open('storjstatus/version.py').read())
- print("Updating database to version " + __VERSION__)
+ print("Updating database to version " + __version__)
 
  connection = connect('data2.jamescoyle.net:4200')
  cursor = connection.cursor()
- cursor.execute("UPDATE storj.settings SET setting_value = '" + __VERSION__ + "' WHERE setting_name = 'storjstatus-client-version' ")
+ cursor.execute("UPDATE storj.settings SET setting_value = '" + __version__ + "' WHERE setting_name = 'storjstatus-client-version' ")
 
 if __name__ == "__main__":
  main()