Skip to content

Commit

Permalink
Merge pull request #274 from WMD-group/combine-prs-branch
Browse files Browse the repository at this point in the history
Combined PR
  • Loading branch information
AntObi authored Jul 3, 2024
2 parents 329e2e4 + e0e7681 commit 9e30f52
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion docs/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ sphinxcontrib-qthelp==1.0.3
# via sphinx
sphinxcontrib-serializinghtml==1.1.5
# via sphinx
urllib3==2.0.7
urllib3==2.2.2
# via requests
zipp==3.17.0
# via importlib-metadata
2 changes: 1 addition & 1 deletion requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ black ==24.3.0
isort ==5.12.0
pytest ==8.2.0
nbqa ==1.8.5
pyupgrade ==3.8.0
pyupgrade ==3.16.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 @@ -6,7 +6,7 @@
#
ase==3.23.0
# via SMACT (setup.py)
certifi==2024.2.2
certifi==2024.6.2
# via requests
charset-normalizer==3.3.2
# via requests
Expand All @@ -18,7 +18,7 @@ dill==0.3.8
# via
# multiprocess
# pathos
fonttools==4.47.0
fonttools==4.53.0
# via matplotlib
future==1.0.0
# via uncertainties
Expand Down Expand Up @@ -86,7 +86,7 @@ pytz==2024.1
# via pandas
pyyaml==6.0.1
# via pybtex
requests==2.32.0
requests==2.32.3
# via pymatgen
ruamel-yaml==0.18.6
# via pymatgen
Expand Down Expand Up @@ -118,5 +118,5 @@ tzdata==2024.1
# via pandas
uncertainties==3.1.7
# via pymatgen
urllib3==2.1.0
urllib3==2.2.2
# via requests

0 comments on commit 9e30f52

Please sign in to comment.