Skip to content

Commit

Permalink
Merge pull request #216 from WMD-group/combine-prs-branch
Browse files Browse the repository at this point in the history
Combined PR
  • Loading branch information
AntObi committed Feb 5, 2024
2 parents d1936a8 + 987d05e commit 25baae2
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 8 deletions.
2 changes: 1 addition & 1 deletion docs/requirements.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Defining the exact version will make sure things don't break
sphinx==5.3.0
sphinx_rtd_theme==1.1.1
sphinx_rtd_theme==2.0.0
readthedocs-sphinx-search==0.3.2
11 changes: 7 additions & 4 deletions docs/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -33,23 +33,26 @@ pygments==2.16.1
pytz==2023.3.post1
# via babel
readthedocs-sphinx-search==0.3.2
# via -r requirements.in
# via -r docs/requirements.in
requests==2.31.0
# via sphinx
snowballstemmer==2.2.0
# via sphinx
sphinx==5.3.0
# via
# -r requirements.in
# -r docs/requirements.in
# sphinx-rtd-theme
sphinx-rtd-theme==1.1.1
# via -r requirements.in
# sphinxcontrib-jquery
sphinx-rtd-theme==2.0.0
# via -r docs/requirements.in
sphinxcontrib-applehelp==1.0.4
# via sphinx
sphinxcontrib-devhelp==1.0.2
# via sphinx
sphinxcontrib-htmlhelp==2.0.1
# via sphinx
sphinxcontrib-jquery==4.1
# via sphinx-rtd-theme
sphinxcontrib-jsmath==1.0.1
# via sphinx
sphinxcontrib-qthelp==1.0.3
Expand Down
4 changes: 2 additions & 2 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
pre-commit ==3.3.3
black ==23.12.1
black ==24.1.1
isort ==5.12.0
pytest ==7.4.4
pytest ==8.0.0
nbqa ==1.7.0
pyupgrade ==3.8.0
pytest-cov ==4.1.0
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ plotly==5.18.0
# via pymatgen
pox==0.3.3
# via pathos
ppft==1.7.6.7
ppft==1.7.6.8
# via pathos
pybtex==0.24.0
# via pymatgen
Expand Down

0 comments on commit 25baae2

Please sign in to comment.