Skip to content

Commit

Permalink
Merge pull request #259 from WMD-group/combine-prs-branch
Browse files Browse the repository at this point in the history
Combined PR
  • Loading branch information
AntObi authored Jun 3, 2024
2 parents 8a166bb + a18b00e commit 579e67c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ pre-commit ==3.3.3
black ==24.3.0
isort ==5.12.0
pytest ==8.2.0
nbqa ==1.7.0
nbqa ==1.8.5
pyupgrade ==3.8.0
pytest-cov ==5.0.0
8 changes: 4 additions & 4 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# pip-compile
#
ase==3.22.1
ase==3.23.0
# via SMACT (setup.py)
certifi==2024.2.2
# via requests
Expand All @@ -24,7 +24,7 @@ future==1.0.0
# via uncertainties
idna==3.7
# via requests
joblib==1.3.2
joblib==1.4.2
# via pymatgen
kiwisolver==1.4.5
# via matplotlib
Expand Down Expand Up @@ -52,7 +52,7 @@ numpy==1.26.2
# pymatgen
# scipy
# spglib
packaging==23.2
packaging==24.0
# via
# matplotlib
# plotly
Expand All @@ -66,7 +66,7 @@ pathos==0.3.2
# via SMACT (setup.py)
pillow==10.3.0
# via matplotlib
plotly==5.18.0
plotly==5.22.0
# via pymatgen
pox==0.3.4
# via pathos
Expand Down

0 comments on commit 579e67c

Please sign in to comment.