diff --git a/.ci_support/environment-docs.yml b/.ci_support/environment-docs.yml index b8b88cfe..880f68a3 100644 --- a/.ci_support/environment-docs.yml +++ b/.ci_support/environment-docs.yml @@ -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 diff --git a/.ci_support/environment-old.yml b/.ci_support/environment-old.yml index dd56cf3f..579ccafa 100644 --- a/.ci_support/environment-old.yml +++ b/.ci_support/environment-old.yml @@ -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 diff --git a/.ci_support/environment.yml b/.ci_support/environment.yml index 48059173..ee2835fc 100644 --- a/.ci_support/environment.yml +++ b/.ci_support/environment.yml @@ -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 diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 08ae764a..0f17c41d 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -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: diff --git a/.github/workflows/dependabot.yml b/.github/workflows/dependabot.yml index c821b16c..8aefc495 100644 --- a/.github/workflows/dependabot.yml +++ b/.github/workflows/dependabot.yml @@ -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 "pyiron@mpie.de" diff --git a/docs/_static/pyiron-logo.png b/docs/_static/pyiron-logo.png new file mode 100644 index 00000000..8efd5b12 Binary files /dev/null and b/docs/_static/pyiron-logo.png differ diff --git a/docs/_static/pyiron_logo.ico b/docs/_static/pyiron_logo.ico new file mode 100644 index 00000000..f5270a0c Binary files /dev/null and b/docs/_static/pyiron_logo.ico differ diff --git a/docs/source/conf.py b/docs/source/conf.py index abd8317a..9b8bd7ab 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -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'] diff --git a/pysqa/utils/basic.py b/pysqa/utils/basic.py index ad8696c6..9b702a15 100644 --- a/pysqa/utils/basic.py +++ b/pysqa/utils/basic.py @@ -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'