Type annotate main.py and some parts related to collection #6556

bluetech · 2020-01-24T12:06:40Z

~~Depends on #6547 and #6555 (and includes them until merged).~~

This adds type annotations to main.py. To do this, I needed to feel in some blanks in other parts, mostly related to collection.

It took some effort to untangle but I think I got it mostly right...

bluetech

Left comments on where I needed to make code changes, for greater scrutiny.

bluetech · 2020-01-24T12:09:54Z

src/_pytest/main.py

            m = self.matchnodes(col, names)
            # If __init__.py was the only file requested, then the matched node will be
            # the corresponding Package, and the first yielded item will be the __init__
            # Module itself, so just use that. If this special case isn't taken, then all
            # the files in the package will be yielded.
            if argpath.basename == "__init__.py":
+                assert isinstance(m[0], nodes.Collector)


Needed to add an assert here (can also be a nodes.Item), but seems safe given it should be a Package and .collect() is called just below.

bluetech · 2020-01-24T12:11:47Z

src/_pytest/main.py

                try:
-                    yield next(m[0].collect())
+                    yield next(iter(m[0].collect()))


Needed to add iter() here because I made the official type of collect() be Iterable and not Iterator (which isn't the case for all implementations). Calling iter() on an iterator should just be idempotent, so I think it's safe.

bluetech · 2020-01-24T12:12:37Z

src/_pytest/main.py

@@ -651,30 +715,32 @@ def _tryconvertpyarg(self, x):
        # ValueError: not a module name
        except (AttributeError, ImportError, ValueError):
            return x
-        if spec is None or spec.origin in {None, "namespace"}:
+        if spec is None or spec.origin is None or spec.origin == "namespace":


Had to split it because mypy doesn't handle in {None} for type narrowing.

src/_pytest/python.py

bluetech · 2020-01-24T12:14:52Z

src/_pytest/python.py

        if not safe_getattr(self.obj, "__test__", True):
            return []
        if hasinit(self.obj):
+            assert self.parent is not None


This assert and below should be safe since dereferenced just below.

bluetech · 2020-01-24T12:16:17Z

src/_pytest/main.py

@@ -391,22 +412,30 @@ class Session(nodes.FSCollector):
    _setupstate = None  # type: SetupState
    # Set on the session by fixtures.pytest_sessionstart.
    _fixturemanager = None  # type: FixtureManager
+    exitstatus = None  # type: Union[int, ExitCode]


Didn't find any place which does hasattr('exitstatus') or such, so I think this is safe.

It's still kind of an API change.
But I also think it is good to have it being set always.

bluetech · 2020-01-24T12:16:56Z

src/_pytest/main.py

                # we are inside a make_report hook so
                # we cannot directly pass through the exception
-                self._notfound.append((report_arg, sys.exc_info()[1]))
+                exc = cast(NoMatch, sys.exc_info()[1])


I don't really follow the comment above. I think this cast is correct...

src/_pytest/doctest.py

src/_pytest/hookspec.py

src/_pytest/main.py

blueyed · 2020-01-24T16:38:19Z

src/_pytest/main.py

@@ -391,22 +412,30 @@ class Session(nodes.FSCollector):
    _setupstate = None  # type: SetupState
    # Set on the session by fixtures.pytest_sessionstart.
    _fixturemanager = None  # type: FixtureManager
+    exitstatus = None  # type: Union[int, ExitCode]


It's still kind of an API change.
But I also think it is good to have it being set always.

src/_pytest/unittest.py

src/_pytest/main.py

bluetech · 2020-01-25T15:16:47Z

Addressed (some) comments and rebased on features. This is still blocked.

Zac-HD

Thanks @bluetech! Comments below, but before all of that thanks: we really appreciate your work on this 😁

src/_pytest/doctest.py

src/_pytest/main.py

src/_pytest/unittest.py

Taken out of pytest-dev#6556.

src/_pytest/hookspec.py

Taken out of pytest-dev#6556.

Pulled out of pytest-dev#6556.

bluetech · 2020-02-12T15:15:32Z

Rebased on master 😁

bluetech · 2020-02-28T11:54:52Z

Maintaining all of these open PRs is too annoying and spammy. I'm going to close them and maintain just a single typing branch (with clean separate commits) in my repo, and occasionally add commits and rebase it on master. Maybe one day it can be merged, or cherry-picked from.

bluetech commented Jan 24, 2020

View reviewed changes

blueyed reviewed Jan 24, 2020

View reviewed changes

nicoddemus reviewed Jan 24, 2020

View reviewed changes

src/_pytest/main.py Outdated Show resolved Hide resolved

This comment has been minimized.

Sign in to view

bluetech force-pushed the type-annotations-11 branch from 5c1256f to 49f830d Compare January 25, 2020 15:15

bluetech changed the base branch from master to features January 25, 2020 15:16

Zac-HD reviewed Jan 27, 2020

View reviewed changes

blueyed pushed a commit to blueyed/pytest that referenced this pull request Jan 27, 2020

typing: FSHookProxy/gethookproxy

ae5d16b

Taken out of pytest-dev#6556.

blueyed reviewed Jan 27, 2020

View reviewed changes

src/_pytest/hookspec.py Show resolved Hide resolved

bluetech mentioned this pull request Jan 28, 2020

Split Session._collection_node_cache to 3 mutually exclusive parts #6555

Merged

blueyed mentioned this pull request Jan 28, 2020

typing: pytest_collection #6601

Merged

blueyed pushed a commit to blueyed/pytest that referenced this pull request Jan 28, 2020

typing: FSHookProxy/gethookproxy

7567754

Taken out of pytest-dev#6556.

blueyed pushed a commit to blueyed/pytest that referenced this pull request Jan 28, 2020

typing: FSHookProxy/gethookproxy

47581b2

Taken out of pytest-dev#6556.

bluetech force-pushed the type-annotations-11 branch from 49f830d to eb648ab Compare January 28, 2020 20:51

blueyed pushed a commit to blueyed/pytest that referenced this pull request Jan 28, 2020

typing: FSHookProxy/gethookproxy

a397604

Taken out of pytest-dev#6556.

blueyed pushed a commit to blueyed/pytest that referenced this pull request Jan 29, 2020

typing: FSHookProxy/gethookproxy

433dcfa

Taken out of pytest-dev#6556.

blueyed pushed a commit to blueyed/pytest that referenced this pull request Feb 2, 2020

typing: wrap_session

10074a0

Pulled out of pytest-dev#6556.

blueyed mentioned this pull request Feb 2, 2020

Handle Exit exception in pytest_sessionfinish #6660

Merged

blueyed pushed a commit to blueyed/pytest that referenced this pull request Feb 2, 2020

typing: wrap_session

8bd612b

Pulled out of pytest-dev#6556.

bluetech force-pushed the type-annotations-11 branch from eb648ab to 8430b21 Compare February 8, 2020 11:38

This comment has been minimized.

Sign in to view

bluetech force-pushed the type-annotations-11 branch 2 times, most recently from f1e712f to bde54d1 Compare February 12, 2020 15:13

bluetech changed the base branch from features to master February 12, 2020 15:13

bluetech mentioned this pull request Feb 12, 2020

WIP: An assortment of type annotations #6717

Closed

Type annotate main.py and some parts related to collection

abdd513

bluetech force-pushed the type-annotations-11 branch from bde54d1 to abdd513 Compare February 13, 2020 10:04

bluetech closed this Feb 28, 2020

bluetech deleted the type-annotations-11 branch February 28, 2020 12:08

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Type annotate main.py and some parts related to collection #6556

Type annotate main.py and some parts related to collection #6556

bluetech commented Jan 24, 2020 •

edited

Loading

bluetech left a comment

bluetech Jan 24, 2020

bluetech Jan 24, 2020

bluetech Jan 24, 2020

bluetech Jan 24, 2020

bluetech Jan 24, 2020

blueyed Jan 24, 2020

bluetech Jan 24, 2020

blueyed Jan 24, 2020

This comment has been minimized.

bluetech commented Jan 25, 2020

Zac-HD left a comment

This comment has been minimized.

bluetech commented Feb 12, 2020

bluetech commented Feb 28, 2020

Type annotate main.py and some parts related to collection #6556

Type annotate main.py and some parts related to collection #6556

Conversation

bluetech commented Jan 24, 2020 • edited Loading

bluetech left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

This comment has been minimized.

bluetech commented Jan 25, 2020

Zac-HD left a comment

Choose a reason for hiding this comment

This comment has been minimized.

bluetech commented Feb 12, 2020

bluetech commented Feb 28, 2020

bluetech commented Jan 24, 2020 •

edited

Loading