From 188ccd575072704ea870fac60b5cde4c29d822bd Mon Sep 17 00:00:00 2001 From: Ines Montani Date: Fri, 22 Mar 2019 12:54:14 +0100 Subject: [PATCH 1/2] Fix xfail marker --- spacy/tests/regression/test_issue3356.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spacy/tests/regression/test_issue3356.py b/spacy/tests/regression/test_issue3356.py index 2ef847746..c14fa8525 100644 --- a/spacy/tests/regression/test_issue3356.py +++ b/spacy/tests/regression/test_issue3356.py @@ -65,7 +65,7 @@ prefix_search = ( if compat.is_python2: # If we have this test in Python 3, pytest chokes, as it can't print the # string above in the xpass message. - @pytest.xfail + @pytest.mark.xfail def test_issue3356(): pattern = re.compile(prefix_search.decode("utf8")) assert not pattern.search(u"hello") From c81923ee30a89fe29eaf4ee12d1c5773e01a44a9 Mon Sep 17 00:00:00 2001 From: Ines Montani Date: Fri, 22 Mar 2019 13:31:58 +0100 Subject: [PATCH 2/2] Update wasabi pin --- requirements.txt | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index e61a029c9..bf95839b5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ preshed>=2.0.1,<2.1.0 thinc>=7.0.2,<7.1.0 blis>=0.2.2,<0.3.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 # Third party dependencies numpy>=1.15.0 diff --git a/setup.py b/setup.py index 6f29e1efa..ed030eaf0 100755 --- a/setup.py +++ b/setup.py @@ -232,7 +232,7 @@ def setup_package(): "plac<1.0.0,>=0.9.6", "requests>=2.13.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", 'pathlib==1.0.1; python_version < "3.4"', ],