Movatterモバイル変換

Skip to content

python/cpythonPublic

NotificationsYou must be signed in to change notification settings
Fork32k
Star67.3k

gh-104050: Run mypy on`clinic.py` in CI#104421

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged

AlexWaygood merged 16 commits intopython:mainfromAlexWaygood:clinic-mypy-check

May 15, 2023

Merged

gh-104050: Run mypy on`clinic.py` in CI#104421

AlexWaygood merged 16 commits intopython:mainfromAlexWaygood:clinic-mypy-check

May 15, 2023

Conversation

AlexWaygood

Copy link

Member

AlexWaygood commentedMay 12, 2023•
edited
Loading

Add a basic mypy check toclinic.py in CI (and add some initial type annotations, so that the mypy check passes).

The check will run:

On pushes tomain
On pull requests that touch files in theTools/clinic directory, and pull requests that touch the workflow file itself
When contributors manually request a workflow on their fork, viaworkflow_dispatch.

When itdoes run, mypy will only check files insideTools/clinic/. All other files will be excluded from the mypy check in CI.

The mypy configuration is also deliberately lax, to begin with: only a few of the stricter settings are enabled. This will allow us to make use of "gradual typing": mypy will only check functions insideTools/clinic/ that we've added annotations to. It will assume all other functions are to be ignored by mypy, for now; we will therefore be able to gradually increase the level of type annotations inside this directory.

Issue:Add type annotations to clinic.py #104050

erlend-aaslandand others added6 commits

May 1, 2023 18:37

@erlend-aasland

Slightly annotate cpp.py

ca8532b

@erlend-aasland

Slightly annotate clinic.py

d2ec2ef

@erlend-aasland

Address review

801af38

- ditch no-return- use callable from collections.abc- use namedtuple from typing

@AlexWaygood

Add basic mypy workflow to CI

00183ff

@AlexWaygood

Make the type check pass

4bdd409

@AlexWaygood

Tweak workflow file

632843b

@AlexWaygood

AlexWaygood requested a review fromerlend-aasland

May 12, 2023 12:38

@AlexWaygood

AlexWaygood requested review fromezio-melotti andhugovk ascode owners

May 12, 2023 12:39

@bedevere-bot

bedevere-bot added the awaiting core review label

@bedevere-bot

bedevere-bot mentioned this pull request

Add type annotations to clinic.py#104050

Closed

@AlexWaygood

AlexWaygood added the skip news label

AlexWaygood

AlexWaygood commented

View reviewed changes

Tools/clinic/mypy.ini

Copy link

MemberAuthor

AlexWaygoodMay 12, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

I usually put my mypy config in apyproject.toml file these days, but amypy.ini file feels like it makes more "sense" unless we're planning on adding other linters/formatters to checkclinic.py in the future

AlexWaygood

AlexWaygood commented

View reviewed changes

.github/workflows/mypy-clinic.yml OutdatedShow resolvedHide resolved

@AlexWaygood

improve workflow file

f7e7a25

JelleZijlstra

JelleZijlstra reviewed

View reviewed changes

Tools/clinic/clinic.py OutdatedShow resolvedHide resolved

sobolevn

sobolevn reviewed

View reviewed changes

.github/workflows/mypy-clinic.yml OutdatedShow resolvedHide resolved

Tools/clinic/clinic.pyShow resolvedHide resolved

Tools/clinic/clinic.pyShow resolvedHide resolved

Tools/clinic/cpp.py OutdatedShow resolvedHide resolved

Tools/clinic/cpp.py OutdatedShow resolvedHide resolved

Tools/clinic/cpp.py OutdatedShow resolvedHide resolved

hugovk

hugovk reviewed

View reviewed changes

.github/workflows/mypy-clinic.yml OutdatedShow resolvedHide resolved

.github/workflows/mypy-clinic.yml OutdatedShow resolvedHide resolved

Tools/clinic/clinic.pyShow resolvedHide resolved

.github/workflows/mypy-clinic.yml OutdatedShow resolvedHide resolved

AlexWaygoodand others added3 commits

