Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/pip/jinja2-3.1.4
Browse files Browse the repository at this point in the history
  • Loading branch information
jan-janssen authored May 11, 2024
2 parents 4d84344 + 7172430 commit 99a0b88
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .ci_support/environment-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ dependencies:
- pympipool =0.8.1
- pysqa =0.1.20
- pytables =3.9.2
- sqlalchemy =2.0.29
- sqlalchemy =2.0.30
- tqdm =4.66.2
- traitlets =5.14.3
- jupyter-book =1.0.0
2 changes: 1 addition & 1 deletion .ci_support/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@ dependencies:
- pympipool =0.8.1
- pysqa =0.1.20
- pytables =3.9.2
- sqlalchemy =2.0.29
- sqlalchemy =2.0.30
- tqdm =4.66.2
- traitlets =5.14.3
14 changes: 6 additions & 8 deletions binder/postBuild
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
# pip install master
pip install .
pip install versioneer[toml]==0.29
pip install . --no-deps --no-build-isolation

# copy notebooks
mv notebooks/*.ipynb .

# clean up
if [ -d "notebooks" ]; then
mv notebooks/* .
fi
if [ -d "${HOME}/pyiron_base" ]; then
rm -r ${HOME}/binder ${HOME}/.ci_support ${HOME}/.github ${HOME}/pyiron_base ${HOME}/tests ${HOME}/notebooks
rm ${HOME}/LICENSE ${HOME}/MANIFEST.in ${HOME}/setup.cfg ${HOME}/setup.py ${HOME}/versioneer.py ${HOME}/CONTRIBUTING.rst ${HOME}/README.rst ${HOME}/CODE_OF_CONDUCT.md
fi
rm -rf .ci_support .github binder docs notebooks pyiron_base pyiron_base.egg-info specs test_benchmarks tests update_scripts .coveralls.yml .gitattributes .gitignore .gitpod .readthedocs.yml .wci.yml CHANGELOG.md CITATION.cff CODE_OF_CONDUCT.md CONTRIBUTING.rst LICENSE MANIFEST.in README.md pyproject.toml setup.py build
7 changes: 4 additions & 3 deletions docs/_config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@ execute:
execute_notebooks : off

repository:
url : https://github.com/pyiron/pyiron_base
path_to_book : ""
url : https://github.com/pyiron/pyiron_base
html:
use_repository_button: true

launch_buttons:
notebook_interface : jupyterlab
Expand All @@ -22,4 +23,4 @@ sphinx:
- 'sphinx.ext.autosummary'
config:
autosummary_generate: True
templates_path: ['_templates']
templates_path: ['_templates']
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ dependencies = [
"pyfileindex==0.0.24",
"pympipool==0.8.1",
"pysqa==0.1.20",
"sqlalchemy==2.0.29",
"sqlalchemy==2.0.30",
"tables==3.9.2",
"tqdm==4.66.2",
"traitlets==5.14.3",
Expand Down

0 comments on commit 99a0b88

Please sign in to comment.