From e48a7c9c567f4446107866dbc74af36cd2fa710e Mon Sep 17 00:00:00 2001 From: Behzad Motaghi Date: Wed, 11 Nov 2026 19:36:03 +0100 Subject: [PATCH 1/4] test: reproduce strict top-level re-exports (#13246) --- spacy/tests/test_ty.py | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/spacy/tests/test_ty.py b/spacy/tests/test_ty.py index 2037520dfe5..cef832fc7ef 100644 --- a/spacy/tests/test_ty.py +++ b/spacy/tests/test_ty.py @@ -1,7 +1,41 @@ +import pytest + import spacy from spacy import ty +@pytest.mark.issue(13246) +def test_issue13246(tmp_path): + mypy = pytest.importorskip("mypy.api") + config = tmp_path / "mypy.ini" + config.write_text("[mypy]\nfollow_imports_for_stubs = True\n", encoding="utf8") + consumer = tmp_path / "consumer.py" + consumer.write_text( + "import spacy\n" + "from spacy import Config, explain, info, prefer_gpu, registry, require_cpu, require_gpu\n" + "config: Config = spacy.Config()\n" + "using_gpu: bool = spacy.prefer_gpu()\n" + "using_cpu: bool = spacy.require_cpu()\n" + "gpu_required: bool = spacy.require_gpu()\n" + "spacy.info(silent=True)\n" + "spacy.explain\n" + "spacy.registry.languages.get_all()\n", + encoding="utf8", + ) + stdout, stderr, status = mypy.run( + [ + "--strict", + "--no-implicit-reexport", + "--follow-imports=silent", + "--ignore-missing-imports", + "--config-file", + str(config), + str(consumer), + ] + ) + assert status == 0, stdout + stderr + + def test_component_types(): nlp = spacy.blank("en") tok2vec = nlp.create_pipe("tok2vec") From 2ab6f491f2404bf1b44da5b3b64d44e578e2d74e Mon Sep 17 00:00:00 2001 From: Behzad Motaghi Date: Wed, 11 Nov 2026 19:36:52 +0100 Subject: [PATCH 2/4] fix: explicitly re-export documented top-level helpers (#13246) --- spacy/__init__.py | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/spacy/__init__.py b/spacy/__init__.py index da43003df58..6b6dfd9cee0 100644 --- a/spacy/__init__.py +++ b/spacy/__init__.py @@ -8,16 +8,21 @@ setup_default_warnings() # noqa: E402 # These are imported as part of the API -from thinc.api import Config, prefer_gpu, require_cpu, require_gpu # noqa: F401 +from thinc.api import ( + Config as Config, + prefer_gpu as prefer_gpu, + require_cpu as require_cpu, + require_gpu as require_gpu, +) from . import ( pipeline, # noqa: F401 util, ) from .about import __version__ # noqa: F401 -from .cli.info import info # noqa: F401 +from .cli.info import info as info from .errors import Errors -from .glossary import explain # noqa: F401 +from .glossary import explain as explain from .language import Language from .pipeline.factories import register_factories from .registrations import populate_registry @@ -31,7 +36,10 @@ ConfigSchemaTraining, ) from .training import Example # noqa: F401 -from .util import logger, registry # noqa: F401 +from .util import ( + logger, # noqa: F401 + registry as registry, +) from .vocab import Vocab _rebuild_ns = {"Language": Language, "Vocab": Vocab, "Example": Example} From f62cb76cfd8cd13d9379e348f8985018546ae780 Mon Sep 17 00:00:00 2001 From: Behzad Motaghi Date: Wed, 11 Nov 2026 19:56:06 +0100 Subject: [PATCH 3/4] Explicitly export Language and isolate the mypy regression cache (#13246) --- spacy/__init__.py | 2 +- spacy/tests/test_ty.py | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/spacy/__init__.py b/spacy/__init__.py index 6b6dfd9cee0..cd3fa2eeba9 100644 --- a/spacy/__init__.py +++ b/spacy/__init__.py @@ -23,7 +23,7 @@ from .cli.info import info as info from .errors import Errors from .glossary import explain as explain -from .language import Language +from .language import Language as Language from .pipeline.factories import register_factories from .registrations import populate_registry diff --git a/spacy/tests/test_ty.py b/spacy/tests/test_ty.py index cef832fc7ef..5e11619eddd 100644 --- a/spacy/tests/test_ty.py +++ b/spacy/tests/test_ty.py @@ -7,12 +7,13 @@ @pytest.mark.issue(13246) def test_issue13246(tmp_path): mypy = pytest.importorskip("mypy.api") + # Apply silent import following to stubs too, so only consumer errors are reported. config = tmp_path / "mypy.ini" config.write_text("[mypy]\nfollow_imports_for_stubs = True\n", encoding="utf8") consumer = tmp_path / "consumer.py" consumer.write_text( "import spacy\n" - "from spacy import Config, explain, info, prefer_gpu, registry, require_cpu, require_gpu\n" + "from spacy import Config, Language, explain, info, prefer_gpu, registry, require_cpu, require_gpu\n" "config: Config = spacy.Config()\n" "using_gpu: bool = spacy.prefer_gpu()\n" "using_cpu: bool = spacy.require_cpu()\n" @@ -30,6 +31,8 @@ def test_issue13246(tmp_path): "--ignore-missing-imports", "--config-file", str(config), + "--cache-dir", + str(tmp_path / ".mypy_cache"), str(consumer), ] ) From 68b296aa63ebddaeaa39d7f3652b0291db96de0e Mon Sep 17 00:00:00 2001 From: Behzad Motaghi Date: Thu, 12 Nov 2026 07:38:06 +0100 Subject: [PATCH 4/4] Trim the strict export regression consumer (#13246) --- spacy/tests/test_ty.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/spacy/tests/test_ty.py b/spacy/tests/test_ty.py index 5e11619eddd..a017f939475 100644 --- a/spacy/tests/test_ty.py +++ b/spacy/tests/test_ty.py @@ -14,13 +14,7 @@ def test_issue13246(tmp_path): consumer.write_text( "import spacy\n" "from spacy import Config, Language, explain, info, prefer_gpu, registry, require_cpu, require_gpu\n" - "config: Config = spacy.Config()\n" - "using_gpu: bool = spacy.prefer_gpu()\n" - "using_cpu: bool = spacy.require_cpu()\n" - "gpu_required: bool = spacy.require_gpu()\n" - "spacy.info(silent=True)\n" - "spacy.explain\n" - "spacy.registry.languages.get_all()\n", + "spacy.prefer_gpu()\n", encoding="utf8", ) stdout, stderr, status = mypy.run(