Skip to content

Commit

Permalink
Merge pull request #197 from pyiron/docs_theme
Browse files Browse the repository at this point in the history
update docs theme
  • Loading branch information
jan-janssen authored Jan 26, 2024
2 parents 13c01c0 + b3dd951 commit 2151d26
Show file tree
Hide file tree
Showing 7 changed files with 50 additions and 42 deletions.
33 changes: 17 additions & 16 deletions .ci_support/environment-docs.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
channels:
- conda-forge
dependencies:
- nbsphinx
- sphinx
- myst-parser
- numpy
- ase =3.22.1
- coverage
- numpy =1.26.3
- scipy =1.12.0
- spglib =2.2.0
- phonopy =2.21.0
- structuretoolkit =0.0.18
- seekpath =2.1.0
- lammps =2023.08.02
- pandas =2.2.0
- pylammpsmpi =0.2.11
- jinja2 =3.1.3
- nbsphinx
- sphinx
- sphinx_rtd_theme
- myst-parser
- numpy
- ase =3.22.1
- coverage
- numpy =1.26.3
- scipy =1.12.0
- spglib =2.2.0
- phonopy =2.21.0
- structuretoolkit =0.0.18
- seekpath =2.1.0
- lammps =2023.08.02
- pandas =2.2.0
- pylammpsmpi =0.2.11
- jinja2 =3.1.3
14 changes: 7 additions & 7 deletions atomistics/calculators/ase.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,13 +83,13 @@ def evaluate_with_ase(
ase_optimizer_kwargs=ase_optimizer_kwargs,
)
elif "optimize_positions_and_volume" in tasks:
results[
"structure_with_optimized_positions_and_volume"
] = optimize_positions_and_volume_with_ase(
structure=structure,
ase_calculator=ase_calculator,
ase_optimizer=ase_optimizer,
ase_optimizer_kwargs=ase_optimizer_kwargs,
results["structure_with_optimized_positions_and_volume"] = (
optimize_positions_and_volume_with_ase(
structure=structure,
ase_calculator=ase_calculator,
ase_optimizer=ase_optimizer,
ase_optimizer_kwargs=ase_optimizer_kwargs,
)
)
elif "calc_energy" in tasks or "calc_forces" in tasks or "calc_stress" in tasks:
return calc_static_with_ase(
Expand Down
14 changes: 7 additions & 7 deletions atomistics/calculators/lammps/calculator.py
Original file line number Diff line number Diff line change
Expand Up @@ -429,13 +429,13 @@ def evaluate_with_lammps_library(
):
results = {}
if "optimize_positions_and_volume" in tasks:
results[
"structure_with_optimized_positions_and_volume"
] = optimize_positions_and_volume_with_lammps(
structure=structure,
potential_dataframe=potential_dataframe,
lmp=lmp,
**lmp_optimizer_kwargs,
results["structure_with_optimized_positions_and_volume"] = (
optimize_positions_and_volume_with_lammps(
structure=structure,
potential_dataframe=potential_dataframe,
lmp=lmp,
**lmp_optimizer_kwargs,
)
)
elif "optimize_positions" in tasks:
results["structure_with_optimized_positions"] = optimize_positions_with_lammps(
Expand Down
22 changes: 11 additions & 11 deletions atomistics/calculators/qe.py
Original file line number Diff line number Diff line change
Expand Up @@ -227,17 +227,17 @@ def evaluate_with_qe(
):
results = {}
if "optimize_positions_and_volume" in tasks:
results[
"structure_with_optimized_positions_and_volume"
] = optimize_positions_and_volume_with_qe(
structure=structure,
calculation_name=calculation_name,
working_directory=working_directory,
kpts=kpts,
pseudopotentials=pseudopotentials,
tstress=tstress,
tprnfor=tprnfor,
**kwargs,
results["structure_with_optimized_positions_and_volume"] = (
optimize_positions_and_volume_with_qe(
structure=structure,
calculation_name=calculation_name,
working_directory=working_directory,
kpts=kpts,
pseudopotentials=pseudopotentials,
tstress=tstress,
tprnfor=tprnfor,
**kwargs,
)
)
elif "calc_energy" in tasks or "calc_forces" in tasks or "calc_stress" in tasks:
results = calc_static_with_qe(
Expand Down
Binary file added docs/_static/pyiron-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/_static/pyiron_logo.ico
Binary file not shown.
9 changes: 8 additions & 1 deletion docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,14 @@
# -- Options for HTML output -------------------------------------------------
# https://www.sphinx-doc.org/en/master/usage/configuration.html#options-for-html-output

html_theme = 'alabaster'
try:
import sphinx_rtd_theme
html_theme = 'sphinx_rtd_theme'
html_logo = "../_static/pyiron-logo.png"
html_favicon = "../_static/pyiron_logo.ico"
except ImportError:
html_theme = 'alabaster'

html_static_path = ['_static']


Expand Down

0 comments on commit 2151d26

Please sign in to comment.