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

Update from upstream #2

Merged
merged 46 commits into from
Oct 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
52f557c
fix yaml in side_effects_cpp #114 (#116)
martinjrobins Jun 7, 2024
f566af2
Fixes typos in packaging section
OllyK Jun 10, 2024
13043a3
Fixes incorrect format for pyproject.toml description
OllyK Jun 10, 2024
07b148f
#119 Resolve by replacing cython with Pandas
fcooper8472 Jun 10, 2024
db5a75a
Merge pull request #118 from OllyK/fix-pyproject-material
fcooper8472 Jun 10, 2024
79646e3
Merge pull request #120 from UNIVERSE-HPC/docker-cython-fix
fcooper8472 Jun 10, 2024
5689908
Markdown linting (#122)
alasdairwilson Jun 18, 2024
6d71c18
packaging_dependency_management: add pip command to install from dist…
abhidg Jun 18, 2024
4450d76
remove fix option md lint (#123)
alasdairwilson Jun 29, 2024
8c620d1
Correct python code blocks and syntax errors
fcooper8472 Jul 12, 2024
163656f
Fix syntax errors in pybamm material
fcooper8472 Jul 12, 2024
e6a01e0
Fix syntax error in maths matheral
fcooper8472 Jul 12, 2024
93e5747
Ensure space around code fence
fcooper8472 Jul 12, 2024
6d08f3c
Merge pull request #124 from UNIVERSE-HPC/syntax-intro-python
fcooper8472 Jul 12, 2024
b1c9e0c
Merge branch 'main' into syntax-maths
fcooper8472 Jul 12, 2024
6ff07a3
Merge pull request #126 from UNIVERSE-HPC/syntax-maths
fcooper8472 Jul 12, 2024
fdae835
Fix syntax errors in pybamm material (#125)
fcooper8472 Jul 12, 2024
5b82589
Display learning objectives in the lessons (#127)
eirini-zormpa Jul 12, 2024
fedcae7
Only lint on push to main (#128)
fcooper8472 Jul 12, 2024
8580e22
added python linting
alasdairwilson Jul 12, 2024
0791e7e
updated yaml
alasdairwilson Jul 12, 2024
0bca007
trigger workflow
alasdairwilson Jul 12, 2024
d205b75
trigger wf
alasdairwilson Jul 12, 2024
0bbd943
debug ci
alasdairwilson Jul 12, 2024
38d6f9b
Merge branch 'main' into pylint
alasdairwilson Jul 12, 2024
0330216
fix essential maths
alasdairwilson Jul 15, 2024
77b7598
MD-LINT for essential maths
alasdairwilson Jul 15, 2024
0a3bbc5
linted intro courses
alasdairwilson Jul 15, 2024
b1e8617
linted libraries
alasdairwilson Jul 15, 2024
d648c0a
lint software arch
alasdairwilson Jul 15, 2024
cfa5576
lint software project
alasdairwilson Jul 15, 2024
2142eaf
lint T&T
alasdairwilson Jul 15, 2024
a43fae9
missed a couple
alasdairwilson Jul 15, 2024
a41edc6
debug
alasdairwilson Jul 15, 2024
b600f84
trigger ci
alasdairwilson Jul 15, 2024
347b621
minor fixes
alasdairwilson Jul 15, 2024
9770a9c
migrate to oxrse
alasdairwilson Jul 15, 2024
ccc0b2c
typos
alasdairwilson Jul 15, 2024
5d35c2e
reinstate md fix
alasdairwilson Jul 16, 2024
3aeed3c
Merge pull request #131 from alasdairwilson/pylint
martinjrobins Jul 19, 2024
78ec0d9
Fixed inflammation datset paths.
smangham Oct 14, 2024
6d2a032
Fixed linter complaints
smangham Oct 14, 2024
33b801d
Fixed linting issues.
smangham Oct 14, 2024
a383157
Merge pull request #150 from smangham/issue-inflammation-paths
martinjrobins Oct 14, 2024
1c525ac
Add backgrounds to shell PNGs to fix transparency problems.
smangham Oct 14, 2024
36321aa
Merge pull request #154 from smangham/153-shell-images
martinjrobins Oct 14, 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
41 changes: 37 additions & 4 deletions .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
name: Check Markdown and Front Matter
name: Lint markdown files

on:
push:
branches:
- main
paths:
- '**/*.md'
- "**/*.md"
pull_request:
paths:
- '**/*.md'
- "**/*.md"

jobs:
check-markdown-yaml:
Expand All @@ -19,4 +21,35 @@ jobs:
- name: Run Front Matter Linting
uses: alasdairwilson/front-matter-lint@main
with:
directory: '.'
directory: "."

lint-python-codeblocks:
runs-on: ubuntu-latest

steps:
- name: Checkout code
uses: actions/checkout@v2

- name: Lint Python Code Blocks in Markdown
uses: OxfordRSE/lint-md-codeblocks@main
with:
directory: "."
language: "python"

lint-markdown:
runs-on: ubuntu-latest

steps:
- name: Checkout repository
uses: actions/checkout@v3

- name: Set up Node.js
uses: actions/setup-node@v3
with:
node-version: "20"

- name: Install markdownlint-cli
run: npm install -g markdownlint-cli

- name: Lint Markdown files
run: markdownlint '**/*.md' --ignore '*/*/slides/*' --ignore README.md
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@

.idea/
.DS_Store
*.code-workspace
*.code-workspace
.vscode
7 changes: 7 additions & 0 deletions .markdownlint.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
default: true
MD041: false # Ignore first line heading warnings (because we title set in front matters)
MD013: false # Ignore line length warnings
MD033:
allowed_elements: ["kbd"]
MD024:
siblings_only: true
41 changes: 24 additions & 17 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Contributing guidelines

To contribute new material, or update existing material please:

1. Create an issue on this repo with a description of the proposed change
2. Fork the repo and create a new branch. Add commits to your branch in your own fork with the changes. Please provide the issue number in each commit message, e.g. a commit message for issue number 5 might be "#5 added version control material"
3. When you are ready, open a pull request to merge your new commits to the `main` branch of this repo.
Expand All @@ -13,7 +14,7 @@ It is useful to see how your change is rendered into a webpage using the [Gutenb

The file structure in this repo defines the structure of the generated material, there are three levels of subdirectories, each with their own `index.md` file, which contains metadata:

```
```text
- index.md
- [theme.id]
- index.md
Expand All @@ -34,38 +35,39 @@ Each folder has an `index.md` with metadata for that theme/course/section.
### Material metadata

The top level `index.md` has a yaml block containing the keys:
- `id`, a string with a unique id for this material
- `name`, a string with the material title
- `themes`, an array of folder names of the themes within this material

- `id`, a string with a unique id for this material
- `name`, a string with the material title
- `themes`, an array of folder names of the themes within this material

The theme names correspond to subfolders in this repo. The rest of the content of this file is markdown formatted content with a top-level description of the material.

### Theme metadata

The theme level `index.md` has a yaml block containing the keys:

- `id`, a string with a unique id (unique within this material) for this theme
- `name`, a string with the theme title
- `courses`, an array of folder names of the courses within this material
- `id`, a string with a unique id (unique within this material) for this theme
- `name`, a string with the theme title
- `courses`, an array of folder names of the courses within this material

The course names correspond to subfolders in this theme folder. The rest of the content of this file is markdown formatted content with a top-level description of the theme.

### Course metadata

The course level `index.md` has a yaml block containing the keys:

- `id`, a string with a unique id (unique within this theme) for this theme
- `name`, a string with the theme title
- `files`, an array of filenames of the sections within this material
- `id`, a string with a unique id (unique within this theme) for this theme
- `name`, a string with the theme title
- `files`, an array of filenames of the sections within this material

The file names correspond to markdown files in this course folder. The rest of the content of this file is markdown formatted content with a top-level description of the course.

### Section metadata

Each section markdown file has a yaml block containing the keys. Note that the `id` of each section is implicitly defined from the filename, so a section filename `array.md` would have an id `array`.

- `name`, a string with the section title
- `dependsOn`, an array of identifiers indicating the pre-requisite sections/courses/themes for this section
- `name`, a string with the section title
- `dependsOn`, an array of identifiers indicating the pre-requisite sections/courses/themes for this section

Each entry in `dependsOn` indicates a course dependency using
`<theme.id>.<course.id>` or a section dependency using
Expand Down Expand Up @@ -115,7 +117,6 @@ The id must be unique within this particular section, and the title is any strin
The solution directive produces a section that is initially hidden, but which a
user can click to display. It can be written using the following syntax:


```pandoc
:::solution

Expand All @@ -126,7 +127,6 @@ The answer is 42.

Note that solutions can be nested within challenges by matching the number of colons:


```pandoc
::::challenge{id=big_question title="Hitchhikers question"}

Expand All @@ -141,10 +141,9 @@ The answer is 42.

### Callout directive

The callout directive produces a highlighted and bordered block of markdown content. It
The callout directive produces a highlighted and bordered block of markdown content. It
can be written using the following syntax:


```pandoc
:::callout

Expand All @@ -153,7 +152,9 @@ be found on [the series Wikipedia entry](https://en.wikipedia.org/wiki/The_Hitch

:::
```
Different variants/flavours of callout are available by using the syntax

Different variants/flavours of callout are available by using the syntax

```pandoc
:::callout{variant="variant"}
Text
Expand All @@ -165,19 +166,25 @@ Variants available are "danger", "warning", "tip", "discussion", "note" and "key
![image](https://private-user-images.githubusercontent.com/60351846/301895586-343ade2a-0c4e-4f20-9559-8e3a4986a523.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3MTQxMjkxMjcsIm5iZiI6MTcxNDEyODgyNywicGF0aCI6Ii82MDM1MTg0Ni8zMDE4OTU1ODYtMzQzYWRlMmEtMGM0ZS00ZjIwLTk1NTktOGUzYTQ5ODZhNTIzLnBuZz9YLUFtei1BbGdvcml0aG09QVdTNC1ITUFDLVNIQTI1NiZYLUFtei1DcmVkZW50aWFsPUFLSUFWQ09EWUxTQTUzUFFLNFpBJTJGMjAyNDA0MjYlMkZ1cy1lYXN0LTElMkZzMyUyRmF3czRfcmVxdWVzdCZYLUFtei1EYXRlPTIwMjQwNDI2VDEwNTM0N1omWC1BbXotRXhwaXJlcz0zMDAmWC1BbXotU2lnbmF0dXJlPThjYjRmMGVkYTJmNWRmNTZkZWQwYWUzMzI0MTg0N2I0M2Q4ZDBkYWJlMmMwOWU3MWNmYTkzMTdiYzFmZGRhZjAmWC1BbXotU2lnbmVkSGVhZGVycz1ob3N0JmFjdG9yX2lkPTAma2V5X2lkPTAmcmVwb19pZD0wIn0.I4hgqTxWYcVN9TXzcFjDcyxotBrq_-o0TFWuVlJXW14)

#### Danger

Used to inform students to be aware that there is a danger that they could break their development environment or lose data if an action is not performed correctly.

#### Warning

Used to warn students that they should be careful when performing a task in case there is a risk of a breaking change or issue arising that is less serious than something in the "danger" category or precautions to take to ensure good practice.

#### Tip

Used to inform students of a useful tip that may help them complete a task or help them in a wider context.

#### Discussion

Used to introduce a discussion topics as part of a training session or as a thinking point if completing the training individually, these help students better understand a concept.

#### Note

Used to highlight additional information that the student may wat to bear in mind when completing a task or thinking about a topic.

#### Key Points

Used to summarise the most essential or critical information in a topic. These can be takeaways or highlights that students should focus on.
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# About

This repository contains course materials that have been developed or adapted as part of the [UNIVERSE-HPC project](http://www.universe-hpc.ac.uk/).

If you are interested in working through the course materials **as a learner or instructor**, please do so through the [Gutenberg platform](https://train.oxrse.uk/material).
Expand All @@ -8,6 +9,7 @@ If you are interested in **contributing** material to this repository, please se
If you are interested in contributing to the Gutenberg web application, please do so [here](https://github.com/OxfordRSE/gutenberg)

## License

This work is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International License</a>.
This means that you are free to share and adapt the materials in this repository, as long as you provide attribution to the authors.
You can read the full terms in the [LICENSE file](LICENSE).
Expand Down
Loading
Loading