Merge remote-tracking branch 'upstream/master' into feature/el-framework

This commit is contained in:
svlandeg 2019-03-22 13:44:36 +01:00
commit 12d4caf341
3 changed files with 3 additions and 3 deletions

View File

@ -4,7 +4,7 @@ preshed>=2.0.1,<2.1.0
thinc>=7.0.2,<7.1.0 thinc>=7.0.2,<7.1.0
blis>=0.2.2,<0.3.0 blis>=0.2.2,<0.3.0
murmurhash>=0.28.0,<1.1.0 murmurhash>=0.28.0,<1.1.0
wasabi>=0.1.3,<1.1.0 wasabi>=0.2.0,<1.1.0
srsly>=0.0.5,<1.1.0 srsly>=0.0.5,<1.1.0
# Third party dependencies # Third party dependencies
numpy>=1.15.0 numpy>=1.15.0

View File

@ -233,7 +233,7 @@ def setup_package():
"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.0.0", "jsonschema>=2.6.0,<3.0.0",
"wasabi>=0.0.12,<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"',
], ],

View File

@ -65,7 +65,7 @@ prefix_search = (
if compat.is_python2: if compat.is_python2:
# If we have this test in Python 3, pytest chokes, as it can't print the # If we have this test in Python 3, pytest chokes, as it can't print the
# string above in the xpass message. # string above in the xpass message.
@pytest.xfail @pytest.mark.xfail
def test_issue3356(): def test_issue3356():
pattern = re.compile(prefix_search.decode("utf8")) pattern = re.compile(prefix_search.decode("utf8"))
assert not pattern.search(u"hello") assert not pattern.search(u"hello")