Skip to content

Commit 8201ca2

Browse files
authored
Merge pull request #53 from jnywong/hub-activity
Add hub activity to current community partners page
2 parents d042f57 + 34399cb commit 8201ca2

File tree

8 files changed

+54
-12
lines changed

8 files changed

+54
-12
lines changed

.github/workflows/deploy_website.yml

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,22 @@ jobs:
3434
run: |
3535
pip install -r requirements.txt
3636
37+
3738
# (optional) Cache your executed notebooks between runs
3839
# if you have config:
39-
# execute:
40-
# execute_notebooks: cache
41-
# - name: cache executed notebooks
42-
# uses: actions/cache@v3
43-
# with:
44-
# path: _build/.jupyter_cache
45-
# key: jupyter-book-cache-${{ hashFiles('requirements.txt') }}
40+
execute:
41+
execute_notebooks: cache
42+
- name: cache executed notebooks
43+
uses: actions/cache@v3
44+
with:
45+
path: _build/.jupyter_cache
46+
key: jupyter-book-cache-${{ hashFiles('requirements.txt') }}
47+
48+
# Update git submodules
49+
- name: Update git submodules
50+
run: |
51+
git pull --recurse-submodules
52+
git submodule update --remote --recursive
4653
4754
# Build the book
4855
- name: Build the book

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
_build
2-
.ipynb_checkpoints
2+
.ipynb_checkpoints
3+
.env

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "catalystbook/hub-activity"]
2+
path = catalystbook/hub-activity
3+
url = https://github.com/czi-catalystproject/hub-activity.git

.readthedocs.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
# ref: https://docs.readthedocs.io/en/stable/config-file/v2.html
33
version: 2
44

5+
submodules:
6+
include: all
7+
recursive: true
58
build:
69
os: ubuntu-22.04
710
tools:
@@ -10,6 +13,7 @@ build:
1013
commands:
1114
- pip install -r requirements.txt
1215
- jupyter-book build catalystbook/
16+
- cat /home/docs/checkouts/readthedocs.org/user_builds/catalyst-website/checkouts/53/catalystbook/_build/html/reports/hub-activity/hub-activity.err.log
1317
- mkdir -p $READTHEDOCS_OUTPUT/html/
1418
- cp -r catalystbook/_build/html/* $READTHEDOCS_OUTPUT/html/
1519

catalystbook/_config.yml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,12 @@ logo: images/catalyst-logo/catalyst-logo-dark-bg-white.png
88
copyright: '2024'
99
description: >-
1010
This is The Catalyst Project brochure website, built with JupyterBook.
11+
# Patterns to skip when building the book. Can be glob-style (e.g. "*skip.ipynb")
12+
exclude_patterns : [_build, Thumbs.db, .DS_Store, "**.ipynb_checkpoints", hub-activity/README.md]
1113

12-
# Force re-execution of notebooks on each build.
1314
# See https://jupyterbook.org/content/execute.html
1415
execute:
15-
execute_notebooks: force
16+
execute_notebooks: auto
1617

1718
# Define the name of the latex output file for PDF builds
1819
latex:
@@ -70,15 +71,21 @@ parse:
7071

7172
# Localisation
7273
sphinx:
73-
# extra_extensions:
74+
extra_extensions:
75+
- myst_nb
7476
# - sphinx_inline_tabs
7577
config:
7678
language: en
7779
html_show_copyright: false
7880
html_last_updated_fmt: '%b %d, %Y'
81+
html_js_files:
82+
- https://cdn.plot.ly/plotly-2.31.1.min.js # NOTE: load plotly before require
83+
- https://cdnjs.cloudflare.com/ajax/libs/require.js/2.3.4/require.min.js
84+
suppress_warnings: ["mystnb.unknown_mime_type"]
7985
nb_render_priority:
8086
gettext: {}
8187
locale_dirs: ['locale/']
8288
gettext_compact: false
8389
gettext_additional_targets: ['literal-block']
8490
gettext_location: false
91+

catalystbook/current-community-partners.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
---
2+
jupytext:
3+
formats: md:myst
4+
text_representation:
5+
extension: .md
6+
format_name: myst
7+
format_version: 0.13
8+
jupytext_version: 1.16.1
9+
kernelspec:
10+
display_name: Python 3 (ipykernel)
11+
language: python
12+
name: python3
13+
---
14+
115
# Current community partners
216

317
During the initial phase the Catalyst Project aims to work with 10 community partners in Africa and a further 10 in Latin America. You can find the currently active community partners listed below. Where websites are available these are linked from each partner’s logo.
@@ -120,3 +134,7 @@ Medellín, Colombia
120134
:::
121135

122136
::::
137+
138+
```{raw} html
139+
:file: hub-activity/activity.html
140+
```

catalystbook/hub-activity

Submodule hub-activity added at bc5b922

requirements.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ pandas
44
matplotlib
55
pyyaml
66
requests
7-
jupyter-book
7+
jupyter-book>=1.0.0
8+
jupytext
89
sphinx
910
sphinx-autobuild
1011
sphinx-copybutton

0 commit comments

Comments
 (0)