Skip to content
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
2 changes: 2 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# SCM syntax highlighting & preventing 3-way merges
pixi.lock merge=binary linguist-language=YAML linguist-generated=true
10 changes: 6 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
name: CI
on:
push:
branches:
- "main"
pull_request:

jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v4
- uses: astral-sh/setup-uv@v4
- uses: prefix-dev/[email protected]
with:
version: "latest"
- run: uv run mkdocs build
pixi-version: latest
- run: pixi run mkdocs build
- uses: actions/upload-artifact@v4
with:
name: Website
Expand Down
7 changes: 3 additions & 4 deletions .github/workflows/gh-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,14 @@ jobs:
run: |
git config user.name github-actions[bot]
git config user.email 41898282+github-actions[bot]@users.noreply.github.com
- uses: actions/checkout@v4
- uses: astral-sh/setup-uv@v4
- uses: prefix-dev/[email protected]
with:
version: "latest"
pixi-version: latest
- run: echo "cache_id=$(date --utc '+%V')" >> $GITHUB_ENV
- uses: actions/cache@v4
with:
key: mkdocs-material-${{ env.cache_id }}
path: .cache
restore-keys: |
mkdocs-material-
- run: uv run mkdocs gh-deploy --force
- run: pixi run mkdocs gh-deploy --force
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,7 @@
!docs/talks/assets
__pycache__
.DS_Store
# pixi environments
.pixi/*
!.pixi/config.toml
.cache
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
This website codebase uses `uv` and `mkdocs`. To get started (assuming you have `uv` installed):

- clone this repo and `cd` into it
- run `uv run python -m mkdocs serve` to set up the environment and run the development server
- run `pixi run mkdocs serve` to set up the environment and run the development server

This project also uses `pre-commit` which you can optionally run locally (though not required as it's run in the cloud anyway).

Expand Down
1 change: 1 addition & 0 deletions mkdocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ nav:
- calendar.md
- code-of-conduct.md
plugins:
- social
- macros
- mkdocs-jupyter:
ignore_h1_titles: True
4,832 changes: 4,832 additions & 0 deletions pixi.lock

Large diffs are not rendered by default.

19 changes: 19 additions & 0 deletions pixi.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
[workspace]
name = "CLAM"
version = "0.1.0"
description = "CLAM Website"
channels = ["conda-forge"]
platforms = ["linux-64", "osx-64", "osx-arm64", "win-64"]

[dependencies]
python = ">=3.10"
mkdocs = ">=1.6.1"
pydantic = ">=2.12.1"
pyyaml = ">=6.0.1"

# mkdocs
mkdocs-material = ">=9.5.50"
mkdocs-macros-plugin = ">=1.3.7"
mkdocs-jupyter = ">=0.25.1"
pillow = "*"
cairosvg = "*"
15 changes: 0 additions & 15 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,18 +1,3 @@
[project]
name = "CLAM"
version = "0.1.0"
description = "CLAM Website"
readme = "README.md"
requires-python = ">=3.10"
dependencies = [
"mkdocs-macros-plugin>=1.3.7",
"mkdocs>=1.6.1",
"mkdocs-jupyter>=0.25.1",
"mkdocs-material>=9.5.50",
"pydantic>=2.12.1",
"pyyaml>=6.0.1",
]

[tool.ruff]
select = [
"D", # pydocstyle
Expand Down
1,765 changes: 0 additions & 1,765 deletions uv.lock

This file was deleted.