Skip to content
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
* Changed property `fullChromosomeLabels` so that it can be updated using dash callbacks
* Changed Imputer (deprecated) to SimpleImputer in Clustergram component.
* Changed property name `impute_function` to `imputer_parameters` in Clustergram component.
* Changed install requirement to Dash version 0.40.0 or greater.

### Added
* Added ability to define custom colours in styles parser for Molecule3D.
Expand Down
23 changes: 0 additions & 23 deletions dash_bio/AlignmentChart.py
Original file line number Diff line number Diff line change
Expand Up @@ -112,26 +112,3 @@ def __init__(self, id=Component.UNDEFINED, eventDatum=Component.UNDEFINED, data=
raise TypeError(
'Required argument `' + k + '` was not specified.')
super(AlignmentChart, self).__init__(**args)

def __repr__(self):
if(any(getattr(self, c, None) is not None
for c in self._prop_names
if c is not self._prop_names[0])
or any(getattr(self, c, None) is not None
for c in self.__dict__.keys()
if any(c.startswith(wc_attr)
for wc_attr in self._valid_wildcard_attributes))):
props_string = ', '.join([c+'='+repr(getattr(self, c, None))
for c in self._prop_names
if getattr(self, c, None) is not None])
wilds_string = ', '.join([c+'='+repr(getattr(self, c, None))
for c in self.__dict__.keys()
if any([c.startswith(wc_attr)
for wc_attr in
self._valid_wildcard_attributes])])
return ('AlignmentChart(' + props_string +
(', ' + wilds_string if wilds_string != '' else '') + ')')
else:
return (
'AlignmentChart(' +
repr(getattr(self, self._prop_names[0], None)) + ')')
23 changes: 0 additions & 23 deletions dash_bio/AlignmentViewer.py
Original file line number Diff line number Diff line change
Expand Up @@ -112,26 +112,3 @@ def __init__(self, id=Component.UNDEFINED, eventDatum=Component.UNDEFINED, data=
raise TypeError(
'Required argument `' + k + '` was not specified.')
super(AlignmentViewer, self).__init__(**args)

def __repr__(self):
if(any(getattr(self, c, None) is not None
for c in self._prop_names
if c is not self._prop_names[0])
or any(getattr(self, c, None) is not None
for c in self.__dict__.keys()
if any(c.startswith(wc_attr)
for wc_attr in self._valid_wildcard_attributes))):
props_string = ', '.join([c+'='+repr(getattr(self, c, None))
for c in self._prop_names
if getattr(self, c, None) is not None])
wilds_string = ', '.join([c+'='+repr(getattr(self, c, None))
for c in self.__dict__.keys()
if any([c.startswith(wc_attr)
for wc_attr in
self._valid_wildcard_attributes])])
return ('AlignmentViewer(' + props_string +
(', ' + wilds_string if wilds_string != '' else '') + ')')
else:
return (
'AlignmentViewer(' +
repr(getattr(self, self._prop_names[0], None)) + ')')
23 changes: 0 additions & 23 deletions dash_bio/Circos.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,26 +57,3 @@ def __init__(self, enableDownloadSVG=Component.UNDEFINED, enableZoomPan=Componen
raise TypeError(
'Required argument `' + k + '` was not specified.')
super(Circos, self).__init__(**args)

def __repr__(self):
if(any(getattr(self, c, None) is not None
for c in self._prop_names
if c is not self._prop_names[0])
or any(getattr(self, c, None) is not None
for c in self.__dict__.keys()
if any(c.startswith(wc_attr)
for wc_attr in self._valid_wildcard_attributes))):
props_string = ', '.join([c+'='+repr(getattr(self, c, None))
for c in self._prop_names
if getattr(self, c, None) is not None])
wilds_string = ', '.join([c+'='+repr(getattr(self, c, None))
for c in self.__dict__.keys()
if any([c.startswith(wc_attr)
for wc_attr in
self._valid_wildcard_attributes])])
return ('Circos(' + props_string +
(', ' + wilds_string if wilds_string != '' else '') + ')')
else:
return (
'Circos(' +
repr(getattr(self, self._prop_names[0], None)) + ')')
23 changes: 0 additions & 23 deletions dash_bio/Ideogram.py
Original file line number Diff line number Diff line change
Expand Up @@ -165,26 +165,3 @@ def __init__(self, id=Component.REQUIRED, style=Component.UNDEFINED, className=C
raise TypeError(
'Required argument `' + k + '` was not specified.')
super(Ideogram, self).__init__(**args)

def __repr__(self):
if(any(getattr(self, c, None) is not None
for c in self._prop_names
if c is not self._prop_names[0])
or any(getattr(self, c, None) is not None
for c in self.__dict__.keys()
if any(c.startswith(wc_attr)
for wc_attr in self._valid_wildcard_attributes))):
props_string = ', '.join([c+'='+repr(getattr(self, c, None))
for c in self._prop_names
if getattr(self, c, None) is not None])
wilds_string = ', '.join([c+'='+repr(getattr(self, c, None))
for c in self.__dict__.keys()
if any([c.startswith(wc_attr)
for wc_attr in
self._valid_wildcard_attributes])])
return ('Ideogram(' + props_string +
(', ' + wilds_string if wilds_string != '' else '') + ')')
else:
return (
'Ideogram(' +
repr(getattr(self, self._prop_names[0], None)) + ')')
23 changes: 0 additions & 23 deletions dash_bio/Molecule3dViewer.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,26 +42,3 @@ def __init__(self, id=Component.UNDEFINED, selectionType=Component.UNDEFINED, ba
raise TypeError(
'Required argument `' + k + '` was not specified.')
super(Molecule3dViewer, self).__init__(**args)

def __repr__(self):
if(any(getattr(self, c, None) is not None
for c in self._prop_names
if c is not self._prop_names[0])
or any(getattr(self, c, None) is not None
for c in self.__dict__.keys()
if any(c.startswith(wc_attr)
for wc_attr in self._valid_wildcard_attributes))):
props_string = ', '.join([c+'='+repr(getattr(self, c, None))
for c in self._prop_names
if getattr(self, c, None) is not None])
wilds_string = ', '.join([c+'='+repr(getattr(self, c, None))
for c in self.__dict__.keys()
if any([c.startswith(wc_attr)
for wc_attr in
self._valid_wildcard_attributes])])
return ('Molecule3dViewer(' + props_string +
(', ' + wilds_string if wilds_string != '' else '') + ')')
else:
return (
'Molecule3dViewer(' +
repr(getattr(self, self._prop_names[0], None)) + ')')
23 changes: 0 additions & 23 deletions dash_bio/NeedlePlot.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,26 +51,3 @@ def __init__(self, id=Component.UNDEFINED, mutationData=Component.UNDEFINED, xla
raise TypeError(
'Required argument `' + k + '` was not specified.')
super(NeedlePlot, self).__init__(**args)

def __repr__(self):
if(any(getattr(self, c, None) is not None
for c in self._prop_names
if c is not self._prop_names[0])
or any(getattr(self, c, None) is not None
for c in self.__dict__.keys()
if any(c.startswith(wc_attr)
for wc_attr in self._valid_wildcard_attributes))):
props_string = ', '.join([c+'='+repr(getattr(self, c, None))
for c in self._prop_names
if getattr(self, c, None) is not None])
wilds_string = ', '.join([c+'='+repr(getattr(self, c, None))
for c in self.__dict__.keys()
if any([c.startswith(wc_attr)
for wc_attr in
self._valid_wildcard_attributes])])
return ('NeedlePlot(' + props_string +
(', ' + wilds_string if wilds_string != '' else '') + ')')
else:
return (
'NeedlePlot(' +
repr(getattr(self, self._prop_names[0], None)) + ')')
23 changes: 0 additions & 23 deletions dash_bio/OncoPrint.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,26 +60,3 @@ def __init__(self, id=Component.UNDEFINED, eventDatum=Component.UNDEFINED, data=
raise TypeError(
'Required argument `' + k + '` was not specified.')
super(OncoPrint, self).__init__(**args)

def __repr__(self):
if(any(getattr(self, c, None) is not None
for c in self._prop_names
if c is not self._prop_names[0])
or any(getattr(self, c, None) is not None
for c in self.__dict__.keys()
if any(c.startswith(wc_attr)
for wc_attr in self._valid_wildcard_attributes))):
props_string = ', '.join([c+'='+repr(getattr(self, c, None))
for c in self._prop_names
if getattr(self, c, None) is not None])
wilds_string = ', '.join([c+'='+repr(getattr(self, c, None))
for c in self.__dict__.keys()
if any([c.startswith(wc_attr)
for wc_attr in
self._valid_wildcard_attributes])])
return ('OncoPrint(' + props_string +
(', ' + wilds_string if wilds_string != '' else '') + ')')
else:
return (
'OncoPrint(' +
repr(getattr(self, self._prop_names[0], None)) + ')')
23 changes: 0 additions & 23 deletions dash_bio/SequenceViewer.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,26 +76,3 @@ def __init__(self, id=Component.UNDEFINED, sequence=Component.UNDEFINED, showLin
raise TypeError(
'Required argument `' + k + '` was not specified.')
super(SequenceViewer, self).__init__(**args)

def __repr__(self):
if(any(getattr(self, c, None) is not None
for c in self._prop_names
if c is not self._prop_names[0])
or any(getattr(self, c, None) is not None
for c in self.__dict__.keys()
if any(c.startswith(wc_attr)
for wc_attr in self._valid_wildcard_attributes))):
props_string = ', '.join([c+'='+repr(getattr(self, c, None))
for c in self._prop_names
if getattr(self, c, None) is not None])
wilds_string = ', '.join([c+'='+repr(getattr(self, c, None))
for c in self.__dict__.keys()
if any([c.startswith(wc_attr)
for wc_attr in
self._valid_wildcard_attributes])])
return ('SequenceViewer(' + props_string +
(', ' + wilds_string if wilds_string != '' else '') + ')')
else:
return (
'SequenceViewer(' +
repr(getattr(self, self._prop_names[0], None)) + ')')
23 changes: 0 additions & 23 deletions dash_bio/Speck.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,26 +61,3 @@ def __init__(self, id=Component.UNDEFINED, data=Component.UNDEFINED, scrollZoom=
raise TypeError(
'Required argument `' + k + '` was not specified.')
super(Speck, self).__init__(**args)

def __repr__(self):
if(any(getattr(self, c, None) is not None
for c in self._prop_names
if c is not self._prop_names[0])
or any(getattr(self, c, None) is not None
for c in self.__dict__.keys()
if any(c.startswith(wc_attr)
for wc_attr in self._valid_wildcard_attributes))):
props_string = ', '.join([c+'='+repr(getattr(self, c, None))
for c in self._prop_names
if getattr(self, c, None) is not None])
wilds_string = ', '.join([c+'='+repr(getattr(self, c, None))
for c in self.__dict__.keys()
if any([c.startswith(wc_attr)
for wc_attr in
self._valid_wildcard_attributes])])
return ('Speck(' + props_string +
(', ' + wilds_string if wilds_string != '' else '') + ')')
else:
return (
'Speck(' +
repr(getattr(self, self._prop_names[0], None)) + ')')
6 changes: 1 addition & 5 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,9 @@
biopython
colour==0.1.5
Comment thread
mkcor marked this conversation as resolved.
cython>=0.19
dash==0.37.0
dash>=0.40.0
dash-bio==0.0.8rc13
dash-core-components==0.43.1
dash-daq==0.1.4
dash-html-components==0.13.5
dash-renderer==0.18.0
dash-table==3.4.0
gunicorn
jsonschema
matplotlib
Expand Down
3 changes: 1 addition & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@
install_requires=[
'biopython',
'colour',
'dash>=0.37.0',
'dash-html-components',
'dash>=0.40.0',
'pandas',
'parmed',
'plotly',
Expand Down
4 changes: 2 additions & 2 deletions tests/dashbio_demos/app_alignment_viewer.py
Original file line number Diff line number Diff line change
Expand Up @@ -104,11 +104,11 @@ def layout():
html.Div([
html.Div(id='alignment-control-tabs', children=[
dcc.Tabs(
id='alignment-tabs',
id='alignment-tabs', value='what-is',
children=[
dcc.Tab(
label='About',
value='alignment-tab-about',
value='what-is',
children=html.Div(className='alignment-tab', children=[
html.H4(
"What is Alignment Viewer?"
Expand Down
2 changes: 1 addition & 1 deletion tests/dashbio_demos/app_circos.py
Original file line number Diff line number Diff line change
Expand Up @@ -922,7 +922,7 @@ def layout():
),

html.Div(id='circos-control-tabs', children=[
dcc.Tabs(id='circos-tabs', children=[
dcc.Tabs(id='circos-tabs', value='what-is', children=[
dcc.Tab(
label='About',
value='what-is',
Expand Down
2 changes: 1 addition & 1 deletion tests/dashbio_demos/app_clustergram.py
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ def layout():
),

html.Div(id='clustergram-control-tabs', children=[
dcc.Tabs(id='clustergram-tabs', children=[
dcc.Tabs(id='clustergram-tabs', value='what-is', children=[
dcc.Tab(
label='About',
value='what-is',
Expand Down
2 changes: 1 addition & 1 deletion tests/dashbio_demos/app_ideogram.py
Original file line number Diff line number Diff line change
Expand Up @@ -426,7 +426,7 @@ def layout():
return html.Div(id='ideogram-body', children=[
html.Div(id='ideogram-container'),
html.Div(id='ideogram-control-tabs', children=[
dcc.Tabs(id='ideogram-tabs', children=[
dcc.Tabs(id='ideogram-tabs', value='what-is', children=[
dcc.Tab(
label='About',
value='what-is',
Expand Down
2 changes: 1 addition & 1 deletion tests/dashbio_demos/app_manhattan_plot.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ def layout():
),

html.Div(id='manhattan-control-tabs', children=[
dcc.Tabs(id='manhattan-tabs', children=[
dcc.Tabs(id='manhattan-tabs', value='what-is', children=[
dcc.Tab(
label='About',
value='what-is',
Expand Down
4 changes: 1 addition & 3 deletions tests/dashbio_demos/app_molecule3d.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,10 @@ def layout():
return html.Div(
id="mol3d-body",
children=[

html.Div(
id='mol3d-control-tabs',
children=[
dcc.Tabs([
dcc.Tabs(id='mol3d-tabs', value='what-is', children=[
dcc.Tab(
label='About',
value='what-is',
Expand Down Expand Up @@ -231,7 +230,6 @@ def layout():
),

]),
html.Div(id='mol3d-tabs-content')
]),

html.Div(
Expand Down
2 changes: 1 addition & 1 deletion tests/dashbio_demos/app_needle_plot.py
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ def layout():
),

html.Div(id='needleplot-control-tabs', children=[
dcc.Tabs(id='needleplot-tabs', children=[
dcc.Tabs(id='needleplot-tabs', value='what-is', children=[
dcc.Tab(
label='About',
value='what-is',
Expand Down
2 changes: 1 addition & 1 deletion tests/dashbio_demos/app_sequence_viewer.py
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ def layout():
),

html.Div(id='seq-view-control-tabs', children=[
dcc.Tabs(id='seq-view-tabs', children=[
dcc.Tabs(id='seq-view-tabs', value='what-is', children=[
dcc.Tab(
label='About',
value='what-is',
Expand Down
Loading