Skip to content

Commit fe4df94

Browse files
authored
Merge branch 'main' into test_all_os
2 parents 58c99d4 + 07d0ac4 commit fe4df94

File tree

45 files changed

+1554
-258
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+1554
-258
lines changed

.github/workflows/cdci.yml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,15 @@ jobs:
120120
echo "Error: One or more protected files have been modified."
121121
exit 1
122122
fi
123+
- name: streamlit report based on predefined config file
124+
run: |
125+
cd docs
126+
vuegen -c example_config_files/Basic_example_vuegen_demo_notebook_config.yaml -output_dir ../tests/report_examples/Basic_example_vuegen_demo_notebook_cfg
127+
# Check for changes
128+
if git diff ../tests/report_examples | grep .; then
129+
echo "Error: One or more protected files have been modified."
130+
exit 1
131+
fi
123132
- name: check streamlit report files for chatbot API
124133
run: |
125134
vuegen -c docs/example_config_files/Chatbot_example_config.yaml -output_dir tests/report_examples/chat_bot
@@ -210,7 +219,7 @@ jobs:
210219
- name: Build executable
211220
run: |
212221
cd gui
213-
pyinstaller -n vuegen_gui --onefile --windowed --collect-all pyvis --collect-all streamlit --collect-all st_aggrid --collect-all customtkinter --collect-all quarto_cli --collect-all plotly --collect-all _plotly_utils --collect-all traitlets --collect-all referencing --collect-all rpds --collect-all tenacity --collect-all pandas --collect-all numpy --collect-all matplotlib --collect-all openpyxl --collect-all xlrd --collect-all nbformat --collect-all nbclient --collect-all altair --collect-all itables --collect-all kaleido --collect-all pyarrow --collect-all dataframe_image --collect-all narwhals --collect-all PIL --collect-all vl_convert --collect-all typing-extensions --add-data ../docs/example_data/Basic_example_vuegen_demo_notebook:example_data/Basic_example_vuegen_demo_notebook --add-data ../docs/images/vuegen_logo.png:. app.py
222+
pyinstaller -n vuegen_gui --onefile --windowed --collect-all pyvis --collect-all streamlit --collect-all st_aggrid --collect-all customtkinter --collect-all quarto_cli --collect-all plotly --collect-all _plotly_utils --collect-all traitlets --collect-all referencing --collect-all rpds --collect-all tenacity --collect-all pandas --collect-all numpy --collect-all matplotlib --collect-all openpyxl --collect-all xlrd --collect-all nbformat --collect-all nbclient --collect-all altair --collect-all itables --collect-all kaleido --collect-all pyarrow --collect-all dataframe_image --collect-all narwhals --collect-all PIL --collect-all vl_convert --collect-all typing-extensions --add-data ../docs/example_data/Basic_example_vuegen_demo_notebook:example_data/Basic_example_vuegen_demo_notebook --add-data ../docs/images/logo/vuegen_logo.png:. app.py
214223
# --windowed only for mac, see:
215224
# https://pyinstaller.org/en/stable/usage.html#building-macos-app-bundles
216225
# 'Under macOS, PyInstaller always builds a UNIX executable in dist.'

bin/README.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# Scripts
2+
3+
Run from project root.
4+
5+
## Update the example reports files
6+
7+
```bash
8+
bash bin/update_test_reports.sh
9+
```
10+
11+
- make sure these run
12+
- evaluate if changes are intended and potentially commit report file changes
13+
along with the corresponding code changes

