Skip to content

Commit 38e7fbf

Browse files
authored
Merge branch 'master' into datatable_download
2 parents 1fa0f2c + a0f2035 commit 38e7fbf

File tree

4 files changed

+10
-4
lines changed

4 files changed

+10
-4
lines changed

mypy.ini

+7
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,13 @@ disallow_untyped_defs = True
33
show_error_codes = True
44
warn_unused_ignores = True
55

6+
# Temporarily allow implicit optional until pydantic handles JSON schema generation.
7+
# mypy >= 0.990 has changed its default to no_implicit_optional=True.
8+
# When removed - utilize the following make the code base implicit optional
9+
# type hints PEP 484 compliant:
10+
# https://github.com/hauntsaninja/no_implicit_optional
11+
implicit_optional = True
12+
613
# https://github.com/Azure/azure-sdk-for-python/issues/20771
714
[mypy-azure.storage.blob.*]
815
ignore_errors = True

setup.py

+1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ def get_long_description() -> str:
3030
"mypy",
3131
"pylint<=2.13.9", # Locked due to https://github.com/equinor/webviz-subsurface/issues/1052
3232
"pytest-xdist",
33+
"pytest-forked",
3334
"selenium",
3435
"types-bleach",
3536
"types-markdown",

webviz_config/_plugin_abc.py

+1-3
Original file line numberDiff line numberDiff line change
@@ -509,9 +509,7 @@ def plugin_layout(
509509
),
510510
screenshotFilename=self._screenshot_filename,
511511
feedbackUrl=self._make_feedback_url(),
512-
tourSteps=WebvizPluginABC._reformat_tour_steps(
513-
self.tour_steps # type: ignore[attr-defined]
514-
)
512+
tourSteps=WebvizPluginABC._reformat_tour_steps(self.tour_steps)
515513
if hasattr(self, "tour_steps")
516514
else None,
517515
stretch=self._stretch if self.views() else True,

webviz_config/webviz_store.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ def _undecorate(func: Callable) -> Callable:
112112
"""
113113

114114
while hasattr(func, "__wrapped__"):
115-
func = func.__wrapped__ # type: ignore[attr-defined]
115+
func = func.__wrapped__
116116

117117
return func
118118

0 commit comments

Comments
 (0)