Skip to content

Commit 0f99904

Browse files
authored
Merge pull request #212 from ezmsg-org/dev
Prep for release from main
2 parents cf5a2fc + 7367d37 commit 0f99904

119 files changed

Lines changed: 9378 additions & 3537 deletions

File tree

Some content is hidden

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

.git-blame-ignore-revs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,5 @@
22
5b4c220154d33cac15a75d3d7d978a75e67f2b8a
33
# Ran `black` formatter on entire codebase and fixed non-standard line-endings with `dos2unix`.
44
4e4f20be40a73f2162a565732bae76ea0c812739
5+
# chore: ruff formatting
6+
5ca5711e7714042f23d1286abf946217d75318c2

.github/workflows/ci.yml

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,20 @@ name: Test package
22

33
on:
44
push:
5-
branches: [main]
5+
branches:
6+
- main
7+
- dev
68
pull_request:
7-
branches: [main]
9+
branches:
10+
- main
11+
- dev
812
workflow_dispatch:
913

1014
jobs:
11-
build:
15+
pytest:
1216
strategy:
1317
matrix:
14-
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
18+
python-version: ["3.10.15", "3.11"] # Omit until shutdown fixed: , "3.12", "3.13"]
1519
os:
1620
- "ubuntu-latest"
1721
- "windows-latest"
@@ -22,16 +26,13 @@ jobs:
2226
- uses: actions/checkout@v4
2327

2428
- name: Install uv
25-
uses: astral-sh/setup-uv@v2
29+
uses: astral-sh/setup-uv@v6
2630
with:
2731
enable-cache: true
28-
cache-dependency-glob: "uv.lock"
29-
30-
- name: Set up Python ${{ matrix.python-version }}
31-
run: uv python install ${{ matrix.python-version }}
32+
python-version: ${{ matrix.python-version }}
3233

3334
- name: Install the project
34-
run: uv sync --all-extras --dev
35+
run: uv sync
3536

3637
- name: Run tests
37-
run: uv run pytest tests
38+
run: uv run pytest tests --benchmark-disable

.github/workflows/docs.yml

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
name: Documentation
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
tags:
8+
- 'v*'
9+
pull_request:
10+
branches:
11+
- dev
12+
workflow_dispatch:
13+
14+
permissions:
15+
contents: read
16+
pages: write
17+
id-token: write
18+
19+
# Allow only one concurrent deployment
20+
concurrency:
21+
group: "pages"
22+
cancel-in-progress: false
23+
24+
jobs:
25+
build:
26+
runs-on: ubuntu-latest
27+
steps:
28+
- uses: actions/checkout@v4
29+
30+
- name: Install system dependencies
31+
run: sudo apt-get update && sudo apt-get install -y graphviz
32+
33+
- name: Install uv
34+
uses: astral-sh/setup-uv@v6
35+
with:
36+
enable-cache: true
37+
python-version: "3.12"
38+
39+
- name: Install the project
40+
run: uv sync --only-group docs
41+
42+
- name: Build documentation
43+
run: |
44+
cd docs
45+
uv run make html
46+
47+
- name: Add .nojekyll file
48+
run: touch docs/build/html/.nojekyll
49+
50+
- name: Upload artifact
51+
uses: actions/upload-pages-artifact@v3
52+
with:
53+
path: 'docs/build/html'
54+
55+
deploy:
56+
# Only deploy on push to main or release tags
57+
if: github.event_name == 'push' && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v'))
58+
environment:
59+
name: github-pages
60+
url: ${{ steps.deployment.outputs.page_url }}
61+
runs-on: ubuntu-latest
62+
needs: build
63+
steps:
64+
- name: Deploy to GitHub Pages
65+
id: deployment
66+
uses: actions/deploy-pages@v4

.github/workflows/publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- uses: actions/checkout@v4
2020

2121
- name: Install uv
22-
uses: astral-sh/setup-uv@v3
22+
uses: astral-sh/setup-uv@v6
2323

2424
- name: Build Package
2525
run: uv build

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ instance/
7070

7171
# Sphinx documentation
7272
docs/_build/
73+
docs/build/
7374
docs/source/_build
7475
docs/source/generated
7576

@@ -114,6 +115,7 @@ venv/
114115
ENV/
115116
env.bak/
116117
venv.bak/
118+
uv.lock
117119

118120
# Spyder project settings
119121
.spyderproject
@@ -141,3 +143,5 @@ cython_debug/
141143

142144
# JetBrains
143145
.idea/
146+
147+
*.local.json

.python-version

Lines changed: 0 additions & 1 deletion
This file was deleted.

.readthedocs.yaml

Lines changed: 0 additions & 13 deletions
This file was deleted.

README.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,19 @@ Note that it is generally recommended to install poetry into its own standalone
3737

3838
## Documentation
3939

40+
To build the documentation in this branch, install sphinx
41+
42+
```bash
43+
pip install sphinx
44+
```
45+
46+
Then change directory to the `docs/` folder and run the `make.bat` file with an html specification.
47+
48+
```bash
49+
cd docs
50+
uv run make.bat html
51+
```
52+
4053
https://ezmsg.readthedocs.io/en/latest/
4154

4255
`ezmsg` is very similar to [`labgraph`](https://www.github.com/facebookresearch/labgraph), so you might get a primer with their documentation and examples. Additionally, there are many examples provided in the examples/tests directories strewn throughout this repository.

docs/requirements.txt

Lines changed: 0 additions & 2 deletions
This file was deleted.
20 KB
Loading

0 commit comments

Comments
 (0)