explosion/spaCy
1
1
Fork 0
mirror of https://github.com/explosion/spaCy.git synced 2025-01-11 17:56:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

Make jsonschema dependency optional (#3784)

Browse Source
This commit is contained in:
Ines Montani 2019-05-30 14:34:58 +02:00 committed by Matthew Honnibal
parent 89379a7fa4
commit a7fd42d937
5 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
requirements.txt
View File

@ -9,9 +9,10 @@ srsly>=0.0.5,<1.1.0
# Third party dependencies # Third party dependencies
numpy>=1.15.0 numpy>=1.15.0
requests>=2.13.0,<3.0.0 requests>=2.13.0,<3.0.0
jsonschema>=2.6.0,<3.1.0
plac<1.0.0,>=0.9.6 plac<1.0.0,>=0.9.6
pathlib==1.0.1; python_version < "3.4" pathlib==1.0.1; python_version < "3.4"
# Optional dependencies
jsonschema>=2.6.0,<3.1.0
# Development dependencies # Development dependencies
cython>=0.25 cython>=0.25
pytest>=4.0.0,<4.1.0 pytest>=4.0.0,<4.1.0

1
setup.py
View File

@ -232,7 +232,6 @@ def setup_package():
"blis>=0.2.2,<0.3.0", "blis>=0.2.2,<0.3.0",
"plac<1.0.0,>=0.9.6", "plac<1.0.0,>=0.9.6",
"requests>=2.13.0,<3.0.0", "requests>=2.13.0,<3.0.0",
"jsonschema>=2.6.0,<3.1.0",
"wasabi>=0.2.0,<1.1.0", "wasabi>=0.2.0,<1.1.0",
"srsly>=0.0.5,<1.1.0", "srsly>=0.0.5,<1.1.0",
'pathlib==1.0.1; python_version < "3.4"', 'pathlib==1.0.1; python_version < "3.4"',

2
spacy/errors.py
View File

@ -385,6 +385,8 @@ class Errors(object):
E134 = ("Alias '{alias}' defined for unknown entity '{entity}'.") E134 = ("Alias '{alias}' defined for unknown entity '{entity}'.")
E135 = ("If you meant to replace a built-in component, use `create_pipe`: " E135 = ("If you meant to replace a built-in component, use `create_pipe`: "
"`nlp.replace_pipe('{name}', nlp.create_pipe('{name}'))`") "`nlp.replace_pipe('{name}', nlp.create_pipe('{name}'))`")
E136 = ("This additional feature requires the jsonschema library to be "
"installed:\npip install jsonschema")
@add_codes @add_codes

5
spacy/matcher/matcher.pyx
View File

@ -48,7 +48,10 @@ cdef class Matcher:
self._extra_predicates = [] self._extra_predicates = []
self.vocab = vocab self.vocab = vocab
self.mem = Pool() self.mem = Pool()
self.validator = get_json_validator(TOKEN_PATTERN_SCHEMA) if validate else None if validate:
self.validator = get_json_validator(TOKEN_PATTERN_SCHEMA)
else:
self.validator = None
def __reduce__(self): def __reduce__(self):
data = (self.vocab, self._patterns, self._callbacks) data = (self.vocab, self._patterns, self._callbacks)

9
spacy/util.py
View File

@ -14,8 +14,11 @@ import functools
import itertools import itertools
import numpy.random import numpy.random
import srsly import srsly
from jsonschema import Draft4Validator
try:
import jsonschema
except ImportError:
jsonschema = None
try: try:
import cupy.random import cupy.random
@ -682,7 +685,9 @@ def get_json_validator(schema):
# validator that's used (e.g. different draft implementation), without # validator that's used (e.g. different draft implementation), without
# having to change it all across the codebase. # having to change it all across the codebase.
# TODO: replace with (stable) Draft6Validator, if available # TODO: replace with (stable) Draft6Validator, if available
return Draft4Validator(schema) if jsonschema is None:
raise ValueError(Errors.E136)
return jsonschema.Draft4Validator(schema)
def validate_schema(schema): def validate_schema(schema):