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

Swap docs to MkDocs #158

Merged
merged 80 commits into from
Sep 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
80 commits
Select commit Hold shift + click to select a range
cf82cb2
wrap move @property outside of @temp_properties:
schlegelp Aug 31, 2024
56af3d4
TreeNeuron.soma_pos: allow setting to `None` (will also set .soma=None)
schlegelp Aug 31, 2024
c9b95e3
MeshNeuron: add .soma property for docs (raises helpful error)
schlegelp Aug 31, 2024
70570ac
BaseNeuron: add .soma and .bbox property for documentation
schlegelp Aug 31, 2024
24decf8
Volume: add .units property
schlegelp Aug 31, 2024
caa4a07
neuprint interface: drop neuPrint's fetch_skeleton function from module
schlegelp Aug 31, 2024
973ace9
drop screenshot() function
schlegelp Aug 31, 2024
106b55a
plotting settings: set default for `alpha` to None
schlegelp Aug 31, 2024
9feeffc
docstrings: changes all double ticks (``) to single (`)
schlegelp Aug 31, 2024
118d791
docstrings: change urls from ReST to markdown format
schlegelp Aug 31, 2024
bfe93e4
smat: move some docstrings from __init__ to class plus formatting
schlegelp Aug 31, 2024
7f2a974
NeuronList: implement | (__or__) operator to merge lists
schlegelp Aug 31, 2024
7cff686
eval_colors: make sure rgb is integer when color_range=255
schlegelp Aug 31, 2024
797ddc2
change sphinx :func/class: to mkdocs [func/class][] references
schlegelp Sep 1, 2024
9986d3c
plot2d: hide progress bar for less than 10 neurons
schlegelp Sep 1, 2024
61569a3
TreeNeuron.simple: drop soma to avoid retaining slab
schlegelp Sep 2, 2024
c3f7835
node_label_sorting: make sure sorting actually prioritizes branch length
schlegelp Sep 2, 2024
be7396e
small fixes for plot_1d:
schlegelp Sep 2, 2024
c2cfe62
plotting: allow passing per-neuron `alpha` values
schlegelp Sep 2, 2024
55ef235
plot2d: fix shade_by for meshes
schlegelp Sep 2, 2024
7539a00
Plotly plot settings: change default linewidth to 3 (1 is too thin)
schlegelp Sep 2, 2024
06d4e45
navis.Viewer: change default title "navis Viewer" -> "vispy Viewer"
schlegelp Sep 2, 2024
8b20426
plot2d: format docstring for mkdocs
schlegelp Sep 2, 2024
13d7e83
plot2d: (re-)add ax.set_aspect('equal') - turns out this is still needed
schlegelp Sep 3, 2024
abcd75c
BaseNeuron._clear_temp_attr: actually respect if the neuron is locked
schlegelp Sep 3, 2024
444cb05
BaseNeuron.pre/postsynapses: make type search capital insensitive
schlegelp Sep 3, 2024
ad67c1c
new method: NeuronList.get_neuron_attributes
schlegelp Sep 3, 2024
ddeca1a
new function: navis.graph.skeleton_adjacency_matrix
schlegelp Sep 3, 2024
8cbe2a0
MICrONS interfaces various fixes/improvements:
schlegelp Sep 3, 2024
36a6c4a
plot3d: small docstring fixes
schlegelp Sep 3, 2024
4d11df8
docstrings: change some missed :func: to markdown syntax
schlegelp Sep 3, 2024
e80237b
docs: swap to mkdocs
schlegelp Sep 3, 2024
4cc0aa5
requirements: add some missing mkdocs plugins
schlegelp Sep 3, 2024
35f42b4
CI docs: also install flybrains and cloud-volume
schlegelp Sep 3, 2024
4c9f321
plot2d: use `palette` for depth coloring (if provided)
schlegelp Sep 4, 2024
f0aeb21
docs: add two new tutorials
schlegelp Sep 4, 2024
3bb3586
docs: various small fixes & improvements
schlegelp Sep 4, 2024
87eacd5
update links to URLs in setup.py and README
schlegelp Sep 4, 2024
24d334d
docs: make `help()` calls static so as to not block tests
schlegelp Sep 4, 2024
20b7ab1
CI: switch to testing example .py files instead of notebooks
schlegelp Sep 4, 2024
8eacfb9
CI: fix syntax error in yml file
schlegelp Sep 4, 2024
e8f380e
CI: fix another syntax error in yml
schlegelp Sep 4, 2024
fa35199
CI: try fixing qt error in tutorial test
schlegelp Sep 4, 2024
9137c79
docs: use wide banner logo on home
schlegelp Sep 4, 2024
c15a2a0
requirements: bump minimum version for octarine-navis-plugin
schlegelp Sep 4, 2024
d56d551
CI: correctly set environment variables
schlegelp Sep 4, 2024
fc47573
changelog: add links to compare Github commit history
schlegelp Sep 4, 2024
94c943a
requirements: add caveclient and cloud-volume to "notebook-test"
schlegelp Sep 4, 2024
bc9c827
tests: minor cleanup
schlegelp Sep 4, 2024
8613921
CI: get and set CAVE secret for tutorial tests
schlegelp Sep 4, 2024
b4b3fe3
docs: fix morphology analysis tutorial
schlegelp Sep 4, 2024
05bf1dc
improve `connectors` parameter for plot2d and plot3d:
schlegelp Sep 4, 2024
01e333d
plot3d: correctly start a new viewer when `viewer="new"`
schlegelp Sep 4, 2024
834eeaa
plot3d with octarine backend: check if existing viewer has been closed
schlegelp Sep 4, 2024
4276cf5
neuprint.fetch_skeletons: account for empty neuronlists
schlegelp Sep 5, 2024
c2e7b48
new plotly parameters: `legend`, `legend_orientation` and `linestyle`
schlegelp Sep 5, 2024
f9f5942
plot2d: actually enable `connector` to specify which types to plot
schlegelp Sep 5, 2024
3e8f82e
docs: various small improvements and fixes
schlegelp Sep 5, 2024
3d6ec80
BaseNeuron: add _memory_usage to temporary attributes
schlegelp Sep 5, 2024
03479ac
CI: add script to download test data
schlegelp Sep 5, 2024
d405fdf
CI: use tutorial's own directory as working directory
schlegelp Sep 5, 2024
d15e877
CI: various fixes
schlegelp Sep 5, 2024
6f9601f
update changelog
schlegelp Sep 5, 2024
eb57aa7
CI: add download fof second (downsampled) transform
schlegelp Sep 5, 2024
cac8889
plot2d: also adjust view if axis is passed as `ax`
schlegelp Sep 5, 2024
3f6cb6c
docs: minor fixes
schlegelp Sep 5, 2024
20286fb
CI: fix typo
schlegelp Sep 5, 2024
5564f66
CI: skip no_plot examples during tutorial tests
schlegelp Sep 5, 2024
3cd59a9
CI: temporarily run the NBLAST example separately
schlegelp Sep 5, 2024
2e47ec9
CI: fix issue with a path
schlegelp Sep 5, 2024
65b98fd
plotting: change default for `radius` to "auto"
schlegelp Sep 5, 2024
d03d8ff
docs: minor fixes and improvements
schlegelp Sep 5, 2024
4cdacec
CI: avoid subprocesses for testing tutorials
schlegelp Sep 5, 2024
89c66ed
CI: drop temporary NBLAST test
schlegelp Sep 5, 2024
d5a5343
CI: redirect stdout and silence logging during testing tutorials
schlegelp Sep 5, 2024
5a4833e
CI: change working directory and close figures during tutorial tests
schlegelp Sep 6, 2024
c490fe9
CI: tutorials close ALL figures
schlegelp Sep 6, 2024
b4334fc
docs: small improvments
schlegelp Sep 6, 2024
b53a037
scalebars in plot2d:
schlegelp Sep 6, 2024
e9f3648
docs: various fixes and improvements
schlegelp Sep 6, 2024
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
54 changes: 54 additions & 0 deletions .github/workflows/build-docs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
name: Docs

permissions:
contents: write

on:
push:
branches:
- main

jobs:
deploy:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Set up Python 3.10
uses: actions/setup-python@v5
with:
python-version: '3.10'
- name: Install system libraries
run: |
sudo apt-get update -y -qq
sudo apt-get install -y libdbus-1-3 libxkbcommon-x11-0 libxcb-icccm4 \
libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 \
libxcb-xinerama0 libxcb-xinput0 graphviz graphviz-dev \
libegl1-mesa libgl1-mesa-dri libxcb-xfixes0-dev mesa-vulkan-drivers \
libxcb-cursor0
- name: Install Python dependencies
run: |
python -m pip install --upgrade pip
python -m pip install pathos pygraphviz neuron cloud-volume k3d scikit-image open3d
python -m pip install -e .[test-notebook,all,docs,flybrains,cloud-volume]
- name: Download test data
run: |
chmod +x download_test_data.sh
./download_test_data.sh
- name: Download downsampled test transform
run: |
mkdir -p -- $HOME/flybrain-data
curl -o $HOME/flybrain-data/JRC2018F_JRCFIB2018F.h5 https://flyem.mrc-lmb.cam.ac.uk/flyconnectome/misc/JRC2018F_JRCFIB2018F.h5
curl -o $HOME/flybrain-data/JRC2018F_FAFB.h5 https://flyem.mrc-lmb.cam.ac.uk/flyconnectome/misc/JRC2018F_FAFB.h5
- name: Build and deploy docs
uses: coactions/setup-xvfb@v1
env:
NEUPRINT_APPLICATION_CREDENTIALS: ${{ secrets.neuprint }}
INSECT_BRAIN_DB_USER: ${{ secrets.insect_brain_db_user }}
INSECT_BRAIN_DB_PASSWORD: ${{ secrets.insect_brain_db_password }}
CAVE_SECRET: ${{ secrets.cave_secret }}
NAVIS_PLOT3D_BACKEND: plotly
QT_QPA_PLATFORM: offscreen
with:
run: |
python -c "import os;from caveclient import CAVEclient;client=CAVEclient();client.auth.save_token(os.getenv('CAVE_SECRET'))"
mkdocs gh-deploy --force
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Notebooks
name: Test tutorials

on: [push]

Expand All @@ -24,19 +24,32 @@ jobs:
sudo apt-get install -y libdbus-1-3 libxkbcommon-x11-0 libxcb-icccm4 \
libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 \
libxcb-xinerama0 libxcb-xinput0 graphviz graphviz-dev \
libegl1-mesa libgl1-mesa-dri libxcb-xfixes0-dev mesa-vulkan-drivers
libegl1-mesa libgl1-mesa-dri libxcb-xfixes0-dev mesa-vulkan-drivers \
libxcb-cursor0
- name: Install dependencies
run: |
python -m pip install --upgrade pip
python -m pip install pathos pygraphviz neuron cloud-volume k3d scikit-image open3d
python -m pip install -e .[test-notebook,all]
- name: Run notebooks
- name: Download test data
run: |
chmod +x download_test_data.sh
./download_test_data.sh
- name: Download downsampled test transform
run: |
mkdir -p -- $HOME/flybrain-data
curl -o $HOME/flybrain-data/JRC2018F_JRCFIB2018F.h5 https://flyem.mrc-lmb.cam.ac.uk/flyconnectome/misc/JRC2018F_JRCFIB2018F.h5
curl -o $HOME/flybrain-data/JRC2018F_FAFB.h5 https://flyem.mrc-lmb.cam.ac.uk/flyconnectome/misc/JRC2018F_FAFB.h5
- name: Run tutorials
uses: coactions/setup-xvfb@v1
env:
NEUPRINT_APPLICATION_CREDENTIALS: ${{ secrets.neuprint }}
INSECT_BRAIN_DB_USER: ${{ secrets.insect_brain_db_user }}
INSECT_BRAIN_DB_PASSWORD: ${{ secrets.insect_brain_db_password }}
CAVE_SECRET: ${{ secrets.cave_secret }}
NAVIS_PLOT3D_BACKEND: plotly
QT_QPA_PLATFORM: offscreen
with:
run: |
export NAVIS_HEADLESS=TRUE
python tests/test_notebooks.py
python -c "import os;from caveclient import CAVEclient;client=CAVEclient();client.auth.save_token(os.getenv('CAVE_SECRET'))"
python tests/test_tutorials.py
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -132,3 +132,7 @@ ENV/
MANIFEST

tmp/

# Test data
mmc2
WannerAA*
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
NAVis is a Python 3 library for **N**euron **A**nalysis and **Vis**ualization.

## Documentation
NAVis is on [ReadTheDocs](http://navis.readthedocs.io/ "NAVis ReadTheDocs").
Visit our documentation [here](https://navis-org.github.io/navis/ "NAVis Documentation")!

## Features
* **polyglot**: work and convert between neuron skeletons, meshes, dotprops and images
Expand Down
225 changes: 0 additions & 225 deletions docs/Makefile

This file was deleted.

Binary file added docs/_static/NBLAST_score_mat_inv.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/_static/barcode.afdesign
Binary file not shown.
Binary file added docs/_static/barcode.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/_static/blender_console.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/_static/blender_logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/_static/blender_pip.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/_static/logo_new_banner.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/_static/neuprint_logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/_static/octarine_viewer.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/_static/pickle.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/_static/plotly_orbital.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
Loading
Loading