sync with upstream master

Author: giannisdaras

CONTRIBUTING.md

@@ -73,11 +73,7 @@ so it only becomes visible on click, making the issue easier to read and follow.
 ### Issue labels
 
 To distinguish issues that are opened by us, the maintainers, we usually add a
-<<<<<<< HEAD
-💫 to the title. [See this page](https://github.com/explosion/spaCy/labels) 
-=======
 💫 to the title. [See this page](https://github.com/explosion/spaCy/labels)
->>>>>>> 14d9007efd2ca457c6e6549d5599e460e198904c
 for an overview of the system we use to tag our issues and pull requests.
 
 ## Contributing to the code base

README.rst

@@ -49,11 +49,7 @@ integration. It's commercial open-source software, released under the MIT licens
 `New in v2.0`_       New features, backwards incompatibilities and migration guide.
 `API Reference`_     The detailed reference for spaCy's API.
 `Models`_            Download statistical language models for spaCy.
-<<<<<<< HEAD
-`Resources`_         Libraries, extensions, demos, books and courses.
-=======
 `Universe`_          Libraries, extensions, demos, books and courses.
->>>>>>> 14d9007efd2ca457c6e6549d5599e460e198904c
 `Changelog`_         Changes and version history.
 `Contribute`_        How to contribute to the spaCy project and code base.
 ===================  ===
@@ -63,11 +59,7 @@ integration. It's commercial open-source software, released under the MIT licens
 .. _Usage Guides: https://spacy.io/usage/
 .. _API Reference: https://spacy.io/api/
 .. _Models: https://spacy.io/models
-<<<<<<< HEAD
-.. _Resources: https://spacy.io/usage/resources
-=======
 .. _Universe: https://spacy.io/universe
->>>>>>> 14d9007efd2ca457c6e6549d5599e460e198904c
 .. _Changelog: https://spacy.io/usage/#changelog
 .. _Contribute: https://github.com/explosion/spaCy/blob/master/CONTRIBUTING.md
 
@@ -207,14 +199,11 @@ or manually by pointing pip to a path or URL.
     # pip install .tar.gz archive from path or URL
     pip install /Users/you/en_core_web_sm-2.0.0.tar.gz
 
-<<<<<<< HEAD
-=======
 If you have SSL certification problems, SSL customization options are described in the help:
 
     # help for the download command
     python -m spacy download --help
 
->>>>>>> 14d9007efd2ca457c6e6549d5599e460e198904c
 Loading and using models
 ------------------------
 

examples/information_extraction/phrase_matcher.py

@@ -34,13 +34,10 @@
 {"text":"Appalachia"}
 {"text":"Argentina"}
 
-<<<<<<< HEAD
-=======
 Reddit comments corpus:
 * https://files.pushshift.io/reddit/
 * https://archive.org/details/2015_reddit_comments_corpus
 
->>>>>>> 14d9007efd2ca457c6e6549d5599e460e198904c
 Compatible with: spaCy v2.0.0+
 """
 from __future__ import print_function, unicode_literals, division

examples/pipeline/custom_component_countries_api.py

@@ -68,15 +68,9 @@ def __init__(self, nlp, label='GPE'):
         # the matches, so we're only setting a default value, not a getter.
         # If no default value is set, it defaults to None.
         Token.set_extension('is_country', default=False)
-<<<<<<< HEAD
-        Token.set_extension('country_capital')
-        Token.set_extension('country_latlng')
-        Token.set_extension('country_flag')
-=======
         Token.set_extension('country_capital', default=False)
         Token.set_extension('country_latlng', default=False)
         Token.set_extension('country_flag', default=False)
->>>>>>> 14d9007efd2ca457c6e6549d5599e460e198904c
 
         # Register attributes on Doc and Span via a getter that checks if one of
         # the contained tokens is set to is_country == True.

examples/training/train_textcat.py

@@ -1,10 +1,6 @@
 #!/usr/bin/env python
 # coding: utf8
-<<<<<<< HEAD
-"""Train a multi-label convolutional neural network text classifier on the
-=======
 """Train a convolutional neural network text classifier on the
->>>>>>> 14d9007efd2ca457c6e6549d5599e460e198904c
 IMDB dataset, using the TextCategorizer component. The dataset will be loaded
 automatically via Thinc's built-in dataset loader. The model is added to
 spacy.pipeline, and predictions are available via `doc.cats`. For more details,

requirements.txt

@@ -9,10 +9,6 @@ plac<1.0.0,>=0.9.6
 ujson>=1.35
 dill>=0.2,<0.3
 regex==2017.4.5
-<<<<<<< HEAD
-pytest>=3.0.6,<4.0.0
-=======
 requests>=2.13.0,<3.0.0
 pytest>=3.6.0,<4.0.0
->>>>>>> 14d9007efd2ca457c6e6549d5599e460e198904c
 mock>=2.0.0,<3.0.0

setup.py

@@ -195,12 +195,8 @@ def setup_package():
                 'pathlib',
                 'ujson>=1.35',
                 'dill>=0.2,<0.3',
-<<<<<<< HEAD
-                'regex==2017.4.5'],
-=======
                 'regex==2017.4.5',
                 'requests>=2.13.0,<3.0.0'],
->>>>>>> 14d9007efd2ca457c6e6549d5599e460e198904c
             classifiers=[
                 'Development Status :: 5 - Production/Stable',
                 'Environment :: Console',

spacy/__init__.py

@@ -20,10 +20,5 @@ def blank(name, **kwargs):
     return LangClass(**kwargs)
 
 
-<<<<<<< HEAD
-def info(model=None, markdown=False):
-    return cli_info(model, markdown)
-=======
 def info(model=None, markdown=False, silent=False):
     return cli_info(model, markdown, silent)
->>>>>>> 14d9007efd2ca457c6e6549d5599e460e198904c

spacy/cli/_messages.py

@@ -7,11 +7,7 @@ class Messages(object):
     M002 = ("Creating a shortcut link for 'en' didn't work (maybe you "
             "don't have admin permissions?), but you can still load the "
             "model via its full package name: nlp = spacy.load('{name}')")
-<<<<<<< HEAD
-    M003 = ("Server error ({code}: {desc})")
-=======
     M003 = ("Server error ({code})")
->>>>>>> 14d9007efd2ca457c6e6549d5599e460e198904c
     M004 = ("Couldn't fetch {desc}. Please find a model for your spaCy "
             "installation (v{version}), and download it manually. For more "
             "details, see the documentation: https://spacy.io/usage/models")

spacy/cli/download.py

@@ -2,17 +2,6 @@
 from __future__ import unicode_literals
 
 import plac
-<<<<<<< HEAD
-import os
-import subprocess
-import sys
-import ujson
-
-from .link import link
-from ._messages import Messages
-from ..util import prints, get_package_path
-from ..compat import url_read, HTTPError
-=======
 import requests
 import os
 import subprocess
@@ -21,45 +10,30 @@
 from ._messages import Messages
 from .link import link
 from ..util import prints, get_package_path
->>>>>>> 14d9007efd2ca457c6e6549d5599e460e198904c
 from .. import about
 
 
 @plac.annotations(
     model=("model to download, shortcut or name)", "positional", None, str),
     direct=("force direct download. Needs model name with version and won't "
-<<<<<<< HEAD
-            "perform compatibility check", "flag", "d", bool))
-def download(model, direct=False):
-=======
             "perform compatibility check", "flag", "d", bool),
     pip_args=("additional arguments to be passed to `pip install` when "
               "installing the model"))
 def download(model, direct=False, *pip_args):
->>>>>>> 14d9007efd2ca457c6e6549d5599e460e198904c
     """
     Download compatible model from default download path using pip. Model
     can be shortcut, model name or, if --direct flag is set, full model name
     with version.
     """
     if direct:
-<<<<<<< HEAD
-        dl = download_model('{m}/{m}.tar.gz'.format(m=model))
-=======
         dl = download_model('{m}/{m}.tar.gz#egg={m}'.format(m=model), pip_args)
->>>>>>> 14d9007efd2ca457c6e6549d5599e460e198904c
     else:
         shortcuts = get_json(about.__shortcuts__, "available shortcuts")
         model_name = shortcuts.get(model, model)
         compatibility = get_compatibility()
         version = get_version(model_name, compatibility)
-<<<<<<< HEAD
-        dl = download_model('{m}-{v}/{m}-{v}.tar.gz'.format(m=model_name,
-                                                            v=version))
-=======
         dl = download_model('{m}-{v}/{m}-{v}.tar.gz#egg={m}=={v}'
                             .format(m=model_name, v=version), pip_args)
->>>>>>> 14d9007efd2ca457c6e6549d5599e460e198904c
         if dl != 0:  # if download subprocess doesn't return 0, exit
             sys.exit(dl)
         try:
@@ -68,12 +42,7 @@ def download(model, direct=False, *pip_args):
             # package, which fails if model was just installed via
             # subprocess
             package_path = get_package_path(model_name)
-<<<<<<< HEAD
-            link(model_name, model, force=True,
-                    model_path=package_path)
-=======
             link(model_name, model, force=True, model_path=package_path)
->>>>>>> 14d9007efd2ca457c6e6549d5599e460e198904c
         except:
             # Dirty, but since spacy.download and the auto-linking is
             # mostly a convenience wrapper, it's best to show a success
@@ -82,20 +51,11 @@ def download(model, direct=False, *pip_args):
 
 
 def get_json(url, desc):
-<<<<<<< HEAD
-    try:
-        data = url_read(url)
-    except HTTPError as e:
-        prints(Messages.M004.format(desc, about.__version__),
-               title=Messages.M003.format(e.code, e.reason), exits=1)
-    return ujson.loads(data)
-=======
     r = requests.get(url)
     if r.status_code != 200:
         prints(Messages.M004.format(desc=desc, version=about.__version__),
                title=Messages.M003.format(code=r.status_code), exits=1)
     return r.json()
->>>>>>> 14d9007efd2ca457c6e6549d5599e460e198904c
 
 
 def get_compatibility():
@@ -117,18 +77,10 @@ def get_version(model, comp):
     return comp[model][0]
 
 
-<<<<<<< HEAD
-def download_model(filename):
-    download_url = about.__download_url__ + '/' + filename
-    return subprocess.call(
-        [sys.executable, '-m', 'pip', 'install', '--no-cache-dir', '--no-deps',
-         download_url], env=os.environ.copy())
-=======
 def download_model(filename, user_pip_args=None):
     download_url = about.__download_url__ + '/' + filename
     pip_args = ['--no-cache-dir', '--no-deps']
     if user_pip_args:
         pip_args.extend(user_pip_args)
     cmd = [sys.executable, '-m', 'pip', 'install'] + pip_args + [download_url]
     return subprocess.call(cmd, env=os.environ.copy())
->>>>>>> 14d9007efd2ca457c6e6549d5599e460e198904c

spacy/cli/info.py

@@ -13,14 +13,9 @@
 
 @plac.annotations(
     model=("optional: shortcut link of model", "positional", None, str),
-<<<<<<< HEAD
-    markdown=("generate Markdown for GitHub issues", "flag", "md", str))
-def info(model=None, markdown=False):
-=======
     markdown=("generate Markdown for GitHub issues", "flag", "md", str),
     silent=("don't print anything (just return)", "flag", "s"))
 def info(model=None, markdown=False, silent=False):
->>>>>>> 14d9007efd2ca457c6e6549d5599e460e198904c
     """Print info about spaCy installation. If a model shortcut link is
     speficied as an argument, print model information. Flag --markdown
     prints details in Markdown for easy copy-pasting to GitHub issues.
@@ -39,16 +34,6 @@ def info(model=None, markdown=False, silent=False):
             meta['source'] = path2str(model_path.resolve())
         else:
             meta['source'] = path2str(model_path)
-<<<<<<< HEAD
-        print_info(meta, 'model %s' % model, markdown)
-    else:
-        data = {'spaCy version': about.__version__,
-                'Location': path2str(Path(__file__).parent.parent),
-                'Platform': platform.platform(),
-                'Python version': platform.python_version(),
-                'Models': list_models()}
-        print_info(data, 'spaCy', markdown)
-=======
         if not silent:
             print_info(meta, 'model %s' % model, markdown)
         return meta
@@ -60,7 +45,6 @@ def info(model=None, markdown=False, silent=False):
     if not silent:
         print_info(data, 'spaCy', markdown)
     return data
->>>>>>> 14d9007efd2ca457c6e6549d5599e460e198904c
 
 
 def print_info(data, title, markdown):

spacy/cli/train.py

@@ -116,11 +116,7 @@ def train(lang, output_dir, train_data, dev_data, n_iter=30, n_sents=0,
     optimizer = nlp.begin_training(lambda: corpus.train_tuples, device=use_gpu)
     nlp._optimizer = None
 
-<<<<<<< HEAD
-    print("Itn.\tP.Loss\tN.Loss\tUAS\tNER P.\tNER R.\tNER F.\tTag %\tToken %")
-=======
     print("Itn.  Dep Loss  NER Loss  UAS     NER P.  NER R.  NER F.  Tag %   Token %  CPU WPS  GPU WPS")
->>>>>>> 14d9007efd2ca457c6e6549d5599e460e198904c
     try:
         train_docs = corpus.train_docs(nlp, projectivize=True, noise_level=0.0,
                                        gold_preproc=gold_preproc, max_length=0)
@@ -211,19 +207,6 @@ def print_progress(itn, losses, dev_scores, cpu_wps=0.0, gpu_wps=0.0):
     scores.update(dev_scores)
     scores['cpu_wps'] = cpu_wps
     scores['gpu_wps'] = gpu_wps or 0.0
-<<<<<<< HEAD
-    tpl = '\t'.join((
-        '{:d}',
-        '{dep_loss:.3f}',
-        '{ner_loss:.3f}',
-        '{uas:.3f}',
-        '{ents_p:.3f}',
-        '{ents_r:.3f}',
-        '{ents_f:.3f}',
-        '{tags_acc:.3f}',
-        '{token_acc:.3f}',
-        '{cpu_wps:.1f}',
-=======
     tpl = ''.join((
         '{:<6d}',
         '{dep_loss:<10.3f}',
@@ -235,7 +218,6 @@ def print_progress(itn, losses, dev_scores, cpu_wps=0.0, gpu_wps=0.0):
         '{tags_acc:<8.3f}',
         '{token_acc:<9.3f}',
         '{cpu_wps:<9.1f}',
->>>>>>> 14d9007efd2ca457c6e6549d5599e460e198904c
         '{gpu_wps:.1f}',
     ))
     print(tpl.format(itn, **scores))

spacy/cli/validate.py

@@ -5,16 +5,10 @@
 from pathlib import Path
 import sys
 import ujson
-<<<<<<< HEAD
-
-from ._messages import Messages
-from ..compat import path2str, locale_escape, url_read, HTTPError
-=======
 import requests
 
 from ._messages import Messages
 from ..compat import path2str, locale_escape
->>>>>>> 14d9007efd2ca457c6e6549d5599e460e198904c
 from ..util import prints, get_data_path, read_json
 from .. import about
 
@@ -23,20 +17,11 @@ def validate():
     """Validate that the currently installed version of spaCy is compatible
     with the installed models. Should be run after `pip install -U spacy`.
     """
-<<<<<<< HEAD
-    try:
-        data = url_read(about.__compatibility__)
-    except HTTPError as e:
-        title = Messages.M003.format(code=e.code, desc=e.reason)
-        prints(Messages.M021, title=title, exits=1)
-    compat = ujson.loads(data)['spacy']
-=======
     r = requests.get(about.__compatibility__)
     if r.status_code != 200:
         prints(Messages.M021, title=Messages.M003.format(code=r.status_code),
                exits=1)
     compat = r.json()['spacy']
->>>>>>> 14d9007efd2ca457c6e6549d5599e460e198904c
     current_compat = compat.get(about.__version__)
     if not current_compat:
         prints(about.__compatibility__, exits=1,