Merge pull request #189 from lbryio/include-jsonschema

fix jsonschema includes
This commit is contained in:
Jack Robison 2016-10-16 02:54:55 -04:00 committed by GitHub
commit 307751277d
2 changed files with 10 additions and 1 deletions

View file

@ -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 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 C:\Python27\Scripts\pip.exe install git+https://github.com/lbryio/lbryum.git
cd C:\projects\lbry cd C:\projects\lbry

View file

@ -2,6 +2,7 @@
import sys import sys
import os import os
import site
from lbrynet import __version__ from lbrynet import __version__
LINUX = 1 LINUX = 1
@ -134,6 +135,10 @@ elif platform == WINDOWS:
# Allow virtualenv to find distutils of base python installation # Allow virtualenv to find distutils of base python installation
distutils_path = os.path.join(os.path.dirname(opcode.__file__), 'distutils') 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): def find_data_file(filename):
if getattr(sys, 'frozen', False): if getattr(sys, 'frozen', False):
# The application is frozen # The application is frozen
@ -268,6 +273,7 @@ elif platform == WINDOWS:
'requests_futures', 'requests_futures',
'seccure', 'seccure',
'simplejson', 'simplejson',
'jsonschema',
'six', 'six',
'aes', 'aes',
'txjsonrpc', '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, 'portuguese.txt'), os.path.join('wordlist', 'portuguese.txt')),
(os.path.join(wordlist_path, 'spanish.txt'), os.path.join('wordlist', 'spanish.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( tray_app = Executable(
script=os.path.join(app_dir, 'LBRYWin32App.py'), script=os.path.join(app_dir, 'LBRYWin32App.py'),