May 12, 2023 14:18

@AlexWaygood

@sobolevn

Add some more return annotations

510e08b

Co-authored-by: Nikita Sobolev <mail@sobolevn.me>

@AlexWaygood

@hugovk

simpler glob

773c2ba

Co-authored-by: Hugo van Kemenade <hugovk@users.noreply.github.com>

@AlexWaygood

Address various reviews!

6c7ecb9

@AlexWaygood

AlexWaygood requested review fromJelleZijlstra andhugovk

May 12, 2023 13:37

hugovk

hugovk reviewed

View reviewed changes

.github/workflows/mypy.yml OutdatedShow resolvedHide resolved

.github/workflows/mypy.yml OutdatedShow resolvedHide resolved

Tools/clinic/requirements-dev.txt OutdatedShow resolvedHide resolved

@AlexWaygood

@hugovk

more from Hugo

717ee47

Co-authored-by: Hugo van Kemenade <hugovk@users.noreply.github.com>

AlexWaygood

AlexWaygood commented

View reviewed changes

Tools/clinic/requirements-dev.txt

		@@ -0,0 +1,2 @@
		# Requirements file for external linters and checks we run on Tools/clinic/ in CI
		mypy==1.2.0

Copy link

MemberAuthor

AlexWaygoodMay 12, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

We're deliberately pinning to an older version here, in order to test that dependabot updates are working on this file, as per@hugovk's suggestion in#104421 (comment)

@AlexWaygood

Fix ini syntax

62669d1

@AlexWaygood

AlexWaygood mentioned this pull request

GH-86275: Implementation of hypothesis stubs for property-based tests, with zoneinfo tests#22863

Merged

hugovk

hugovk approved these changes

View reviewed changes

Copy link

Member

hugovk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

CI changes look good 👍

@bedevere-bot

bedevere-bot removed the awaiting core review label

@bedevere-bot

bedevere-bot added the awaiting merge label

AlexWaygood

AlexWaygood commented

View reviewed changes

Tools/clinic/cpp.py OutdatedShow resolvedHide resolved

@AlexWaygood

Unused import

ddd0843

@AlexWaygood

Copy link

MemberAuthor

AlexWaygood commentedMay 12, 2023•
edited
Loading

(Thetest_zoneinfo failure is obviously unrelated.)

Edit: As is thetest_threading failure.

@AlexWaygood

Merge branch 'main' into clinic-mypy-check

b7158db

JelleZijlstra

JelleZijlstra reviewed

View reviewed changes

Tools/clinic/mypy.iniShow resolvedHide resolved

AlexWaygood added2 commits

May 13, 2023 12:19

@AlexWaygood

Restore compatibility with Python 3.8

9fcd87f

@AlexWaygood

Revert "Restore compatibility with Python 3.8"

010f0dd

This reverts commit9fcd87f.

erlend-aasland

erlend-aasland approved these changes

View reviewed changes

Copy link

Contributor

erlend-aasland left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

LGTM. Thanks!

@AlexWaygood

Copy link

MemberAuthor

AlexWaygood commentedMay 15, 2023

LGTM. Thanks!

Very happy to help!

@AlexWaygood

AlexWaygoodenabled auto-merge (squash)

May 15, 2023 08:29

@AlexWaygood

AlexWaygood merged commit9d41f83 intopython:main

@bedevere-bot

bedevere-bot removed the awaiting merge label

@sobolevn

sobolevn mentioned this pull request

Runmypy oncases_generator#104504

Closed

@AlexWaygood

AlexWaygood deleted the clinic-mypy-check branch

May 15, 2023 10:22

carljm added a commit to carljm/cpython that referenced this pull request

@carljm

Merge branch 'main' into supermon

343867a

