Skip to content
Open
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
30 changes: 15 additions & 15 deletions .github/workflows/ci.yml

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is there two deployments for the docs here?

Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
cache: 'pip'
cache-dependency-path: |
setup.py
notebooks/requirements.txt
docs/notebooks/requirements.txt
- name: Install dependencies
run: |
pip install wheel pytest
Expand All @@ -46,26 +46,26 @@ jobs:
- name: Convert contributors csv to md
if: env.CONTINUE == 'true'
run: |
pip install -r notebooks/requirements.txt
pip install -r docs/notebooks/requirements.txt
python doc/convert_to_md.py
- name: Build the book
if: env.CONTINUE == 'true'
run: |
jupyter-book build notebooks/
touch notebooks/_build/html/.nojekyll
jupyter-book build docs/notebooks/
touch docs/notebooks/_build/html/.nojekyll
- name: Re-organize files
if: env.CONTINUE == 'true'
run: |
mkdir out
mv notebooks/_build/html out/docs
mv docs/notebooks/_build/html out/docs
mv test out/test
- name: Deploy notebook's html to DCE-DSC-MRI_TestResults repository
if: env.CONTINUE == 'true'
uses: cpina/github-action-push-to-another-repository@master
env:
API_TOKEN_GITHUB: ${{ secrets.DEMO_TOKEN }}
with:
source-directory: 'out'
destination-github-username: 'OSIPI'
destination-repository-name: 'DCE-DSC-MRI_TestResults'
user-email: zaki@live.ca
# - name: Deploy notebook's html to DCE-DSC-MRI_TestResults repository
# if: env.CONTINUE == 'true'
# uses: cpina/github-action-push-to-another-repository@master
# env:
# API_TOKEN_GITHUB: ${{ secrets.DEMO_TOKEN }}
# with:
# source-directory: 'out'
# destination-github-username: 'OSIPI'
# destination-repository-name: 'DCE-DSC-MRI_TestResults'
# user-email: zaki@live.ca
40 changes: 40 additions & 0 deletions .github/workflows/deploy.yml

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should probably use a newer version of python here.
Additionally, can you add comments about what the workflow is doing and why?
It should be clear that we first run the notebooks, then mkdocs gh-deploy --force builds the website (and also runs the hook to convert to md)

Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
name: Deploy MkDocs to GitHub Pages

on:
push:
branches:
- feat/mkdocs-migration

jobs:
deploy:
runs-on: ubuntu-latest

steps:
- name: Checkout source code
uses: actions/checkout@v3

- name: Set up Python 3.8
uses: actions/setup-python@v5
with:
python-version: '3.8'

- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install -r requirements.txt
pip install .

- name: Test with pytest
run: |
pytest .

- name: Execute notebooks before building docs
run: |
find docs/notebooks -type f -name "*.ipynb" ! -path "*/old_nb/*" | while read nb; do
echo "Executing $nb"
jupyter nbconvert --to notebook --execute --inplace "$nb"
done

- name: Deploy to GitHub Pages
run: |
mkdocs gh-deploy --force
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -150,8 +150,8 @@ cython_debug/
test/results-old

# notebook data
notebooks/data
notebooks/_build
docs/notebooks/data
docs/notebooks/_build

# test results (these are commited to separate repository)
/results
Expand Down
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@


