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

Update deps #566

Merged
merged 7 commits into from
Oct 26, 2020
Merged

Update deps #566

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1056666
Bump uvicorn from 0.12.1 to 0.12.2
dependabot[bot] Oct 26, 2020
3440c16
Bump pymatgen from 2020.10.9.1 to 2020.10.20
dependabot[bot] Oct 26, 2020
ffc44c4
Bump mongomock from 3.20.0 to 3.21.0
dependabot[bot] Oct 26, 2020
81398e9
Bump jarvis-tools from 2020.10.10 to 2020.10.20
dependabot[bot] Oct 26, 2020
dbc686c
Merge remote-tracking branches 'origin/dependabot/pip/master/mongomoc…
ml-evs Oct 26, 2020
de53ce5
Update setup.py
ml-evs Oct 26, 2020
e01d38c
Made dependabot run monthly
ml-evs Oct 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/dependabot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ updates:
- package-ecosystem: pip
directory: "/"
schedule:
interval: weekly
interval: monthly
# Needs to be larger than the number of total requirements (currently 31)
open-pull-requests-limit: 50
target-branch: master
Expand Down
4 changes: 2 additions & 2 deletions requirements-client.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
aiida-core==1.4.2
ase==3.20.1
numpy==1.19.2
pymatgen==2020.10.9.1
jarvis-tools==2020.10.10
pymatgen==2020.10.20
jarvis-tools==2020.10.20
4 changes: 2 additions & 2 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ lark-parser==0.10.1
pydantic==1.6.1
email_validator==1.1.1
requests==2.24.0
uvicorn==0.12.1
uvicorn==0.12.2
pymongo==3.11.0
mongomock==3.20.0
mongomock==3.21.0
django==3.1.2
elasticsearch-dsl==7.3.0
Jinja2==2.11.2
Expand Down
8 changes: 4 additions & 4 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,16 @@
# Server minded
django_deps = ["django>=2.2.9,<4.0"]
elastic_deps = ["elasticsearch-dsl>=6.4,<8.0"]
mongo_deps = ["pymongo~=3.11", "mongomock~=3.20"]
server_deps = ["uvicorn~=0.12.1", "Jinja2~=2.11"] + mongo_deps
mongo_deps = ["pymongo~=3.11", "mongomock~=3.21"]
server_deps = ["uvicorn~=0.12.2", "Jinja2~=2.11"] + mongo_deps

# Client minded
aiida_deps = ["aiida-core~=1.4.2"]
ase_deps = ["ase~=3.20"]
cif_deps = ["numpy~=1.19"]
pdb_deps = cif_deps
pymatgen_deps = ["pymatgen==2020.10.9.1"]
jarvis_deps = ["jarvis-tools==2020.10.10"]
pymatgen_deps = ["pymatgen==2020.10.20"]
jarvis_deps = ["jarvis-tools==2020.10.20"]
client_deps = cif_deps

# General
Expand Down