* main: (29 commits)pythongh-101819: Fix _io clinic input for unused base class method stubs (python#104418)pythongh-101819: Isolate `_io` (python#101948)  Bump mypy from 1.2.0 to 1.3.0 in /Tools/clinic (python#104501)pythongh-104494: Update certain Tkinter pack/place tests for Tk 8.7 errors (python#104495)pythongh-104050: Run mypy on `clinic.py` in CI (python#104421)pythongh-104490: Consistently define phony make targets (python#104491)pythongh-67056: document that registering/unregistering an atexit func from within an atexit func is undefined (python#104473)pythongh-104487: PYTHON_FOR_REGEN must be minimum Python 3.10 (python#104488)pythongh-101282: move BOLT config after PGO (pythongh-104493)pythongh-104469 Convert _testcapi/float.c to use AC (pythongh-104470)pythongh-104456: Fix ref leak in _ctypes.COMError (python#104457)pythongh-98539: Make _SSLTransportProtocol.abort() safe to call when closed (python#104474)pythongh-104337: Clarify random.gammavariate doc entry  (python#104410)  Minor improvements to typing docs (python#104465)pythongh-87092: avoid gcc warning on uninitialized struct field in assemble.c (python#104460)pythonGH-71383: IDLE - Document testing subsets of modules (python#104463)pythongh-104454: Fix refleak in AttributeError_reduce (python#104455)pythongh-75710: IDLE - add docstrings and comments to editor module (python#104446)pythongh-91896: Revert some very noisy DeprecationWarnings for `ByteString` (python#104424)  Add a mention of PYTHONBREAKPOINT to breakpoint() docs (python#104430)  ...

carljm added a commit to carljm/cpython that referenced this pull request

@carljm

Merge branch 'main' into cached_property_docs

452d9f5

* main: (204 commits)pythongh-101819: Fix _io clinic input for unused base class method stubs (python#104418)pythongh-101819: Isolate `_io` (python#101948)  Bump mypy from 1.2.0 to 1.3.0 in /Tools/clinic (python#104501)pythongh-104494: Update certain Tkinter pack/place tests for Tk 8.7 errors (python#104495)pythongh-104050: Run mypy on `clinic.py` in CI (python#104421)pythongh-104490: Consistently define phony make targets (python#104491)pythongh-67056: document that registering/unregistering an atexit func from within an atexit func is undefined (python#104473)pythongh-104487: PYTHON_FOR_REGEN must be minimum Python 3.10 (python#104488)pythongh-101282: move BOLT config after PGO (pythongh-104493)pythongh-104469 Convert _testcapi/float.c to use AC (pythongh-104470)pythongh-104456: Fix ref leak in _ctypes.COMError (python#104457)pythongh-98539: Make _SSLTransportProtocol.abort() safe to call when closed (python#104474)pythongh-104337: Clarify random.gammavariate doc entry  (python#104410)  Minor improvements to typing docs (python#104465)pythongh-87092: avoid gcc warning on uninitialized struct field in assemble.c (python#104460)pythonGH-71383: IDLE - Document testing subsets of modules (python#104463)pythongh-104454: Fix refleak in AttributeError_reduce (python#104455)pythongh-75710: IDLE - add docstrings and comments to editor module (python#104446)pythongh-91896: Revert some very noisy DeprecationWarnings for `ByteString` (python#104424)  Add a mention of PYTHONBREAKPOINT to breakpoint() docs (python#104430)  ...

erlend-aasland

erlend-aasland reviewed

View reviewed changes

Tools/clinic/clinic.py

		@@ -2558,15 +2570,15 @@ class CConverter(metaclass=CConverterAutoRegister):
		"""

		# The C name to use for this variable.
		name = None
		name: str \| None = None

Copy link

Contributor

erlend-aaslandMay 16, 2023•
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

So, thesestr | None are now starting to cause frustrations, as I gradually add typing to other parts of clinic.py. Since there are no guards anywhere, I obviously get errors and warnings aboutstr plusNone, etc. Wecould change the defaults to the empty string, but that can also create a lot of havoc.

Sign up for freeto join this conversation on GitHub. Already have an account?Sign in to comment

Labels

6 participants

@AlexWaygood

@JelleZijlstra

@hugovk

@sobolevn

@erlend-aasland

@bedevere-bot

[8]ページ先頭

©2009-2025 Movatter.jp