Skip to content

Commit 789d8f1

Browse files
committed
merge conflicts
2 parents 790b700 + 291e056 commit 789d8f1

25 files changed

+587
-828
lines changed

.github/workflows/deploy.yml

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
# This file was created automatically with `myst init --gh-pages` 🪄 💚
2+
# Ensure your GitHub Pages settings for this repository are set to deploy with **GitHub Actions**.
3+
4+
name: MyST GitHub Pages Deploy
5+
on:
6+
push:
7+
# Runs on pushes targeting the default branch
8+
branches: [main]
9+
env:
10+
# `BASE_URL` determines the website is served from, including CSS & JS assets
11+
# You may need to change this to `BASE_URL: /${{ github.event.repository.name }}`
12+
BASE_URL: '' # Not required for 'projectpythia-mystmd.github.io' domain. Other repos will need to set this!
13+
14+
# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
15+
permissions:
16+
contents: read
17+
pages: write
18+
id-token: write
19+
# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
20+
# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
21+
concurrency:
22+
group: 'pages'
23+
cancel-in-progress: false
24+
jobs:
25+
deploy:
26+
environment:
27+
name: github-pages
28+
url: ${{ steps.deployment.outputs.page_url }}
29+
runs-on: ubuntu-latest
30+
steps:
31+
- uses: actions/checkout@v4
32+
- name: Setup Pages
33+
uses: actions/configure-pages@v3
34+
- uses: actions/setup-node@v4
35+
with:
36+
node-version: 18.x
37+
- name: Install MyST Markdown
38+
run: npm install -g mystmd
39+
- uses: actions/setup-python@v5
40+
with:
41+
python-version: '3.12'
42+
cache: 'pip'
43+
- name: Install Python dependencies
44+
run: pip install -r requirements.txt
45+
- name: Build HTML Assets
46+
run: myst build --html --execute
47+
# Only expose secrets here
48+
env:
49+
PRIVATE_KEY: ${{ secrets.PRIVATE_KEY }}
50+
PRIVATE_KEY_ID: ${{ secrets.PRIVATE_KEY_ID }}
51+
- name: Upload artifact
52+
uses: actions/upload-pages-artifact@v3
53+
with:
54+
path: './_build/html'
55+
- name: Deploy to GitHub Pages
56+
id: deployment
57+
uses: actions/deploy-pages@v4

.github/workflows/publish-site.yaml

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

CONTRIBUTING.md

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,14 @@ contribution guidelines (such as detailed description of Project
77
Pythia structure, forking, repository cloning, branching, etc.).
88

99
## Instructions for adding a blog post
10-
11-
We use [Sphinx ABblog](https://ablog.readthedocs.io/en/stable/) to add blog posts to our site.
12-
1310
Within the `portal/posts/` folder add your `.md` blog file with the following heading:
1411

1512
```
1613
---
17-
blogpost: true
18-
date: MON DD, YYYY
14+
15+
date: YYYY-MM-DD
1916
author: First Last
20-
tags: sample-tag
17+
tags: [sample-tag]
2118
---
2219
```
2320

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
[![nightly-build](https://github.com/ProjectPythia/projectpythia.github.io/actions/workflows/nightly-build.yaml/badge.svg)](https://github.com/ProjectPythia/projectpythia.github.io/actions/workflows/nightly-build.yaml)
44

55
This is the source repository for the [Project Pythia portal](https://projectpythia.org).
6-
The portal site is built with [sphinx](https://www.sphinx-doc.org/).
6+
The portal site is built with [MyST-MD](https://mystmd.org/).
77

88
Information on contributing is available [here](CONTRIBUTING.md)

environment.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,8 @@ channels:
33
- conda-forge
44
- nodefaults
55
dependencies:
6-
- ablog
76
- matplotlib
8-
- myst-nb
97
- pandas
108
- pre-commit
119
- pyyaml
12-
- sphinx-pythia-theme
13-
- sphinx-design
14-
- sphinx-copybutton
10+
- mystmd

myst.yml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
# See docs at: https://mystmd.org/guide/frontmatter
2+
version: 1
3+
extends:
4+
- https://raw.githubusercontent.com/projectpythia/pythia-config/main/pythia.yml
5+
project:
6+
id: 770e49e5-344a-4c46-adaa-3afb060b2085
7+
# title:
8+
# description:
9+
keywords: []
10+
authors: []
11+
github: https://github.com/projectpythia/projectpythia.github.io
12+
# bibliography: []
13+
14+
toc:
15+
- file: portal/index.md
16+
- file: portal/about.md
17+
- title: Blog
18+
children:
19+
- pattern: portal/posts/*.md
20+
- file: portal/contributing.md
21+
- file: portal/cookbook-guide.md
22+
- file: portal/metrics.md
23+
site:
24+
template: book-theme
25+
actions:
26+
- title: Learn More
27+
url: https://mystmd.org/guide
28+
domains: []
29+
options:
30+
style: style.css

0 commit comments

Comments
 (0)