Skip to content

Commit 5d980b3

Browse files
committed
Remove solved allowlist entries post merge
1 parent 72f5e8e commit 5d980b3

11 files changed

Lines changed: 812 additions & 630 deletions

File tree

pyproject.toml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,13 @@ disable_error_code = [
165165
"assignment", # 744 errors in 155 files
166166
]
167167

168+
[[tool.mypy.overrides]]
169+
# follow_untyped_imports = true will cause stubtest to run mypy on the source
170+
# So disable it for partial stubs
171+
module = ["sympy.*"]
172+
follow_untyped_imports = false
173+
disable_error_code = ["import-untyped", "misc"]
174+
168175
[[tool.mypy.overrides]]
169176
# These modules are to be removed soon, not worth solving many issues
170177
module = ["matplotlib.*", "networkx.*"]
@@ -173,7 +180,7 @@ disable_error_code = [
173180
"misc",
174181
]
175182
[[tool.mypy.overrides]]
176-
module = ["sympy.*", "skimage.*", "sklearn.*"]
183+
module = ["skimage.*", "sklearn.*"]
177184
# TODO: Too many untyped decorators still left
178185
# https://github.com/python/mypy/issues/19148
179186
disable_error_code = ["misc"]

stubs/skimage/stubtest_allowlist.txt

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -41,29 +41,8 @@ skimage.data
4141
skimage.data.binary_blobs
4242
skimage.data.cat
4343
skimage.data.data_dir
44-
skimage.data.hubble_deep_field
45-
skimage.data.human_mitosis
46-
skimage.data.immunohistochemistry
47-
skimage.data.kidney
48-
skimage.data.lbp_frontal_face_cascade_filename
49-
skimage.data.lfw_subset
50-
skimage.data.lily
51-
skimage.data.logo
52-
skimage.data.microaneurysms
53-
skimage.data.moon
54-
skimage.data.nickel_solidification
55-
skimage.data.page
56-
skimage.data.palisades_of_vogt
57-
skimage.data.protein_transport
58-
skimage.data.retina
59-
skimage.data.rocket
60-
skimage.data.shepp_logan_phantom
61-
skimage.data.skin
62-
skimage.data.stereo_motorcycle
6344
skimage.data.tests
6445
skimage.data.tests.test_data
65-
skimage.data.text
66-
skimage.data.vortex
6746
skimage.draw
6847
skimage.draw.__all__
6948
skimage.draw._bezier_segment
@@ -328,7 +307,6 @@ skimage.__lazy_dir__
328307
skimage._shared._dependency_checks.has_mpl
329308
skimage._shared._warnings.warn
330309
skimage._shared.lazy
331-
skimage._shared.setup
332310
skimage._shared.testing.SKIP_RE
333311
skimage._shared.testing.arch32
334312
skimage._shared.testing.fixture
@@ -346,7 +324,6 @@ skimage._shared.utils.warn
346324
skimage._shared.version_requirements.ensure_python_version
347325
skimage._typing
348326
skimage.data.__all__
349-
skimage.data.__dir__
350327
skimage.data._binary_blobs.binary_blobs
351328
skimage.data._fetchers.cat
352329
skimage.data._fetchers.create_image_fetcher
@@ -356,7 +333,6 @@ skimage.data._fetchers.legacy_data_dir
356333
skimage.data._fetchers.skimage_distribution_dir
357334
skimage.draw._random_shapes.SHAPE_CHOICES
358335
skimage.draw._random_shapes.SHAPE_GENERATORS
359-
skimage.draw.setup
360336
skimage.ensure_python_version
361337
skimage.feature.BRIEF.__init__
362338
skimage.feature.Cascade.detect_multi_scale
@@ -388,8 +364,6 @@ skimage.future.graph._ncut
388364
skimage.future.graph.graph_cut
389365
skimage.future.graph.graph_merge
390366
skimage.future.graph.rag
391-
skimage.future.graph.setup
392-
skimage.future.setup
393367
skimage.measure._find_contours._param_options
394368
skimage.measure._marching_cubes_classic
395369
skimage.measure._marching_cubes_lewiner.EDGETORELATIVEPOSX
@@ -472,7 +446,6 @@ skimage.measure.pnpoly.grid_points_in_poly
472446
skimage.measure.ransac
473447
skimage.measure.regionprops
474448
skimage.measure.regionprops_table
475-
skimage.measure.setup
476449
skimage.morphology._skeletonize.G123P_LUT
477450
skimage.morphology._skeletonize.G123_LUT
478451
skimage.morphology._skeletonize._eight_connect
@@ -503,12 +476,10 @@ skimage.morphology.misc.funcs
503476
skimage.morphology.octagon
504477
skimage.morphology.octahedron
505478
skimage.morphology.selem
506-
skimage.morphology.setup
507479
skimage.morphology.skeletonize_3d
508480
skimage.morphology.square
509481
skimage.scripts
510482
skimage.scripts.skivi
511-
skimage.setup
512483
skimage.submodules
513484
skimage.test
514485
skimage.transform.AffineTransform
@@ -547,5 +518,4 @@ skimage.transform.hough_transform.hough_circle_peaks
547518
skimage.transform.hough_transform.hough_line_peaks
548519
skimage.transform.hough_transform.probabilistic_hough_line
549520
skimage.transform.probabilistic_hough_line
550-
skimage.transform.setup
551521
skimage.transform.warp

stubs/sklearn/stubtest_allowlist.txt

Lines changed: 25 additions & 543 deletions
Large diffs are not rendered by default.

stubs/sklearn/utils/_metadata_requests.pyi

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,15 @@ class RequestMethod:
7070
def __get__(self, instance, owner): ...
7171

7272
class _MetadataRequester:
73+
def __init_subclass__(cls, **kwargs): ...
74+
def get_metadata_routing(self): ...
75+
# This code is never run in runtime, but it's here for type checking.
76+
# Type checkers fail to understand that the `set_{method}_request`
77+
# methods are dynamically generated, and they complain that they are
78+
# not defined. We define them here to make type checkers happy.
79+
# During type checking analyzers assume this to be True.
80+
# The following list of defined methods mirrors the list of methods
81+
# in SIMPLE_METHODS.
7382
def set_fit_request(self, **kwargs): ...
7483
def set_partial_fit_request(self, **kwargs): ...
7584
def set_predict_request(self, **kwargs): ...
@@ -80,7 +89,5 @@ class _MetadataRequester:
8089
def set_split_request(self, **kwargs): ...
8190
def set_transform_request(self, **kwargs): ...
8291
def set_inverse_transform_request(self, **kwargs): ...
83-
def __init_subclass__(cls, **kwargs): ...
84-
def get_metadata_routing(self): ...
8592

8693
def process_routing(_obj, _method, /, **kwargs): ...

stubs/sympy-stubs/core/function.pyi

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,10 @@ class Function(Application, Expr):
5858
def as_base_exp(self) -> tuple[Self, Any]: ...
5959
def fdiff(self, argindex=...) -> ArrayDerivative | Derivative | Subs: ...
6060

61+
class DefinedFunction(Function):
62+
@cacheit
63+
def __new__(cls, *args, **options) -> Expr: ...
64+
6165
class AppliedUndef(Function):
6266
is_number = ...
6367
def __new__(cls, *args, **options) -> type[UndefinedFunction]: ...

0 commit comments

Comments
 (0)