From f79b651b051fc432cdf8d859b4c9ed2380ae0741 Mon Sep 17 00:00:00 2001 From: Jack Date: Fri, 30 Sep 2016 02:16:06 -0400 Subject: [PATCH 1/5] =?UTF-8?q?Bump=20version:=200.5.0=20=E2=86=92=200.6.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- lbrynet/__init__.py | 2 +- packaging/ubuntu/lbry.desktop | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index c1a23b1f5..3355ac89e 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.5.0 +current_version = 0.6.0 commit = True tag = True diff --git a/lbrynet/__init__.py b/lbrynet/__init__.py index 9b671552b..1df2009ff 100644 --- a/lbrynet/__init__.py +++ b/lbrynet/__init__.py @@ -1,6 +1,6 @@ import logging -__version__ = "0.5.0" +__version__ = "0.6.0" version = tuple(__version__.split('.')) logging.getLogger(__name__).addHandler(logging.NullHandler()) \ No newline at end of file diff --git a/packaging/ubuntu/lbry.desktop b/packaging/ubuntu/lbry.desktop index 53b98e543..7f5f4d0cf 100644 --- a/packaging/ubuntu/lbry.desktop +++ b/packaging/ubuntu/lbry.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Version=0.5.0 +Version=0.6.0 Name=LBRY Comment=The world's first user-owned content marketplace Icon=lbry From c4eb3de5b2e7abede555c98e419ab88e64cb2d76 Mon Sep 17 00:00:00 2001 From: Jack Date: Fri, 30 Sep 2016 11:17:47 -0400 Subject: [PATCH 2/5] update app imports --- packaging/osx/lbry-osx-app/lbrygui/LBRYApp.py | 6 +++--- packaging/windows/lbry-win32-app/LBRYWin32App.py | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packaging/osx/lbry-osx-app/lbrygui/LBRYApp.py b/packaging/osx/lbry-osx-app/lbrygui/LBRYApp.py index 9cc914364..072eb9f00 100644 --- a/packaging/osx/lbry-osx-app/lbrygui/LBRYApp.py +++ b/packaging/osx/lbry-osx-app/lbrygui/LBRYApp.py @@ -27,7 +27,7 @@ if not os.path.isfile(lbrycrdd_path_conf): f.write(lbrycrdd_path) f.close() -from lbrynet.lbrynet_daemon.LBRYDaemonServer import LBRYDaemonServer, LBRYDaemonRequest +from lbrynet.lbrynet_daemon.DaemonServer import DaemonServer, DaemonRequest from lbrynet.conf import API_PORT, API_INTERFACE, ICON_PATH, APP_NAME from lbrynet.conf import UI_ADDRESS @@ -75,11 +75,11 @@ class LBRYDaemonApp(AppKit.NSApplication): sys.exit(0) - lbry = LBRYDaemonServer() + lbry = DaemonServer() d = lbry.start() d.addCallback(lambda _: webbrowser.open(UI_ADDRESS)) lbrynet_server = server.Site(lbry.root) - lbrynet_server.requestFactory = LBRYDaemonRequest + lbrynet_server.requestFactory = DaemonRequest reactor.listenTCP(API_PORT, lbrynet_server, interface=API_INTERFACE) def openui_(self, sender): diff --git a/packaging/windows/lbry-win32-app/LBRYWin32App.py b/packaging/windows/lbry-win32-app/LBRYWin32App.py index bb47a707a..e26ebc3f2 100644 --- a/packaging/windows/lbry-win32-app/LBRYWin32App.py +++ b/packaging/windows/lbry-win32-app/LBRYWin32App.py @@ -18,7 +18,7 @@ try: except ImportError: import win32gui -from lbrynet.lbrynet_daemon.LBRYDaemonServer import LBRYDaemonServer, LBRYDaemonRequest +from lbrynet.lbrynet_daemon.LBRYDaemonServer import DaemonServer, DaemonRequest from lbrynet.conf import API_PORT, API_INTERFACE, ICON_PATH, APP_NAME from lbrynet.conf import UI_ADDRESS, API_CONNECTION_STRING, LOG_FILE_NAME from packaging.uri_handler.LBRYURIHandler import LBRYURIHandler @@ -284,11 +284,11 @@ def main(lbry_name=None): systray_thread.daemon = True systray_thread.start() - lbry = LBRYDaemonServer() + lbry = DaemonServer() d = lbry.start() d.addCallback(lambda _: LBRYURIHandler.open_address(lbry_name)) lbrynet_server = server.Site(lbry.root) - lbrynet_server.requestFactory = LBRYDaemonRequest + lbrynet_server.requestFactory = DaemonRequest try: reactor.listenTCP(API_PORT, lbrynet_server, interface=API_INTERFACE) except error.CannotListenError: From 6e5ea935f69a3faec434e3f18f2d44a5e378ac7b Mon Sep 17 00:00:00 2001 From: Jack Date: Fri, 30 Sep 2016 11:18:07 -0400 Subject: [PATCH 3/5] =?UTF-8?q?Bump=20version:=200.6.0=20=E2=86=92=200.6.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- lbrynet/__init__.py | 2 +- packaging/ubuntu/lbry.desktop | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 3355ac89e..b05a116d8 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.6.0 +current_version = 0.6.1 commit = True tag = True diff --git a/lbrynet/__init__.py b/lbrynet/__init__.py index 1df2009ff..f2979c24f 100644 --- a/lbrynet/__init__.py +++ b/lbrynet/__init__.py @@ -1,6 +1,6 @@ import logging -__version__ = "0.6.0" +__version__ = "0.6.1" version = tuple(__version__.split('.')) logging.getLogger(__name__).addHandler(logging.NullHandler()) \ No newline at end of file diff --git a/packaging/ubuntu/lbry.desktop b/packaging/ubuntu/lbry.desktop index 7f5f4d0cf..1065db83e 100644 --- a/packaging/ubuntu/lbry.desktop +++ b/packaging/ubuntu/lbry.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Version=0.6.0 +Version=0.6.1 Name=LBRY Comment=The world's first user-owned content marketplace Icon=lbry From 50f0430d04b2aad2ecea40ebaac5d859b885eaa4 Mon Sep 17 00:00:00 2001 From: Jack Date: Fri, 30 Sep 2016 11:26:37 -0400 Subject: [PATCH 4/5] fix broken windows import --- packaging/windows/lbry-win32-app/LBRYWin32App.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/windows/lbry-win32-app/LBRYWin32App.py b/packaging/windows/lbry-win32-app/LBRYWin32App.py index e26ebc3f2..d197f8cfc 100644 --- a/packaging/windows/lbry-win32-app/LBRYWin32App.py +++ b/packaging/windows/lbry-win32-app/LBRYWin32App.py @@ -18,7 +18,7 @@ try: except ImportError: import win32gui -from lbrynet.lbrynet_daemon.LBRYDaemonServer import DaemonServer, DaemonRequest +from lbrynet.lbrynet_daemon.DaemonServer import DaemonServer, DaemonRequest from lbrynet.conf import API_PORT, API_INTERFACE, ICON_PATH, APP_NAME from lbrynet.conf import UI_ADDRESS, API_CONNECTION_STRING, LOG_FILE_NAME from packaging.uri_handler.LBRYURIHandler import LBRYURIHandler From eb7cc8463bd993d2f6e8e6f0141a99048311d6eb Mon Sep 17 00:00:00 2001 From: Jack Date: Fri, 30 Sep 2016 11:26:55 -0400 Subject: [PATCH 5/5] =?UTF-8?q?Bump=20version:=200.6.1=20=E2=86=92=200.6.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- lbrynet/__init__.py | 2 +- packaging/ubuntu/lbry.desktop | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index b05a116d8..810011d23 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.6.1 +current_version = 0.6.2 commit = True tag = True diff --git a/lbrynet/__init__.py b/lbrynet/__init__.py index f2979c24f..5089ac8a4 100644 --- a/lbrynet/__init__.py +++ b/lbrynet/__init__.py @@ -1,6 +1,6 @@ import logging -__version__ = "0.6.1" +__version__ = "0.6.2" version = tuple(__version__.split('.')) logging.getLogger(__name__).addHandler(logging.NullHandler()) \ No newline at end of file diff --git a/packaging/ubuntu/lbry.desktop b/packaging/ubuntu/lbry.desktop index 1065db83e..48182d854 100644 --- a/packaging/ubuntu/lbry.desktop +++ b/packaging/ubuntu/lbry.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Version=0.6.1 +Version=0.6.2 Name=LBRY Comment=The world's first user-owned content marketplace Icon=lbry