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

Update the WASM version to the latest xiplot #42

Merged
merged 6 commits into from
Aug 24, 2023
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
23 changes: 23 additions & 0 deletions .github/workflows/test-build.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: Test build WASM version

on:
workflow_dispatch:
pull_request:
branches: [wasm]

jobs:
build:
runs-on: ubuntu-latest
steps:
- name: Checkout the Repository
uses: actions/checkout@v3
with:
submodules: true
- uses: actions/setup-python@v3
with:
python-version: "3.x"

- name: Build the WASM version
run: |
pip install --upgrade pip
make -B deploy
32 changes: 16 additions & 16 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
.PHONY: install_xiplot setup_build build_xiplot setup_plugins build_test_plugin bundle_plugins build_webdash deploy serve run all clean nuke
BUNDLED_PLUGINS := xiplot/plugin_xiplot_filetypes

.PHONY: install_xiplot setup_build build_xiplot build_plugins bundle_plugins build_webdash deploy serve run all clean nuke

all: run

Expand All @@ -25,21 +27,19 @@ build_xiplot:
cp -r data ../dist/ && \
ls ../dist/data > ../dist/assets/data.ls

setup_plugins:
cd xiplot && \
mkdir -p plugins && \
rm -f plugins/*.whl

build_test_plugin:
cd xiplot/test_plugin && \
rm -rf dist && \
pip install build && \
python3 -m build && \
cp dist/xiplot_test_plugin-*.*.*-py3-none-any.whl ../plugins
build_plugins:
pip install build
for PLUGIN in $(BUNDLED_PLUGINS) ; do \
cd $$PLUGIN && \
rm -rf dist && \
python3 -m build ; \
done

bundle_plugins:
mkdir dist/plugins
find xiplot/plugins -name \*.whl -exec cp {} dist/plugins \;
mkdir -p dist/plugins
for PLUGIN in $(BUNDLED_PLUGINS) ; do \
find $$PLUGIN/dist -name \*-py3-none-any.whl -exec cp {} dist/plugins \; ; \
done
ls dist/plugins > dist/assets/plugins.ls

build_webdash:
Expand All @@ -50,9 +50,9 @@ serve:
cd dist && \
python3 -m http.server

deploy: install_xiplot setup_build build_xiplot setup_plugins bundle_plugins build_webdash
deploy: install_xiplot setup_build build_xiplot build_plugins bundle_plugins build_webdash

run: install_xiplot setup_build build_xiplot setup_plugins build_test_plugin bundle_plugins build_webdash serve
run: deploy serve

clean:
rm -rf dist
Expand Down
7 changes: 4 additions & 3 deletions src/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,11 @@
max-width: 70%;
}

.status > .stdout {
.status>.stdout {
color: darkseagreen;
}

.status > .stderr {
.status>.stderr {
color: red;
}

Expand Down Expand Up @@ -153,6 +153,7 @@
</style>

<div class="loading-page">
<h1>&chi;iplot</h1>
<p>Initialising the WebDash environment</p>
<p class="loading-break">
Why don't you use this time to stretch and grab something to drink?
Expand All @@ -169,4 +170,4 @@
<script src="./webdash.ts"></script>
</body>

</html>
</html>
2 changes: 1 addition & 1 deletion xiplot
Submodule xiplot updated 80 files
+37 −18 .github/workflows/publish.yaml
+14 −7 .github/workflows/pytest.yaml
+27 −27 .github/workflows/style.yaml
+1 −0 .gitignore
+14 −0 CITATIONS.bib
+12 −8 README.md
+22 −3 docs/README.md
+ docs/images/barplot_reldiff.png
+ docs/images/barplot_total.png
+ docs/images/cluster_by_drawing.png
+ docs/images/cluster_by_drawing_after.png
+ docs/images/cluster_by_drawing_replace_mode(1).png
+ docs/images/cluster_by_drawing_replace_mode.png
+ docs/images/cluster_by_drawing_replace_mode_after.png
+ docs/images/cluster_by_input.png
+ docs/images/cluster_by_input_after.png
+ docs/images/cluster_reset.png
+ docs/images/dark_mode.png
+ docs/images/download_plots_and_data_file.png
+ docs/images/heatmap.png
+ docs/images/histogram_cluster_comparison.png
+ docs/images/load_data_file.png
+ docs/images/load_data_file_after.png
+ docs/images/scatterplot_click.png
+ docs/images/scatterplot_coloring.png
+ docs/images/scatterplot_hover.png
+ docs/images/scatterplot_init.png
+ docs/images/scatterplot_jittering.png
+ docs/images/smiles_input.png
+ docs/images/table_active_cell.png
+ docs/images/table_columns_selection.png
+ docs/images/table_select_row.png
+ docs/images/upload_data_file.png
+0 −21 docs/user_guide/README.md
+12 −8 docs/user_guide/data_files.md
+4 −12 docs/user_guide/plots.md
+6 −6 docs/user_guide/plugin.md
+12 −0 plugin_xiplot_filetypes/README.md
+39 −0 plugin_xiplot_filetypes/pyproject.toml
+32 −0 plugin_xiplot_filetypes/xiplot_filetypes/__init__.py
+0 −1 plugins/.gitignore
+15 −7 pyproject.toml
+1 −0 requirements-dev.txt
+1 −2 requirements.txt
+39 −51 tests/test_barplot.py
+40 −0 tests/test_filetypes.py
+3 −10 tests/test_heatmap.py
+7 −22 tests/test_histogram.py
+44 −67 tests/test_plugin.py
+20 −45 tests/test_scatterplot.py
+2 −8 tests/test_smiles.py
+23 −71 tests/test_table.py
+42 −0 tests/test_utils.py
+17 −10 tests/util_test.py
+1 −5 xiplot/__init__.py
+9 −41 xiplot/app.py
+0 −0 xiplot/assets/__init__.py
+10 −7 xiplot/assets/dcc_style.css
+5 −8 xiplot/plots/__init__.py
+57 −106 xiplot/plots/barplot.py
+38 −99 xiplot/plots/heatmap.py
+82 −144 xiplot/plots/histogram.py
+124 −183 xiplot/plots/scatterplot.py
+4 −8 xiplot/plots/smiles.py
+87 −235 xiplot/plots/table.py
+21 −120 xiplot/plugin.py
+49 −127 xiplot/tabs/cluster.py
+45 −102 xiplot/tabs/data.py
+52 −26 xiplot/tabs/embedding.py
+6 −15 xiplot/tabs/plots.py
+107 −6 xiplot/tabs/plugins.py
+2 −2 xiplot/tabs/settings.py
+63 −0 xiplot/utils/auxiliary.py
+2 −3 xiplot/utils/cluster.py
+314 −31 xiplot/utils/components.py
+20 −48 xiplot/utils/dataframe.py
+0 −25 xiplot/utils/embedding.py
+1 −91 xiplot/utils/layouts.py
+45 −66 xiplot/utils/regex.py
+11 −10 xiplot/utils/table.py