- [code database with links to source code](https://osipi.github.io/DCE-DSC-MRI_TestResults/overview_of_code_collection.html)
- [test-results website](https://osipi.github.io/DCE-DSC-MRI_TestResults/intro.html)
- [test-results website](https://osipi.github.io/DCE-DSC-MRI_TestResults/index.html)

The ISMRM Open Science Initiative for Perfusion Imaging ([OSIPI](https://osipi.ismrm.org)) aims to promote the sharing of perfusion imaging software in order to reduce duplication, improve reproducibility and speed up translation. This **DCE-DSC-MRI_CodeCollection** code library is maintained by [Taskforce 2.3](https://osipi.github.io/task-force-2-3/) of OSIPI and aims to collect, test and share open-source perfusion imaging code for use in research and software development. Code contributions can include modules covering one or more steps within the image processing pipeline, for example T1 mapping, converting signal to concentration and pharmacokinetic modelling. A further aim of OSIPI is to develop a fully tested and harmonised code library, drawing on the contributions within this repository.

Expand Down Expand Up @@ -39,8 +39,9 @@ Wiki # Information and guidelines
Click [here](https://osipi.github.io/DCE-DSC-MRI_TestResults/overview_of_code_collection.html) for
database of code available with links to code.

The results of the validated code are published on the [test-results website](https://osipi.github.io/DCE-DSC-MRI_TestResults/intro.html), which is hosted via a separate [repository](https://github.com/OSIPI/DCE-DSC-MRI_TestResults).
The results of the validated code are published on the [test-results website](https://osipi.github.io/DCE-DSC-MRI_TestResults/index.html), which is hosted via a separate [repository](https://github.com/OSIPI/DCE-DSC-MRI_TestResults).



This is an ongoing project, we welcome new contributions. If you would like to contribute to the OSIPI initiative please email the contacts listed on our [website](https://osipi.github.io/task-force-2-3/).

2 changes: 1 addition & 1 deletion doc/convert_to_md.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

df = pd.read_csv('doc/code_contributions_record.csv')
md = df.to_markdown(index=False).replace("(../", "(https://github.com/OSIPI/DCE-DSC-MRI_CodeCollection/tree/develop/")
with open('notebooks/overview_of_code_collection.md', 'w') as f:
with open('docs/notebooks/overview_of_code_collection.md', 'w') as f:
f.write("# Overview of code collection\n\n")
f.write(md)
Binary file added docs/assets/osipiImgs/OSIPI_logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/assets/osipiImgs/OSIPI_logo_only_square.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
Binary file added docs/assets/osipiImgs/osipi_logo.ico
Binary file not shown.
8 changes: 8 additions & 0 deletions docs/assets/stylesheets/extra.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
.md-grid {
max-width: 90vw;
}

.md-header__button.md-logo{
padding-bottom: 18px;
scale: 1.2;
}
File renamed without changes.
12 changes: 12 additions & 0 deletions docs/js/mathjax-config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
window.MathJax = {
tex: {
inlineMath: [['$', '$'], ['\\(', '\\)']],
displayMath: [['$$', '$$'], ['\\[', '\\]']],
processEscapes: true,
processEnvironments: true
},
options: {
skipHtmlTags: ['script', 'noscript', 'style', 'textarea', 'pre']
}
};

919 changes: 919 additions & 0 deletions docs/notebooks/2CUM.ipynb

Large diffs are not rendered by default.

1,013 changes: 1,013 additions & 0 deletions docs/notebooks/2CXM.ipynb

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

File renamed without changes.
2 changes: 2 additions & 0 deletions notebooks/DCEmodels.md → docs/notebooks/DCEmodels.md

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are markdown files in the notebooks that should be organized separately. You will need to fix any reference links to these files as well.

Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,14 @@ DCE models
====================

Several perfusion models are currently available in the code respository:

- Tofts model
- extended Tofts model
- Patlak model
- 2-compartment exchange model
- 2-compartment uptake model

Not tested yet:

- dual inlet models
- [to be extended]
File renamed without changes.
439 changes: 439 additions & 0 deletions docs/notebooks/DSC_pars.ipynb

Large diffs are not rendered by default.

984 changes: 984 additions & 0 deletions docs/notebooks/ExtendedToftsModel.ipynb

Large diffs are not rendered by default.

358 changes: 358 additions & 0 deletions docs/notebooks/GeorgiouAIF.ipynb

Large diffs are not rendered by default.

485 changes: 485 additions & 0 deletions docs/notebooks/ParkerAIF.ipynb

Large diffs are not rendered by default.

736 changes: 736 additions & 0 deletions docs/notebooks/PatlakModel.ipynb

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ Population arterial Input function
====================

This part describes the results for the population arterial input functions:

- Parker AIF
- Georgiou AIF
- preclinical AIF
541 changes: 541 additions & 0 deletions docs/notebooks/PreclinicalAIF.ipynb

Large diffs are not rendered by default.

Loading