From 1cc0d05812c5c4874d6c4ad12b61ef92ed8ea57c Mon Sep 17 00:00:00 2001
From: svlandeg <svlandeg@github.com>
Date: Fri, 29 Oct 2021 17:10:07 +0200
Subject: [PATCH] fixes

---
 setup.py                             | 6 +++++-
 spacy/pipeline/transition_parser.pyx | 2 +-
 spacy/tests/parser/test_add_label.py | 1 +
 spacy/tests/pipeline/test_tok2vec.py | 2 +-
 spacy/tests/test_misc.py             | 2 +-
 spacy/tokens/_dict_proxies.py        | 3 ---
 spacy/training/example.pyx           | 1 -
 7 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/setup.py b/setup.py
index dcfa98cfa..1397a8d01 100755
--- a/setup.py
+++ b/setup.py
@@ -201,7 +201,11 @@ def setup_package():
     for name in MOD_NAMES:
         mod_path = name.replace(".", "/") + ".pyx"
         ext = Extension(
-            name, [mod_path], language="c++", extra_compile_args=["-std=c++11"]
+            name,
+            [mod_path],
+            language="c++",
+            include_dirs=include_dirs,
+            extra_compile_args=["-std=c++11"],
         )
         ext_modules.append(ext)
     print("Cythonizing sources")
diff --git a/spacy/pipeline/transition_parser.pyx b/spacy/pipeline/transition_parser.pyx
index 945652cad..814a4d894 100644
--- a/spacy/pipeline/transition_parser.pyx
+++ b/spacy/pipeline/transition_parser.pyx
@@ -47,7 +47,7 @@ class Parser(TrainablePipe):
         beam_density=0.0,
         beam_update_prob=0.0,
         multitasks=tuple(),
-        incorrect_spans_key=None
+        incorrect_spans_key=None,
     ):
         """Create a Parser.
 
diff --git a/spacy/tests/parser/test_add_label.py b/spacy/tests/parser/test_add_label.py
index f89e993e9..540b00f89 100644
--- a/spacy/tests/parser/test_add_label.py
+++ b/spacy/tests/parser/test_add_label.py
@@ -123,6 +123,7 @@ def test_ner_labels_added_implicitly_on_predict():
     assert "D" in ner.labels
 
 
+@pytest.mark.skip(reason="Not yet supported")
 def test_ner_labels_added_implicitly_on_beam_parse():
     nlp = Language()
     ner = nlp.add_pipe("beam_ner")
diff --git a/spacy/tests/pipeline/test_tok2vec.py b/spacy/tests/pipeline/test_tok2vec.py
index eeea906bb..50c4b90ce 100644
--- a/spacy/tests/pipeline/test_tok2vec.py
+++ b/spacy/tests/pipeline/test_tok2vec.py
@@ -255,7 +255,7 @@ cfg_string_multi = """
     factory = "ner"
 
     [components.ner.model]
-    @architectures = "spacy.TransitionBasedParser.v2"
+    @architectures = "spacy.TransitionBasedParser.v3"
 
     [components.ner.model.tok2vec]
     @architectures = "spacy.Tok2VecListener.v1"
diff --git a/spacy/tests/test_misc.py b/spacy/tests/test_misc.py
index 4dd56a4a5..4ce63ede0 100644
--- a/spacy/tests/test_misc.py
+++ b/spacy/tests/test_misc.py
@@ -5,7 +5,7 @@ from pathlib import Path
 from spacy.about import __version__ as spacy_version
 from spacy import util
 from spacy import prefer_gpu, require_gpu, require_cpu
-from spacy.util import dot_to_object, SimpleFrozenList
+from spacy.util import dot_to_object, SimpleFrozenList, import_file, to_ternary_int
 from thinc.api import Config, Optimizer, ConfigValidationError
 from thinc.api import set_current_ops
 from spacy.training.batchers import minibatch_by_words
diff --git a/spacy/tokens/_dict_proxies.py b/spacy/tokens/_dict_proxies.py
index 83399eafa..470d3430f 100644
--- a/spacy/tokens/_dict_proxies.py
+++ b/spacy/tokens/_dict_proxies.py
@@ -40,9 +40,6 @@ class SpanGroups(UserDict):
             doc = self._ensure_doc()
         return SpanGroups(doc).from_bytes(self.to_bytes())
 
-    def copy(self) -> "SpanGroups":
-        return SpanGroups(self.doc_ref()).from_bytes(self.to_bytes())
-
     def to_bytes(self) -> bytes:
         # We don't need to serialize this as a dict, because the groups
         # know their names.
diff --git a/spacy/training/example.pyx b/spacy/training/example.pyx
index 732203e7b..5357b5c0b 100644
--- a/spacy/training/example.pyx
+++ b/spacy/training/example.pyx
@@ -1,5 +1,4 @@
 from collections.abc import Iterable as IterableInstance
-import warnings
 import numpy
 from murmurhash.mrmr cimport hash64