bin/update_test_reports.sh

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
set -e
2+
vuegen -dir docs/example_data/Basic_example_vuegen_demo_notebook -output_dir tests/report_examples/Basic_example_vuegen_demo_notebook
3+
4+
vuegen -dir docs/example_data/Basic_example_vuegen_demo_notebook -output_dir tests/report_examples/Basic_example_vuegen_demo_notebook/html -rt html
5+
vuegen -dir docs/example_data/Basic_example_vuegen_demo_notebook -output_dir tests/report_examples/Basic_example_vuegen_demo_notebook/pdf -rt pdf
6+
vuegen -dir docs/example_data/Basic_example_vuegen_demo_notebook -output_dir tests/report_examples/Basic_example_vuegen_demo_notebook/docx -rt docx
7+
vuegen -dir docs/example_data/Basic_example_vuegen_demo_notebook -output_dir tests/report_examples/Basic_example_vuegen_demo_notebook/odt -rt odt
8+
vuegen -dir docs/example_data/Basic_example_vuegen_demo_notebook -output_dir tests/report_examples/Basic_example_vuegen_demo_notebook/revealjs -rt revealjs
9+
vuegen -dir docs/example_data/Basic_example_vuegen_demo_notebook -output_dir tests/report_examples/Basic_example_vuegen_demo_notebook/pptx -rt pptx
10+
vuegen -dir docs/example_data/Basic_example_vuegen_demo_notebook -output_dir tests/report_examples/Basic_example_vuegen_demo_notebook/jupyter -rt jupyter
11+
12+
# all of the above quarto based reports, can be opened from the command line with:
13+
# open tests/report_examples/Basic_example_vuegen_demo_notebook/pdf/quarto_report/quarto_report.pdf
14+
15+
cd docs
16+
vuegen -c example_config_files/Basic_example_vuegen_demo_notebook_config.yaml -output_dir ../tests/report_examples/Basic_example_vuegen_demo_notebook_cfg
17+
vuegen -c example_config_files/Basic_example_vuegen_demo_notebook_config.yaml -output_dir ../tests/report_examples/Basic_example_vuegen_demo_notebook_cfg/html -rt html
18+
vuegen -c example_config_files/Basic_example_vuegen_demo_notebook_config.yaml -output_dir ../tests/report_examples/Basic_example_vuegen_demo_notebook_cfg/pdf -rt pdf
19+
20+
# update bot example
21+
vuegen -c example_config_files/Chatbot_example_config.yaml -output_dir ../tests/report_examples/chat_bot

docs/example_config_files/Basic_example_vuegen_demo_notebook_config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
report:
22
title: Basic Example Vuegen Demo Notebook
33
description: A general description of the report.
4-
graphical_abstract: https://raw.githubusercontent.com/Multiomics-Analytics-Group/vuegen/main/docs/images/vuegen_logo.png
5-
logo: https://raw.githubusercontent.com/Multiomics-Analytics-Group/vuegen/main/docs/images/vuegen_logo.png
4+
graphical_abstract: https://raw.githubusercontent.com/Multiomics-Analytics-Group/vuegen/main/docs/images/logo/vuegen_logo.png
5+
logo: https://raw.githubusercontent.com/Multiomics-Analytics-Group/vuegen/main/docs/images/logo/vuegen_logo.png
66
sections:
77
- title: Plots
88
description: This section contains example plots.

docs/example_data/Basic_example_vuegen_demo_notebook/5_Markdown/1_All_markdown/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<!-- <div align="center">
2-
<img width="300px" src="images/vuegen_logo.svg">
2+
<img width="300px" src="images/logo/vuegen_logo.svg">
33
</div> -->
44

