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 the Ideogram version to 1.6.0 #575

Merged
merged 5 commits into from
Sep 22, 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: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
## Unreleased - ???

### Fixed
* [#562](https://github.com/plotly/dash-bio/pull/576) Fixed abnormal memory consumption with Molecule3dViewer component when selecting residues or rotating the molecule (for more info see [#511](https://github.com/plotly/dash-bio/issues/511)).
* [#576](https://github.com/plotly/dash-bio/pull/576) Fixed abnormal memory consumption with Molecule3dViewer component when selecting residues or rotating the molecule (for more info see [#511](https://github.com/plotly/dash-bio/issues/511)).
* [#575](https://github.com/plotly/dash-bio/pull/575) Bumped Ideogram version to 1.6.0 to fix erratic annotations behavior (for more info see [#524](https://github.com/plotly/dash-bio/issues/524)).

## [0.7.1] - 2021-07-26

Expand Down
2 changes: 1 addition & 1 deletion dash_bio/async-ideogram.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dash_bio/async-ideogram.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dash_bio/bundle.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dash_bio/bundle.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dash_bio/package-info.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"circos": "git+https://github.com/plotly/circosJS.git#matthewchan15-zoom-pan-svg",
"fast-memoize": "^2.5.1",
"fornac": "git://github.com/plotly/fornac.git#6b1b84740d35bf37ca7d251e665039a87b4c2ea9",
"ideogram": "git+https://github.com/eweitz/ideogram.git#7d9b2ab91b91ef35db93bdeb529d4760de63292f",
"ideogram": "git+https://github.com/eweitz/ideogram.git#a63d8c0198fe0475a9b141e5aa77bb273ddb217e",
"igv": "2.6.8",
"molecule-2d-for-react": "git://github.com/plotly/molecule-2d-for-react.git",
"molecule-3d-for-react": "git://github.com/plotly/molecule-3d-for-react.git#c0f527d9ae1156bb0932790a683c74604100cd32",
Expand Down
2 changes: 1 addition & 1 deletion inst/deps/async-ideogram.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion inst/deps/async-ideogram.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion inst/deps/bundle.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion inst/deps/bundle.js.map

Large diffs are not rendered by default.

61 changes: 50 additions & 11 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"circos": "git+https://github.com/plotly/circosJS.git#matthewchan15-zoom-pan-svg",
"fast-memoize": "^2.5.1",
"fornac": "git://github.com/plotly/fornac.git#6b1b84740d35bf37ca7d251e665039a87b4c2ea9",
"ideogram": "git+https://github.com/eweitz/ideogram.git#7d9b2ab91b91ef35db93bdeb529d4760de63292f",
"ideogram": "git+https://github.com/eweitz/ideogram.git#a63d8c0198fe0475a9b141e5aa77bb273ddb217e",
"igv": "2.6.8",
"molecule-2d-for-react": "git://github.com/plotly/molecule-2d-for-react.git",
"molecule-3d-for-react": "git://github.com/plotly/molecule-3d-for-react.git#c0f527d9ae1156bb0932790a683c74604100cd32",
Expand Down
75 changes: 74 additions & 1 deletion tests/integration/test_ideogram.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ def test_dbid001_displayed_chromosomes(dash_duo):

WebDriverWait(dash_duo.driver, 1).until(
lambda _:
len(dash_duo.find_elements('g.chromosome-set-container')) == 5,
len(dash_duo.find_elements('g.chromosome-set')) == 5,
5
)

Expand Down Expand Up @@ -103,3 +103,76 @@ def test_dbid003_click_rotation_disabled(dash_duo):

assert 'rotate(90)' in dash_duo.find_element(
'#chr1-9606-chromosome-set').get_attribute('transform')


def test_dbid004_remote_annotations_path(dash_duo):
app = dash.Dash(__name__)

app.layout = html.Div(simple_app_layout(
dash_bio.Ideogram(
id=_COMPONENT_ID
)
))

simple_app_callback(
app,
dash_duo,
component_id=_COMPONENT_ID,
test_prop_name='annotationsPath',
test_prop_value='https://eweitz.github.io/ideogram/data/annotations/10_virtual_cnvs.json',
prop_value_type='string',
validation_fn=lambda x:
x == 'https://eweitz.github.io/ideogram/data/annotations/10_virtual_cnvs.json',
take_snapshot=True,
)

WebDriverWait(dash_duo.driver, 1).until(
lambda _:
len(dash_duo.find_elements('g.annot')) == 10,
5
)


def test_dbid005_local_annotations(dash_duo):
app = dash.Dash(__name__)

app.layout = html.Div(simple_app_layout(
dash_bio.Ideogram(
id=_COMPONENT_ID
)
))

annotations = {
"keys": ["chr", "start", "length", "color"],
"annots": [
{"chr": "1", "annots": [["virtual1", 30000000, 6000000, "rgba(255, 0, 0, 0.65)"],
["virtual2", 40000000, 5000000, "rgba(0, 255, 0, 0.65)"]]},
{"chr": "2", "annots": [["nsv531656", 40738282, 17125539, "rgba(255, 0, 0, 0.65)"],
["2", 30000000, 9000000, "rgba(255, 0, 0, 0.65)"]]},
{"chr": "20", "annots": [["observation 1", 30954171, 5816, "rgba(255, 0, 0, 0.65)"]]},
{"chr": "3", "annots": [[" ", 30000000, 9000000, "rgba(0, 255, 0, 0.65)"],
["virtual3", 33000000, 3000000, "rgba(255, 0, 0, 0.65)"]]},
{"chr": "9", "annots":
[["a duplicate name", 120000000, 9000000, "rgba(0, 255, 0, 0.65)"],
["a duplicate name", 12000000, 12000000, "rgba(255, 0, 0, 0.65)"]]},
{"chr": "foo", "annots": []},
{"chr": "X", "annots": [["observation 2", 47422351, 6720, "rgba(0, 0, 255, 0.65)"]]}
]
}

simple_app_callback(
app,
dash_duo,
component_id=_COMPONENT_ID,
test_prop_name='annotations',
test_prop_value=json.dumps(annotations),
prop_value_type='dict',
validation_fn=lambda x: x == annotations,
take_snapshot=True,
)

WebDriverWait(dash_duo.driver, 1).until(
lambda _:
len(dash_duo.find_elements('g.annot')) == 10,
5
)