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 docs theme #255

Merged
merged 3 commits into from
Jan 26, 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
15 changes: 12 additions & 3 deletions .ci_support/environment-docs.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
channels:
- conda-forge
dependencies:
- nbsphinx
- sphinx
- myst-parser
- nbsphinx
- sphinx
- sphinx_rtd_theme
- myst-parser
- defusedxml =0.7.1
- pandas =2.2.0
- pyyaml =6.0.1
- jinja2 =3.1.3
- paramiko =3.4.0
- tqdm =4.66.1
- pympipool =0.7.9
- cloudpickle =3.0.0
18 changes: 9 additions & 9 deletions .ci_support/environment-old.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
channels:
- conda-forge
- conda-forge
dependencies:
- defusedxml =0.7.0
- pandas =1.5.3
- pyyaml =5.3.1
- jinja2 =2.11.3
- paramiko =2.7.1
- tqdm =4.66.1
- pympipool =0.7.0
- cloudpickle =2.2.1
- defusedxml =0.7.0
- pandas =1.5.3
- pyyaml =5.3.1
- jinja2 =2.11.3
- paramiko =2.7.1
- tqdm =4.66.1
- pympipool =0.7.0
- cloudpickle =2.2.1
20 changes: 10 additions & 10 deletions .ci_support/environment.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
channels:
- conda-forge
- conda-forge
dependencies:
- defusedxml =0.7.1
- coverage
- pandas =2.2.0
- pyyaml =6.0.1
- jinja2 =3.1.3
- paramiko =3.4.0
- tqdm =4.66.1
- pympipool =0.7.9
- cloudpickle =3.0.0
- defusedxml =0.7.1
- coverage
- pandas =2.2.0
- pyyaml =6.0.1
- jinja2 =3.1.3
- paramiko =3.4.0
- tqdm =4.66.1
- pympipool =0.7.9
- cloudpickle =3.0.0
2 changes: 1 addition & 1 deletion .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- name: Setup environment
run: |
cp .ci_support/environment.yml environment.yml
echo " - flux-core" >> environment.yml
echo "- flux-core" >> environment.yml
- name: Setup Mambaforge
uses: conda-incubator/setup-miniconda@v2
with:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ jobs:
from=$(echo "$PR_TITLE" | awk '{print $4}')
to=$(echo "$PR_TITLE" | awk '{print $6}')
sed -i "/${package}/s/${from}/${to}/g" .ci_support/environment.yml
sed -i "/${package}/s/${from}/${to}/g" .ci_support/environment-docs.yml
- name: UpdateDependabotPR commit
run: |
git config --local user.email "[email protected]"
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 @@ -24,5 +24,12 @@
# -- 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']
8 changes: 5 additions & 3 deletions pysqa/utils/basic.py
Original file line number Diff line number Diff line change
Expand Up @@ -524,9 +524,11 @@ def _value_in_range(cls, value, value_min=None, value_max=None):

if value is not None:
value_, value_min_, value_max_ = [
cls._memory_spec_string_to_value(v)
if v is not None and isinstance(v, str)
else v
(
cls._memory_spec_string_to_value(v)
if v is not None and isinstance(v, str)
else v
)
for v in (value, value_min, value_max)
]
# ATTENTION: '60000' is interpreted as '60000M' since default magnitude is 'M'
Expand Down
Loading