5-
![VueGen Logo](https://raw.githubusercontent.com/Multiomics-Analytics-Group/vuegen/main/docs/images/vuegen_logo.png)
5+
![VueGen Logo](https://raw.githubusercontent.com/Multiomics-Analytics-Group/vuegen/main/docs/images/logo/vuegen_logo.png)
66

77
<p align="center">
88
VueGen is a Python library that automates the creation of scientific reports.
Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,6 @@
1-
A general description of the report.
1+
A general description of the report.
2+
3+
It should test all major components which are available
4+
to be integrated into VueGen.
5+
6+
Check our tests folder for examples of report files used to generate actual reports.
270 KB
Loading

docs/split_readme.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
# Mapping section titles to their corresponding filenames
55
SECTION_MAPPING = {
6-
"![VueGen Logo](https://raw.githubusercontent.com/Multiomics-Analytics-Group/vuegen/main/docs/images/vuegen_logo.svg)": "home_page.md",
6+
"![VueGen Logo](https://raw.githubusercontent.com/Multiomics-Analytics-Group/vuegen/HEAD/docs/images/logo/vuegen_logo.svg)": "home_page.md",
77
"About the project": "about.md",
88
"Installation": "installation.md",
99
"Execution": "execution.md",
@@ -84,7 +84,7 @@ def clean_trailing_links(content):
8484

8585

8686
def process_readme(readme_path, output_dir):
87-
readme = Path(readme_path).read_text()
87+
readme = Path(readme_path).read_text(encoding="utf-8")
8888

8989
# Extract links from README
9090
links = extract_links_from_readme(readme)
@@ -104,11 +104,11 @@ def process_readme(readme_path, output_dir):
104104
(output_dir / filename).write_text(myst_content)
105105
print(f"Generated {filename}")
106106
else:
107-
print(f"Warning: Section '{section_title}' not found in README")
107+
raise ValueError(f"Section '{section_title}' not found in README")
108108

109109
# Include CONTRIBUTING.md with its own link references
110110
contrib_path = readme_path.parent / "CONTRIBUTING.md"
111-
if contrib_path.exists():
111+
try:
112112
raw_contrib = contrib_path.read_text()
113113
contrib_links = extract_links_from_readme(raw_contrib)
114114

@@ -121,8 +121,8 @@ def process_readme(readme_path, output_dir):
121121
# Write output
122122
(output_dir / "contributing.md").write_text(contrib_converted)
123123
print("Generated contributing.md")
124-
else:
125-
print("Warning: CONTRIBUTING.md not found")
124+
except FileNotFoundError as e:
125+
raise FileNotFoundError(f"CONTRIBUTING.md not found at {contrib_path}") from e
126126

127127

128128
if __name__ == "__main__":

docs/vuegen_basic_case_study.ipynb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@
273273
},
274274
"outputs": [],
275275
"source": [
276-
"vuegen_logo_path = \"https://raw.githubusercontent.com/Multiomics-Analytics-Group/vuegen/main/docs/images/vuegen_logo.svg\"\n",
276+
"vuegen_logo_path = \"https://raw.githubusercontent.com/Multiomics-Analytics-Group/vuegen/main/docs/images/logo/vuegen_logo.png\"\n",
277277
"\n",
278278
"# Load the YAML file\n",
279279
"print(\n",
@@ -457,7 +457,7 @@
457457
"name": "python",
458458
"nbconvert_exporter": "python",
459459
"pygments_lexer": "ipython3",
460-
"version": "3.12.6"
460+
"version": "3.12.9"
461461
}
462462
},
463463
"nbformat": 4,

docs/vuegen_basic_case_study_configfile.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ The [configuration file](https://github.com/Multiomics-Analytics-Group/vuegen/bl
66
report:
77
title: Basic Example Vuegen Demo Notebook
88
description: A general description of the report.
9-
graphical_abstract: https://raw.githubusercontent.com/Multiomics-Analytics-Group/vuegen/main/docs/images/vuegen_logo.png
10-
logo: https://raw.githubusercontent.com/Multiomics-Analytics-Group/vuegen/main/docs/images/vuegen_logo.png
9+
graphical_abstract: https://raw.githubusercontent.com/Multiomics-Analytics-Group/vuegen/main/docs/images/logo/vuegen_logo.png
10+
logo: https://raw.githubusercontent.com/Multiomics-Analytics-Group/vuegen/main/docs/images/logo/vuegen_logo.png
1111
sections:
1212
- title: Plots
1313
description: This section contains example plots.

0 commit comments

Comments
 (0)