explosion/spaCy
1
1
Fork 0
mirror of https://github.com/explosion/spaCy.git synced 2025-02-26 08:30:48 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop-downloads'

Browse Source
This commit is contained in:
Matthew Honnibal 2017-03-16 20:41:37 +01:00
commit af41a9790c
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spacy/link.py
View File

@ -55,8 +55,6 @@ def symlink(model_path, link_name, force):
def get_meta(package_path, package): def get_meta(package_path, package):
meta = util.parse_package_meta(package_path, package) meta = util.parse_package_meta(package_path, package)
if not meta:
util.sys_exit()
return meta return meta

7
spacy/util.py
View File

@ -149,11 +149,10 @@ def check_renamed_kwargs(renamed, kwargs):
raise TypeError("Keyword argument %s now renamed to %s" % (old, new)) raise TypeError("Keyword argument %s now renamed to %s" % (old, new))
def parse_package_meta(package_path, package): def parse_package_meta(package_path, package, on_error=False):
location = os.path.join(str(package_path), package, 'meta.json') location = os.path.join(str(package_path), package, 'meta.json')
if not os.path.isfile(location): if not os.path.isfile(location) and on_error:
print_msg("'{p}' doesn't seem to be a valid model package.".format(p=package), on_error()
title="No meta.json found")
else: else:
with io.open(location, encoding='utf8') as f: with io.open(location, encoding='utf8') as f:
meta = json.load(f) meta = json.load(f)