Relax dash dependency (#11)

Author: anders-kiaer

.travis.yml

@@ -15,6 +15,8 @@ before_install:
   - sudo apt-get install node
   - export DISPLAY=:99.0
   - sh -e /etc/init.d/xvfb start
+  - pip freeze | grep -vw "pip" | xargs pip uninstall -y
+  - pip install --upgrade pip
 
 install:
   - pip install .[tests]

setup.py

@@ -12,7 +12,7 @@
 package_name = package['name'].replace(' ', '_').replace('-', '_')
 
 install_requires = [
-    'dash==0.41'  # Same dependency as of webviz-config (to be relaxed)
+    'dash~=1.0.0'
 ]
 
 tests_require = [
@@ -21,8 +21,7 @@
     'percy',
     'selenium',
     'flake8',
-    'pylint',
-    'pytest-dash>=2.1.1'
+    'pylint'
 ]
 
 setup(

tests/test_hm.py

@@ -2,15 +2,9 @@
 from dash.dependencies import Input, Output
 import webviz_subsurface_components
 import dash_html_components as html
-from pytest_dash.wait_for import (
-    wait_for_text_to_equal,
-    wait_for_element_by_css_selector
-)
-from pytest_dash.application_runners import import_app
 
 # Basic test for the component rendering.
-def test_render_hm(dash_threaded):
-    # dash_threaded is a fixture by pytest-dash
+def test_render_hm(dash_duo):
 
     with open('tests/data/hm_data.json', 'r') as f:
         hm_data = f.read()
@@ -23,10 +17,9 @@ def test_render_hm(dash_threaded):
         data=hm_data),
     ])
 
-    driver = dash_threaded.driver
-    dash_threaded(app)
+    dash_duo.start_server(app)
 
     # Get text of first data series
-    my_component = wait_for_element_by_css_selector(driver, '#g_history_matching_plot > text')
+    my_component = dash_duo.wait_for_element_by_css_selector('#g_history_matching_plot > text', timeout=4)
 
     assert 'Misfit overview for Iteration 0' == my_component.text

tests/test_morris.py

@@ -3,15 +3,9 @@
 import webviz_subsurface_components
 import json
 import dash_html_components as html
-from pytest_dash.wait_for import (
-    wait_for_text_to_equal,
-    wait_for_element_by_css_selector
-)
-from pytest_dash.application_runners import import_app
 
 # Basic test for the component rendering.
-def test_render(dash_threaded):
-    # dash_threaded is a fixture by pytest-dash
+def test_render(dash_duo):
 
     with open('tests/data/morris_data.json', 'r') as f:
         data = json.loads(f.read())
@@ -25,12 +19,10 @@ def test_render(dash_threaded):
         parameter=data['parameter'])
     ])
 
-    driver = dash_threaded.driver
-    dash_threaded(app)
+    dash_duo.start_server(app)
 
     #  Get y-axis text with selenium
-    my_component = wait_for_element_by_css_selector(
-        driver, 
+    my_component = dash_duo.wait_for_element_by_css_selector(
         '#sensitivity-slider-plot__graph-container > svg > g > text')
 
     assert 'FOPT' == my_component.text

webviz_subsurface_components/Map.py

@@ -13,7 +13,7 @@ class Map(Component):
 components in an app.
 - data (dict; required): The data the Map component should render (JSON format).
 - height (number; optional): The height of the Map component
-- layerNames (list; optional): The name of individual layers"""
+- layerNames (list of strings; optional): The name of individual layers"""
     @_explicitize_args
     def __init__(self, id=Component.REQUIRED, data=Component.REQUIRED, height=Component.UNDEFINED, layerNames=Component.UNDEFINED, **kwargs):
         self._prop_names = ['id', 'data', 'height', 'layerNames']

webviz_subsurface_components/Morris.py

@@ -10,8 +10,8 @@ class Morris(Component):
 Keyword arguments:
 - id (string; required)
 - parameter (string; optional)
-- output (list; optional)
-- parameters (list; optional)
+- output (list of dicts; optional)
+- parameters (list of dicts; optional)
 - height (number; optional)"""
     @_explicitize_args
     def __init__(self, id=Component.REQUIRED, parameter=Component.UNDEFINED, output=Component.UNDEFINED, parameters=Component.UNDEFINED, height=Component.UNDEFINED, **kwargs):