From 970278a3d6420eb700b22aac6425688d691d2c8a Mon Sep 17 00:00:00 2001 From: Henning Peters Date: Fri, 18 Dec 2015 09:49:45 +0100 Subject: [PATCH] no need to link data dir anymore --- spacy/en/download.py | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/spacy/en/download.py b/spacy/en/download.py index 26d2b44be..8d3040311 100644 --- a/spacy/en/download.py +++ b/spacy/en/download.py @@ -8,19 +8,16 @@ from sputnik import Sputnik def migrate(path): data_path = os.path.join(path, 'data') - if os.path.isdir(data_path) and not os.path.islink(data_path): - shutil.rmtree(data_path) + if os.path.isdir(data_path): + if os.path.islink(data_path): + os.unlink(data_path) + else: + shutil.rmtree(data_path) for filename in os.listdir(path): if filename.endswith('.tgz'): os.unlink(os.path.join(path, filename)) -def link(package, path): - if os.path.exists(path): - os.unlink(path) - os.symlink(package.dir_path('data'), path) - - @plac.annotations( force=("Force overwrite", "flag", "f", bool), ) @@ -30,8 +27,12 @@ def main(data_size='all', force=False): path = os.path.dirname(os.path.abspath(__file__)) - command = sputnik.make_command( - data_path=os.path.abspath(os.path.join(path, '..', 'data')), + data_path = os.path.abspath(os.path.join(path, '..', 'data')) + if not os.path.isdir(data_path): + os.mkdir(data_path) + + command = sputnik.command( + data_path=data_path, repository_url='https://index.spacy.io') if force: @@ -42,9 +43,6 @@ def main(data_size='all', force=False): # FIXME clean up old-style packages migrate(path) - # FIXME supply spacy with an old-style data dir - link(package, os.path.join(path, 'data')) - if __name__ == '__main__': plac.call(main)