Skip to content

Commit

Permalink
Merge pull request #296 from WMD-group/combine-prs-branch
Browse files Browse the repository at this point in the history
Combined PR
  • Loading branch information
AntObi authored Aug 5, 2024
2 parents c9a97c3 + 623e3f6 commit f7a72b7
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
@@ -1,7 +1,7 @@
pre-commit ==3.3.3
black ==24.3.0
isort ==5.12.0
pytest ==8.2.0
pytest ==8.3.2
nbqa ==1.8.5
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 @@ -64,7 +64,7 @@ pandas==2.1.3
# pymatgen
pathos==0.3.2
# via SMACT (setup.py)
pillow==10.3.0
pillow==10.4.0
# via matplotlib
plotly==5.22.0
# via pymatgen
Expand All @@ -78,7 +78,7 @@ pymatgen==2023.11.12
# via SMACT (setup.py)
pyparsing==3.1.1
# via matplotlib
python-dateutil==2.9.0
python-dateutil==2.9.0.post0
# via
# matplotlib
# pandas
Expand Down Expand Up @@ -112,11 +112,11 @@ tabulate==0.9.0
# via pymatgen
tenacity==8.2.3
# via plotly
tqdm==4.66.3
tqdm==4.66.4
# via pymatgen
tzdata==2024.1
# via pandas
uncertainties==3.1.7
uncertainties==3.2.2
# via pymatgen
urllib3==2.2.2
# via requests

0 comments on commit f7a72b7

Please sign in to comment.