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

Use Jupyterbook rather than Sphinx #255

Merged
merged 10 commits into from
May 1, 2024
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
4 changes: 2 additions & 2 deletions .ci_support/build_notebooks.sh
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# execute notebooks
i=0;
for notebook in $(ls notebooks/*.ipynb); do
for notebook in $(ls *.ipynb); do
papermill ${notebook} ${notebook%.*}-out.${notebook##*.} -k "python3" || i=$((i+1));
done;

# push error to next level
if [ $i -gt 0 ]; then
exit 1;
fi;
fi;
1 change: 1 addition & 0 deletions .ci_support/environment-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,4 @@ dependencies:
- pandas =2.2.2
- pylammpsmpi =0.2.18
- jinja2 =3.1.3
- jupyter-book =1.0.0
3 changes: 2 additions & 1 deletion .github/workflows/notebooks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,5 @@ jobs:
run: |
pip install versioneer[toml]==0.29
pip install . --no-deps --no-build-isolation
./.ci_support/build_notebooks.sh
cd notebooks
../.ci_support/build_notebooks.sh
10 changes: 9 additions & 1 deletion .readthedocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,16 @@ build:
os: "ubuntu-22.04"
tools:
python: "mambaforge-22.9"
jobs:
pre_build:
# Generate the Sphinx configuration for this Jupyter Book so it builds.
- "cp README.md docs"
- "cp notebooks/*.ipynb docs"
- "jupyter-book config sphinx docs/"

# Build documentation in the docs/ directory with Sphinx
sphinx:
configuration: docs/source/conf.py
builder: html

# Optionally build your docs in additional formats such as PDF and ePub
formats: []
Expand All @@ -26,3 +32,5 @@ python:
install:
- method: pip
path: .
extra_requirements:
- sphinx
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# atomistics - Interfaces for atomistic simulation codes and workflows
# atomistics
[![Unittest](https://github.com/pyiron/atomistics/actions/workflows/unittests.yml/badge.svg)](https://github.com/pyiron/atomistics/actions/workflows/unittests.yml)
[![Coverage Status](https://coveralls.io/repos/github/pyiron/atomistics/badge.svg?branch=main)](https://coveralls.io/github/pyiron/atomistics?branch=main)
[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/pyiron/atomistics/HEAD)
Expand Down
3 changes: 1 addition & 2 deletions binder/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,14 @@ channels:
- conda-forge
dependencies:
- ase =3.22.1
- coverage
- numpy =1.26.4
- scipy =1.13.0
- spglib =2.4.0
- phonopy =2.22.1
- structuretoolkit =0.0.22
- seekpath =2.1.0
- gpaw =24.1.0
- lammps =2023.11.21
- lammps =2024.02.07
- pandas =2.2.2
- pylammpsmpi =0.2.18
- jinja2 =3.1.3
20 changes: 0 additions & 20 deletions docs/Makefile

This file was deleted.

14 changes: 14 additions & 0 deletions docs/_config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
title: atomistics
author: Jan Janssen
logo: images/pyiron-logo.png

execute:
execute_notebooks : off

repository:
url : https://github.com/pyiron/atomistics
path_to_book : ""

launch_buttons:
notebook_interface : jupyterlab
binderhub_url : https://mybinder.org
Binary file removed docs/_static/pyiron_logo.ico
Binary file not shown.
12 changes: 12 additions & 0 deletions docs/_toc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
format: jb-book
root: README
chapters:
- file: installation.md
- file: simulation_codes.ipynb
- file: lammps_workflows.ipynb
- file: materialproperties.md
sections:
- file: bulk_modulus_with_gpaw.ipynb
- file: thermal_expansion_with_lammps.ipynb
- file: free_energy_calculation.ipynb
- file: phasediagram.md
File renamed without changes.
35 changes: 0 additions & 35 deletions docs/make.bat

This file was deleted.

4 changes: 4 additions & 0 deletions docs/materialproperties.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Materials Properties
Demonstrate the calculation of common material properties with the `atomistics` package. The examples use different
simulation codes, still the examples are not simulation code specific. It is one of the core features of the `atomistics`
package that all simulation workflow to calculate a specific material property can be executed with all simulation codes.
3 changes: 3 additions & 0 deletions docs/phasediagram.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Phase Diagram
One of the goals of the `atomistics` package is to be able to calculate phase diagrams with ab-initio precision. Coming
soon.
File renamed without changes
41 changes: 0 additions & 41 deletions docs/source/conf.py

This file was deleted.

180 changes: 0 additions & 180 deletions docs/source/index.rst

This file was deleted.

Loading
Loading