Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge dependabot changes into develop branch #287

Merged
merged 27 commits into from
Jul 10, 2024
Merged

Merge dependabot changes into develop branch #287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
b947ab2
Pin numpy<2
AntObi Jul 3, 2024
329e2e4
Merge pull request #273 from AntObi/numpy
AntObi Jul 3, 2024
f5ac648
Bump certifi from 2024.2.2 to 2024.6.2
dependabot[bot] Jul 3, 2024
2537843
Bump requests from 2.32.0 to 2.32.3
dependabot[bot] Jul 3, 2024
67005f8
Bump pyupgrade from 3.8.0 to 3.16.0
dependabot[bot] Jul 3, 2024
0011555
Bump urllib3 from 2.1.0 to 2.2.2
dependabot[bot] Jul 3, 2024
055cad5
Bump fonttools from 4.47.0 to 4.53.0
dependabot[bot] Jul 3, 2024
4ce8344
Bump urllib3 from 2.0.7 to 2.2.2 in /docs
dependabot[bot] Jul 3, 2024
ee5939c
Merge dependabot/pip/certifi-2024.6.2 into combine-prs-branch
github-actions[bot] Jul 3, 2024
d1341a8
Merge dependabot/pip/pyupgrade-3.16.0 into combine-prs-branch
github-actions[bot] Jul 3, 2024
401b95f
Merge dependabot/pip/requests-2.32.3 into combine-prs-branch
github-actions[bot] Jul 3, 2024
4f6a39a
Merge dependabot/pip/fonttools-4.53.0 into combine-prs-branch
github-actions[bot] Jul 3, 2024
1c903ec
Merge dependabot/pip/urllib3-2.2.2 into combine-prs-branch
github-actions[bot] Jul 3, 2024
e0e7681
Merge dependabot/pip/docs/urllib3-2.2.2 into combine-prs-branch
github-actions[bot] Jul 3, 2024
9e30f52
Merge pull request #274 from WMD-group/combine-prs-branch
AntObi Jul 3, 2024
05555c7
Bump urllib3 from 2.2.1 to 2.2.2 in /requirements
dependabot[bot] Jul 3, 2024
b94268e
Bump certifi from 2023.7.22 to 2024.7.4 in /docs
dependabot[bot] Jul 6, 2024
1f99c64
Bump certifi from 2024.6.2 to 2024.7.4
dependabot[bot] Jul 6, 2024
0ba9174
Merge dependabot/pip/certifi-2024.7.4 into combine-prs-branch
github-actions[bot] Jul 8, 2024
00df8cb
Merge dependabot/pip/docs/certifi-2024.7.4 into combine-prs-branch
github-actions[bot] Jul 8, 2024
8f75486
Merge dependabot/pip/requirements/urllib3-2.2.2 into combine-prs-branch
github-actions[bot] Jul 8, 2024
0866db0
Merge pull request #279 from WMD-group/combine-prs-branch
AntObi Jul 8, 2024
ff88c55
Bump certifi from 2024.2.2 to 2024.7.4 in /requirements
dependabot[bot] Jul 8, 2024
c104ff4
Bump zipp from 3.17.0 to 3.19.1 in /docs
dependabot[bot] Jul 9, 2024
d0a1608
Merge dependabot/pip/docs/zipp-3.19.1 into combine-prs-branch
github-actions[bot] Jul 10, 2024
308c733
Merge dependabot/pip/requirements/certifi-2024.7.4 into combine-prs-b…
github-actions[bot] Jul 10, 2024
b126e9f
Merge pull request #284 from WMD-group/combine-prs-branch
AntObi Jul 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions docs/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ alabaster==0.7.13
# via sphinx
babel==2.12.1
# via sphinx
certifi==2023.7.22
certifi==2024.7.4
# via requests
charset-normalizer==3.2.0
# via requests
Expand Down 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
zipp==3.19.1
# via importlib-metadata
2 changes: 1 addition & 1 deletion requirements-dev.txt
View file
Open in desktop
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
View file
Open in desktop
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.7.4
# 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
4 changes: 2 additions & 2 deletions requirements/requirements-py310.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#
ase==3.22.1
# via SMACT (setup.py)
certifi==2024.2.2
certifi==2024.7.4
# via requests
charset-normalizer==3.3.2
# via requests
Expand Down Expand Up @@ -117,5 +117,5 @@ tzdata==2024.1
# via pandas
uncertainties==3.1.7
# via pymatgen
urllib3==2.2.1
urllib3==2.2.2
# via requests
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
test_suite="smact.tests.test",
install_requires=[
"scipy",
"numpy",
"numpy<2",
"spglib",
"pymatgen>=2024.2.20",
"ase",
Expand Down