Skip to content
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.

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

Already on GitHub? Sign in to your account

Minors fixes 3.0.0rc2 #3164

Merged
merged 6 commits into from
Feb 13, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {DateRangePicker} from 'react-dates';
import React, {Component} from 'react';
import uniqid from 'uniqid';

import {propTypes, defaultProps} from '../components/DatePickerRange.react';
import {propTypes} from '../components/DatePickerRange.react';
import convertToMoment from '../utils/convertToMoment';
import LoadingElement from '../utils/LoadingElement';

Expand Down Expand Up @@ -219,4 +219,3 @@ export default class DatePickerRange extends Component {
}

DatePickerRange.propTypes = propTypes;
DatePickerRange.defaultProps = defaultProps;
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {SingleDatePicker} from 'react-dates';
import moment from 'moment';
import React, {Component} from 'react';

import {propTypes, defaultProps} from '../components/DatePickerSingle.react';
import {propTypes} from '../components/DatePickerSingle.react';
import convertToMoment from '../utils/convertToMoment';
import LoadingElement from '../utils/LoadingElement';

Expand Down Expand Up @@ -155,4 +155,3 @@ export default class DatePickerSingle extends Component {
}

DatePickerSingle.propTypes = propTypes;
DatePickerSingle.defaultProps = defaultProps;
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import RemarkMath from 'remark-math';

import Math from './Math.react';
import MarkdownHighlighter from '../utils/MarkdownHighlighter';
import {propTypes, defaultProps} from '../components/Markdown.react';
import {propTypes} from '../components/Markdown.react';

import DccLink from './../components/Link.react';
import LoadingElement from '../utils/LoadingElement';
Expand Down Expand Up @@ -187,4 +187,3 @@ export default class DashMarkdown extends Component {
}

DashMarkdown.propTypes = propTypes;
DashMarkdown.defaultProps = defaultProps;
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {
calcStep,
setUndefined,
} from '../utils/computeSliderMarkers';
import {propTypes, defaultProps} from '../components/RangeSlider.react';
import {propTypes} from '../components/RangeSlider.react';
import {
formatSliderTooltip,
transformSliderTooltip,
Expand Down Expand Up @@ -152,4 +152,3 @@ export default class RangeSlider extends Component {
}

RangeSlider.propTypes = propTypes;
RangeSlider.defaultProps = defaultProps;
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {
calcStep,
setUndefined,
} from '../utils/computeSliderMarkers';
import {propTypes, defaultProps} from '../components/Slider.react';
import {propTypes} from '../components/Slider.react';
import {
formatSliderTooltip,
transformSliderTooltip,
Expand Down Expand Up @@ -152,4 +152,3 @@ export default class Slider extends Component {
}

Slider.propTypes = propTypes;
Slider.defaultProps = defaultProps;
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, {Component} from 'react';
import Dropzone from 'react-dropzone';

import {propTypes, defaultProps} from '../components/Upload.react';
import {propTypes} from '../components/Upload.react';
import LoadingElement from '../utils/LoadingElement';

export default class Upload extends Component {
Expand Down Expand Up @@ -91,4 +91,3 @@ export default class Upload extends Component {
}

Upload.propTypes = propTypes;
Upload.defaultProps = defaultProps;
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
from selenium.webdriver.support.ui import WebDriverWait
from selenium.webdriver.support import expected_conditions as EC

from flaky import flaky


@pytest.mark.parametrize("is_eager", [True, False])
def test_grva001_candlestick(dash_dcc, is_eager):
Expand Down Expand Up @@ -681,6 +683,7 @@ def load_chart(n_clicks):
assert dash_dcc.get_logs() == []


@flaky(max_runs=3)
def test_grva008_shapes_not_lost(dash_dcc):
# See issue #879 and pr #905
app = Dash(__name__)
Expand Down
2 changes: 2 additions & 0 deletions components/dash-table/tests/selenium/test_navigation.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
from selenium.webdriver.common.keys import Keys

import pytest
import flaky

DATA_SIZE = 50

Expand Down Expand Up @@ -154,6 +155,7 @@ def test_navg002_keyboard_after_ctrl_copy(test, props):
assert test.get_log_errors() == []


@flaky.flaky(max_runs=3)
@pytest.mark.parametrize("props", [get_markdown_table(), get_mixed_markdown_table()])
@pytest.mark.parametrize(
"key,row,col",
Expand Down
2 changes: 2 additions & 0 deletions dash/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ def _jupyter_nbextension_paths():
"Input",
"Output",
"State",
"clientside_callback",
"ClientsideFunction",
"MATCH",
"ALLSMALLER",
Expand Down Expand Up @@ -88,4 +89,5 @@ def _jupyter_nbextension_paths():
"Patch",
"jupyter_dash",
"ctx",
"hooks",
]
4 changes: 2 additions & 2 deletions dash/_callback.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,10 @@ def callback(
*_args,
background: bool = False,
interval: int = 1000,
progress: Optional[Output] = None,
progress: Optional[Union[List[Output], Output]] = None,
progress_default: Any = None,
running: Optional[List[Tuple[Output, Any, Any]]] = None,
cancel: Optional[List[Input]] = None,
cancel: Optional[Union[List[Input], Input]] = None,
manager: Optional[BaseBackgroundCallbackManager] = None,
cache_args_to_ignore: Optional[list] = None,
on_error: Optional[Callable[[Exception], Any]] = None,
Expand Down
6 changes: 5 additions & 1 deletion tests/integration/multi_page/test_pages_relative_path.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,11 @@ def test_pare001_relative_path(dash_duo, clear_pages_state):
for page in dash.page_registry.values():
dash_duo.find_element("#" + page["id"]).click()
dash_duo.wait_for_text_to_equal("#text_" + page["id"], "text for " + page["id"])
assert dash_duo.driver.title == page["title"], "check that page title updates"
dash_duo._wait_for(
lambda _: dash_duo.driver.title == page["title"],
msg="check that page title updates",
timeout=3,
)

assert dash_duo.get_logs() == [], "browser console should contain no error"

Expand Down