LBRYCommunity/lbry-desktop
1
0
Fork 0
Code Issues 596 Pull requests 6 Projects Releases 238 Packages Wiki Activity

Convert release.py to get daemon version and URL from package.json

Browse source 
Before, it was using the old DAEMON_URL file, which no longer exists.
This commit is contained in:
Alex Liebowitz 2017-08-10 18:24:15 -05:00
parent 6769b9eeb6
commit b434fb3b9b
1 changed files with 25 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
build/release.py
View file

@ -5,6 +5,7 @@ This script should be run locally, not on a build server.
import argparse import argparse
import contextlib import contextlib
import os import os
import json
import re import re
import requests import requests
import subprocess import subprocess
@ -16,7 +17,7 @@ import github
import changelog import changelog
ROOT = os.path.dirname(os.path.dirname(os.path.realpath(__file__))) ROOT = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
DAEMON_URL_FILE = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'DAEMON_URL') APP_PACKAGE_JSON_FILE = os.path.join(ROOT, 'app', 'package.json')
def main(): def main():
@ -38,11 +39,11 @@ def main():
print 'Current version: {}'.format(repo.current_version) print 'Current version: {}'.format(repo.current_version)
print 'New version: {}'.format(repo.new_version) print 'New version: {}'.format(repo.new_version)
with open(DAEMON_URL_FILE, 'r') as f: with open(APP_PACKAGE_JSON_FILE, 'r') as f:
daemon_url_template = f.read().strip() package_settings = json.load(f)['lbrySettings']
daemon_version = re.search('/(?P<version>v[^/]+)', daemon_url_template) daemon_url_template = package_settings['lbrynetDaemonUrlTemplate']
print 'Daemon version: {} ({})'.format( daemon_version = package_settings['lbrynetDaemonVersion']
daemon_version.group('version'), daemon_url_template) print 'Daemon version: {} ({})'.format(daemon_version, daemon_url_template.replace('DAEMONVER', daemon_version))
if not args.confirm and not confirm(): if not args.confirm and not confirm():
print "Aborting" print "Aborting"
@ -190,18 +191,25 @@ def run_sanity_checks(repo, branch):
def check_daemon_urls(): def check_daemon_urls():
success = True with open(APP_PACKAGE_JSON_FILE, 'r') as f:
with open(DAEMON_URL_FILE, 'r') as f: package_settings = json.load(f)['lbrySettings']
daemon_url_template = f.read().strip()
if "OSNAME" not in daemon_url_template:
print "Daemon URL must include the string 'OSNAME'"
return False
for osname in ('linux', 'macos', 'windows'):
if not check_url(daemon_url_template.replace('OSNAME', osname)):
success = False
print "Daemon URL for " + osname + " does not work"
return success
daemon_url_template = package_settings['lbrynetDaemonUrlTemplate']
daemon_version = package_settings['lbrynetDaemonVersion']
if "OSNAME" not in daemon_url_template:
print "Daemon URL must include the string \"OSNAME\""
return False
elif "DAEMONVER" not in daemon_url_template:
print "Daemon URL must include the string \"DAEMONVER\""
return False
for osname in ('linux', 'macos', 'windows'):
if not check_url(daemon_url_template.replace('DAEMONVER', daemon_version).replace('OSNAME', osname)):
print "Daemon URL for", osname, " does not work"
return False
return True
def check_url(url): def check_url(url):
url = url.strip() url = url.strip()