Merge branch 'develop' of https://github.com/explosion/spaCy into develop

This commit is contained in:
Matthew Honnibal 2017-06-05 20:20:00 +02:00
commit 1f5874a927
3 changed files with 11 additions and 5 deletions

View File

@ -80,7 +80,7 @@ def generate_meta():
settings = [('lang', 'Model language', 'en'),
('name', 'Model name', 'model'),
('version', 'Model version', '0.0.0'),
('spacy_version', 'Required spaCy version', '>=2.0.0,<3.0.0'),
('spacy_version', 'Required spaCy version', '>=%s,<3.0.0' % about.__version__),
('description', 'Model description', False),
('author', 'Author', False),
('email', 'Author email', False),
@ -92,6 +92,8 @@ def generate_meta():
response = util.get_raw_input(desc, default)
meta[setting] = default if response == '' and default else response
meta['pipeline'] = generate_pipeline()
if about.__title__ != 'spacy':
meta['parent_package'] = about.__title__
return meta

View File

@ -5,7 +5,7 @@
"SITENAME": "spaCy",
"SLOGAN": "Industrial-strength Natural Language Processing in Python",
"SITE_URL": "https://spacy.io",
"SITE_URL": "https://alpha.spacy.io",
"EMAIL": "contact@explosion.ai",
"COMPANY": "Explosion AI",
@ -14,8 +14,8 @@
"SPACY_VERSION": "1.8",
"LATEST_NEWS": {
"url": "https://survey.spacy.io/",
"title": "Take the spaCy user survey and help us improve the library!"
"url": "https://github.com/explosion/spaCy/releases/tag/v2.0.0-alpha",
"title": "Test spaCy v2.0.0 alpha!"
},
"SOCIAL": {

View File

@ -1,5 +1,9 @@
//- 💫 ROBOTS.TXT
if environment != "deploy" || ALPHA
if environment != "deploy"
| User-agent: *
| Disallow: /
if ALPHA
| User-agent: Googlebot
| Disallow: /