Merge branch 'master' into refactor-settings

# Conflicts:
#	packaging/osx/lbry-osx-app/lbrygui/LBRYApp.py
#	packaging/windows/lbry-win32-app/LBRYWin32App.py

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.6.4
+current_version = 0.6.7
 commit = True
 tag = True
 

lbrynet/__init__.py

@@ -1,7 +1,7 @@
 import logging
 from conf import Config
 
-__version__ = "0.6.4"
+__version__ = "0.6.7"
 version = tuple(__version__.split('.'))
 settings = Config()
 logging.getLogger(__name__).addHandler(logging.NullHandler())

packaging/osx/lbry-osx-app/lbrygui/LBRYApp.py

@@ -74,9 +74,8 @@ class LBRYDaemonApp(AppKit.NSApplication):
                 LBRYNotify("LBRY needs an internet connection to start, try again when one is available")
             sys.exit(0)
 
-
         lbry = DaemonServer()
-        d = lbry.start()
+        d = lbry.start(use_authentication=False)
         d.addCallback(lambda _: webbrowser.open(settings.UI_ADDRESS))
         lbrynet_server = server.Site(lbry.root)
         lbrynet_server.requestFactory = DaemonRequest

packaging/osx/lbry-osx-app/lbrygui/LBRYNotify.py

@@ -1,10 +1,10 @@
 import Foundation
 import objc
-import AppKit
 
 NSUserNotification = objc.lookUpClass('NSUserNotification')
 NSUserNotificationCenter = objc.lookUpClass('NSUserNotificationCenter')
 
+
 def LBRYNotify(message):
     notification = NSUserNotification.alloc().init()
     notification.setTitle_("LBRY")
@@ -15,7 +15,9 @@ def LBRYNotify(message):
     notification.setDeliveryDate_(Foundation.NSDate.dateWithTimeInterval_sinceDate_(0, Foundation.NSDate.date()))
     NSUserNotificationCenter.defaultUserNotificationCenter().scheduleNotification_(notification)
 
-def notify(title, subtitle, info_text, delay=0, sound=False, userInfo={}):
+
+def notify(title, subtitle, info_text, delay=0, sound=False, userInfo=None):
+    userInfo = userInfo or {}
     notification = NSUserNotification.alloc().init()
     notification.setTitle_(title)
     notification.setSubtitle_(subtitle)

packaging/osx/lbry-osx-app/setup_app.py

@@ -2,8 +2,7 @@
 
 import os
 from setuptools import setup
-from lbrynet.conf import PROTOCOL_PREFIX, APP_NAME, ICON_PATH
-import sys
+from lbrynet.conf import APP_NAME, ICON_PATH
 
 APP = [os.path.join('lbrygui', 'main.py')]
 DATA_FILES = []

packaging/osx/lbry-osx-app/setup_uri_handler.py

@@ -1,5 +1,6 @@
 from setuptools import setup
 import os
+from lbrynet.conf import PROTOCOL_PREFIX
 
 APP = [os.path.join('lbry_uri_handler', 'LBRYURIHandler.py')]
 DATA_FILES = []
@@ -11,7 +12,7 @@ OPTIONS = {'argv_emulation': True,
                'CFBundleURLTypes': [
                     {
                     'CFBundleURLTypes': 'LBRYURIHandler',
-                    'CFBundleURLSchemes': ['lbry']
+                    'CFBundleURLSchemes': [PROTOCOL_PREFIX]
                     }
                ]
            }

packaging/ubuntu/lbry.desktop

@@ -1,5 +1,5 @@
 [Desktop Entry]
-Version=0.6.4
+Version=0.6.7
 Name=LBRY
 Comment=The world's first user-owned content marketplace
 Icon=lbry

packaging/windows/init.ps1

@@ -90,6 +90,8 @@ C:\Python27\Scripts\pip.exe install base58==0.2.2
 
 C:\Python27\Scripts\pip.exe install googlefinance==0.7
 
+C:\Python27\Scripts\pip.exe install jsonschema==2.5.1
+
 C:\Python27\Scripts\pip.exe install git+https://github.com/lbryio/lbryum.git
 
 cd C:\projects\lbry

packaging/windows/lbry-win32-app/LBRYWin32App.py

@@ -285,7 +285,7 @@ def main(lbry_name=None):
     systray_thread.start()
 
     lbry = DaemonServer()
-    d = lbry.start()
+    d = lbry.start(use_authentication=False)
     d.addCallback(lambda _: LBRYURIHandler.open_address(lbry_name))
     lbrynet_server = server.Site(lbry.root)
     lbrynet_server.requestFactory = DaemonRequest

setup.py

@@ -2,6 +2,7 @@
 
 import sys
 import os
+import site
 from lbrynet import __version__
 
 LINUX = 1
@@ -134,6 +135,10 @@ elif platform == WINDOWS:
     # Allow virtualenv to find distutils of base python installation
     distutils_path = os.path.join(os.path.dirname(opcode.__file__), 'distutils')
 
+    schemas = os.path.join(site.getsitepackages()[1], "jsonschema", "schemas")
+    onlyfiles = [f for f in os.listdir(schemas) if os.path.isfile(os.path.join(schemas, f))]
+    zipincludes = [(os.path.join(schemas, f), os.path.join("jsonschema", "schemas", f)) for f in onlyfiles]
+
     def find_data_file(filename):
         if getattr(sys, 'frozen', False):
             # The application is frozen
@@ -268,6 +273,7 @@ elif platform == WINDOWS:
                      'requests_futures',
                      'seccure',
                      'simplejson',
+                     'jsonschema',
                      'six',
                      'aes',
                      'txjsonrpc',
@@ -291,7 +297,8 @@ elif platform == WINDOWS:
                           (os.path.join(wordlist_path, 'portuguese.txt'), os.path.join('wordlist', 'portuguese.txt')),
                           (os.path.join(wordlist_path, 'spanish.txt'), os.path.join('wordlist', 'spanish.txt'))
                           ],
-        'namespace_packages': ['zope', 'google']}
+        'namespace_packages': ['zope', 'google'],
+        "zip_includes": zipincludes}
 
     tray_app = Executable(
         script=os.path.join(app_dir, 'LBRYWin32App.py'),