Skip to content

Commit aa2ba13

Browse files
committed
Merge branch 'main' into xlsx_with_multiple_sheets
🐛 quarto report is broken atm, relative paths do not work
1 parent c21413e commit aa2ba13

30 files changed

+1720
-506
lines changed

.github/workflows/cdci.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Python package
1+
name: CICD Python Package
22

33
on:
44
push:
@@ -27,9 +27,13 @@ jobs:
2727
python-version: ${{ matrix.python-version }}
2828
cache: "pip" # caching pip dependencies
2929
cache-dependency-path: "**/pyproject.toml"
30-
- name: Install dependencies
30+
- name: lint package code with ruff
3131
run: |
3232
python -m pip install --upgrade pip
33+
pip install ruff
34+
ruff check src
35+
- name: Install dependencies for testing
36+
run: |
3337
pip install pytest
3438
pip install -e .
3539
- name: Run tests
@@ -155,7 +159,7 @@ jobs:
155159
- name: Build executable
156160
run: |
157161
cd gui
158-
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 pyvis --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 --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
162+
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
159163
# --windowed only for mac, see:
160164
# https://pyinstaller.org/en/stable/usage.html#building-macos-app-bundles
161165
# 'Under macOS, PyInstaller always builds a UNIX executable in dist.'

.github/workflows/docs.yml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Test documentation building, and publish report to GitHub Pages
1+
name: Docs and Report Examples
22

33
on:
44
push:
@@ -7,10 +7,10 @@ on:
77
branches: [main]
88
release:
99
types: [published]
10-
10+
1111
jobs:
1212
test:
13-
name: Test
13+
name: Test docs and report examples
1414
runs-on: ubuntu-latest
1515
strategy:
1616
matrix:
@@ -21,24 +21,24 @@ jobs:
2121
uses: actions/setup-python@v5
2222
with:
2323
python-version: ${{ matrix.python-version }}
24-
cache: 'pip' # caching pip dependencies
25-
cache-dependency-path: '**/pyproject.toml'
24+
cache: "pip" # caching pip dependencies
25+
cache-dependency-path: "**/pyproject.toml"
2626
- name: Install dependencies
2727
run: |
2828
python -m pip install --upgrade pip
29-
pip install -e .[docs]
29+
pip install .[docs]
3030
- name: Build references
3131
run: |
32-
cd docs
33-
sphinx-apidoc --force --implicit-namespaces --module-first -o reference ../src/vuegen
32+
cd docs
33+
sphinx-apidoc --force --implicit-namespaces --module-first -o reference ../src/vuegen
3434
- name: Build documentation
3535
run: |
36-
cd docs
37-
sphinx-build -n --keep-going -b html ./ ./_build/
36+
cd docs
37+
sphinx-build -n --keep-going -b html ./ ./_build/
3838
# --- HTML example deployment ---
3939
- name: Rename entry point of report to index.html
4040
run: |
41-
mv docs/quarto_report/quarto_report.html docs/quarto_report/index.html
41+
mv docs/quarto_report/quarto_report.html docs/quarto_report/index.html
4242
- name: Publish HTML report to GitHub Pages (gh-pages branch)
4343
# Only publish a new static report upon a new release -> can be changed.
4444
if: startsWith(github.ref, 'refs/tags')
@@ -53,13 +53,13 @@ jobs:
5353
# path: docs/_build/
5454

5555
# --- Streamlit example deployment ---
56-
- name: Fix Absolute Paths in Streamlit Scripts
57-
run: |
58-
find docs/streamlit_report/sections -type f -name "*.py" -exec sed -i 's|/home/runner/work/vuegen/vuegen/docs/||g' {} +
56+
#- name: Fix Absolute Paths in Streamlit Scripts
57+
# run: |
58+
# find docs/streamlit_report/sections -type f -name "*.py" -exec sed -i 's|/home/runner/work/vuegen/vuegen/docs/||g' {} +
5959
- name: Publish Streamlit report to streamlit-example branch
6060
if: startsWith(github.ref, 'refs/tags')
6161
uses: peaceiris/actions-gh-pages@v4
6262
with:
6363
github_token: ${{ secrets.GITHUB_TOKEN }}
6464
publish_dir: docs/
65-
publish_branch: streamlit-report-example
65+
publish_branch: streamlit-report-example

.gitignore

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,5 @@ docs/images/UML_diagrams/
128128
docs/images/Graphical_abstract/
129129
docs/images/Nfcore_module_figure
130130
docs/presentations/
131-
docs/example_data/Earth_microbiome_vuegen_demo_notebook_test/
132-
docs/vuegen_case_study_earth_microbiome_test.ipynb
133-
test.py
131+
basic_example_vuegen_demo_notebook_config.yaml
132+
earth_microbiome_vuegen_demo_notebook_config.yaml

CONTRIBUTING.md

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,17 @@ you to share any suggestions or observations you have about this project.
2727

2828
Here are the ways you can submit your suggestions and contribute to the project:
2929

30-
1. **Reporting Issues or Suggesting Improvements:** If you have a [GitHub][github] account
31-
(or are willing to [open one][github-join]) but are unfamiliar with Git, you can report
32-
bugs or suggest improvements by [creating an issue][new-issue]. This GitHub feature allows
33-
for discussion threads on reported issues and proposed enhancements.
30+
### 1. Reporting Issues or Suggesting Improvements
3431

35-
2. **Submitting Changes via Pull Requests:** If you are comfortable using Git and would like to
36-
add or modify a functionality, you can submit a **pull request (PR)**. Instructions on how to contribute this way are provided in the next section.
32+
If you have a [GitHub][github] account (or are willing to [open one][github-join]) but are unfamiliar with Git, you can report bugs or suggest improvements by [creating an issue][new-issue]. This GitHub feature allows for discussion threads on reported issues and proposed enhancements.
3733

38-
3. **Providing Feedback via Email:** If you don’t have a GitHub account and are
39-
unfamiliar with Git, you can send feedback via email to [[email protected]][contact]. However, using GitHub is preferred, as it allows us to respond more quickly and track discussions openly.
34+
### 2. Submitting Changes via Pull Requests
35+
36+
If you are comfortable using Git and would like to add or modify a functionality, you can submit a **pull request (PR)**. Instructions on how to contribute this way are provided in the next section.
37+
38+
### 3. Providing Feedback via Email
39+
40+
If you don’t have a GitHub account and are unfamiliar with Git, you can send feedback via email to [[email protected]][contact]. However, using GitHub is preferred, as it allows us to respond more quickly and track discussions openly.
4041

4142
> [!NOTE]
4243
> The documentation for [Git][git-docs] and [GitHub][github-docs] are easy to follow, and you can learn the basics using their official guides.

0 commit comments

Comments
 (0)