diff --git a/spacy/__init__.py b/spacy/__init__.py index da43003df5..cd3fa2eeba 100644 --- a/spacy/__init__.py +++ b/spacy/__init__.py @@ -8,17 +8,22 @@ 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 .language import Language +from .glossary import explain as explain +from .language import Language as 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} diff --git a/spacy/tests/test_ty.py b/spacy/tests/test_ty.py index 2037520dfe..a017f93947 100644 --- a/spacy/tests/test_ty.py +++ b/spacy/tests/test_ty.py @@ -1,7 +1,38 @@ +import pytest + import spacy from spacy import ty +@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, Language, explain, info, prefer_gpu, registry, require_cpu, require_gpu\n" + "spacy.prefer_gpu()\n", + encoding="utf8", + ) + stdout, stderr, status = mypy.run( + [ + "--strict", + "--no-implicit-reexport", + "--follow-imports=silent", + "--ignore-missing-imports", + "--config-file", + str(config), + "--cache-dir", + str(tmp_path / ".mypy_cache"), + str(consumer), + ] + ) + assert status == 0, stdout + stderr + + def test_component_types(): nlp = spacy.blank("en") tok2vec = nlp.create_pipe("tok2vec")