From 34205069543225d277f38b61a3842281e5787d86 Mon Sep 17 00:00:00 2001
From: Adriane Boyd <adrianeboyd@gmail.com>
Date: Mon, 28 Feb 2022 09:02:03 +0100
Subject: [PATCH 1/4] Set version to v3.0.8

---
 spacy/about.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spacy/about.py b/spacy/about.py
index 123e5ea7c..0a47266b9 100644
--- a/spacy/about.py
+++ b/spacy/about.py
@@ -1,6 +1,6 @@
 # fmt: off
 __title__ = "spacy"
-__version__ = "3.0.7"
+__version__ = "3.0.8"
 __download_url__ = "https://github.com/explosion/spacy-models/releases/download"
 __compatibility__ = "https://raw.githubusercontent.com/explosion/spacy-models/master/compatibility.json"
 __projects__ = "https://github.com/explosion/projects"

From 308b1706a7e4429822e40b7cb84a5f866ef54ccb Mon Sep 17 00:00:00 2001
From: Ines Montani <ines@ines.io>
Date: Tue, 19 Oct 2021 15:13:25 +0200
Subject: [PATCH 2/4] Allow conftest.py to run twice for build envs

---
 spacy/tests/conftest.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/spacy/tests/conftest.py b/spacy/tests/conftest.py
index c6be15189..ec0cb8696 100644
--- a/spacy/tests/conftest.py
+++ b/spacy/tests/conftest.py
@@ -3,7 +3,13 @@ from spacy.util import get_lang_class
 
 
 def pytest_addoption(parser):
-    parser.addoption("--slow", action="store_true", help="include slow tests")
+    try:
+        parser.addoption("--slow", action="store_true", help="include slow tests")
+        parser.addoption("--issue", action="store", help="test specific issues")
+    # Options are already added, e.g. if conftest is copied in a build pipeline
+    # and runs twice
+    except ValueError:
+        pass
 
 
 def pytest_runtest_setup(item):

From 694c318f4f9b68968913c7edf69cf4bf228de39f Mon Sep 17 00:00:00 2001
From: Adriane Boyd <adrianeboyd@gmail.com>
Date: Tue, 26 Oct 2021 16:53:10 +0200
Subject: [PATCH 3/4] Address random results in slow readers tests (#9544)

* Set random seed for dataset shuffling
* Use more dev examples for non-zero scores
---
 spacy/tests/training/test_readers.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/spacy/tests/training/test_readers.py b/spacy/tests/training/test_readers.py
index f53660818..b7c5982b7 100644
--- a/spacy/tests/training/test_readers.py
+++ b/spacy/tests/training/test_readers.py
@@ -1,6 +1,6 @@
 from typing import Dict, Iterable, Callable
 import pytest
-from thinc.api import Config
+from thinc.api import Config, fix_random_seed
 from spacy import Language
 from spacy.util import load_model_from_config, registry, resolve_dot_names
 from spacy.schemas import ConfigSchemaTraining
@@ -64,8 +64,8 @@ def test_readers():
 @pytest.mark.parametrize(
     "reader,additional_config",
     [
-        ("ml_datasets.imdb_sentiment.v1", {"train_limit": 10, "dev_limit": 2}),
-        ("ml_datasets.dbpedia.v1", {"train_limit": 10, "dev_limit": 2}),
+        ("ml_datasets.imdb_sentiment.v1", {"train_limit": 10, "dev_limit": 10}),
+        ("ml_datasets.dbpedia.v1", {"train_limit": 10, "dev_limit": 10}),
         ("ml_datasets.cmu_movies.v1", {"limit": 10, "freq_cutoff": 200, "split": 0.8}),
     ],
 )
@@ -93,6 +93,7 @@ def test_cat_readers(reader, additional_config):
     factory = "textcat"
     """
     config = Config().from_str(nlp_config_string)
+    fix_random_seed(config["training"]["seed"])
     config["corpora"]["@readers"] = reader
     config["corpora"].update(additional_config)
     nlp = load_model_from_config(config, auto_fill=True)

From ebcc7d830f276ba0145550eee7d336ac0285c63e Mon Sep 17 00:00:00 2001
From: Adriane Boyd <adrianeboyd@gmail.com>
Date: Mon, 27 Sep 2021 20:04:02 +0200
Subject: [PATCH 4/4] Update slow readers test to use textcat_multilabel
 (#9300)

---
 spacy/tests/training/test_readers.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/spacy/tests/training/test_readers.py b/spacy/tests/training/test_readers.py
index b7c5982b7..e2c7a9111 100644
--- a/spacy/tests/training/test_readers.py
+++ b/spacy/tests/training/test_readers.py
@@ -82,15 +82,15 @@ def test_cat_readers(reader, additional_config):
 
     [nlp]
     lang = "en"
-    pipeline = ["tok2vec", "textcat"]
+    pipeline = ["tok2vec", "textcat_multilabel"]
 
     [components]
 
     [components.tok2vec]
     factory = "tok2vec"
 
-    [components.textcat]
-    factory = "textcat"
+    [components.textcat_multilabel]
+    factory = "textcat_multilabel"
     """
     config = Config().from_str(nlp_config_string)
     fix_random_seed(config["training"]["seed"])