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

Bump Dash version to 2.0 #161

Merged
merged 1 commit into from
Sep 13, 2021
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
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [UNRELEASED] - YYYY-MM-DD

### Changed
- [#161](https://github.com/equinor/webviz-core-components/pull/161) - Updated to `Dash 2.0`.

### Fixed

- [#157](https://github.com/equinor/webviz-core-components/pull/157) - Added utf8 encoding to Python's open() calls.
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
.replace("@", "")
)

INSTALL_REQUIRES = ["dash>=1.6"]
INSTALL_REQUIRES = ["dash>=2.0"]

TESTS_REQUIRE = ["selenium", "pylint", "black>=20.8b1", "bandit"]

Expand Down
5 changes: 2 additions & 3 deletions tests/test_color_scales.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,13 @@
#
##################################################################

import dash
import dash_html_components as html
from dash import html, Dash
import webviz_core_components


def test_colorscale(dash_duo):

app = dash.Dash(__name__)
app = Dash(__name__)

app.layout = html.Div(
[
Expand Down
5 changes: 2 additions & 3 deletions tests/test_graph.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,13 @@
#
##################################################################

import dash
import dash_html_components as html
from dash import html, Dash
import webviz_core_components


def test_container_placeholder(dash_duo):

app = dash.Dash(__name__)
app = Dash(__name__)

app.layout = html.Div(
[
Expand Down
5 changes: 2 additions & 3 deletions tests/test_plugin_placeholder.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,13 @@
#
##################################################################

import dash
import dash_html_components as html
from dash import html, Dash
import webviz_core_components


def test_plugin_placeholder(dash_duo):

app = dash.Dash(__name__)
app = Dash(__name__)

app.layout = html.Div(
[
Expand Down
7 changes: 3 additions & 4 deletions usage.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import dash
from dash.dependencies import Input, Output, State
import dash_html_components as html
from dash import Dash, Input, Output, State, html

import webviz_core_components as wcc

app = dash.Dash(__name__)
app = Dash(__name__)

app.layout = html.Div(
[
Expand Down
3 changes: 1 addition & 2 deletions webviz_core_components/wrapped_components/checklist.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
from typing import Any

import dash_html_components as html
import dash_core_components as dcc
from dash import html, dcc


class Checklist(html.Div):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from typing import Any

import dash_html_components as html
from dash import html


class CollapsiveHeader(html.Details):
Expand Down
3 changes: 1 addition & 2 deletions webviz_core_components/wrapped_components/dropdown.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
from typing import Any

import dash_html_components as html
import dash_core_components as dcc
from dash import html, dcc


class Dropdown(html.Div):
Expand Down
4 changes: 2 additions & 2 deletions webviz_core_components/wrapped_components/flexbox.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import dash_html_components as html
from dash import html

from ._argument_modifier import argument_modifier


class FlexBox(html.Div):
"""Behaves like Div from dash_html_components, but extends that container with
"""Behaves like Div from dash.html, but extends that container with
flexbox style settings. It also adds min-width CSS style to direct children.
"""

Expand Down
3 changes: 2 additions & 1 deletion webviz_core_components/wrapped_components/flexcolumn.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
from typing import Union, Any
import dash_html_components as html

from dash import html


class FlexColumn(html.Div):
Expand Down
2 changes: 1 addition & 1 deletion webviz_core_components/wrapped_components/frame.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from typing import Any

import dash_html_components as html
from dash import html


class Frame(html.Div):
Expand Down
2 changes: 1 addition & 1 deletion webviz_core_components/wrapped_components/graph.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import dash_core_components as dcc
from dash import dcc

from ._argument_modifier import argument_modifier

Expand Down
2 changes: 1 addition & 1 deletion webviz_core_components/wrapped_components/header.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from typing import Any

import dash_html_components as html
from dash import html


class Header(html.Div):
Expand Down
2 changes: 1 addition & 1 deletion webviz_core_components/wrapped_components/label.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from typing import Any

import dash_html_components as html
from dash import html


class Label(html.Label):
Expand Down
3 changes: 1 addition & 2 deletions webviz_core_components/wrapped_components/radioitems.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
from typing import Any

import dash_html_components as html
import dash_core_components as dcc
from dash import html, dcc


class RadioItems(html.Div):
Expand Down
3 changes: 1 addition & 2 deletions webviz_core_components/wrapped_components/range_slider.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
from typing import Any

import dash_html_components as html
import dash_core_components as dcc
from dash import html, dcc


class RangeSlider(html.Div):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from typing import Any

import dash_html_components as html
from dash import html
from webviz_core_components import Select as BaseSelect


Expand Down
2 changes: 1 addition & 1 deletion webviz_core_components/wrapped_components/selectors.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from typing import Any

import dash_html_components as html
from dash import html


class Selectors(html.Details):
Expand Down
3 changes: 1 addition & 2 deletions webviz_core_components/wrapped_components/slider.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
from typing import Any

import dash_html_components as html
import dash_core_components as dcc
from dash import html, dcc


class Slider(html.Div):
Expand Down
2 changes: 1 addition & 1 deletion webviz_core_components/wrapped_components/tab.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from typing import Any

import dash_core_components as dcc
from dash import dcc


class Tab(dcc.Tab):
Expand Down
2 changes: 1 addition & 1 deletion webviz_core_components/wrapped_components/tabs.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from typing import Any

import dash_core_components as dcc
from dash import dcc


class Tabs(dcc.Tabs):
Expand Down