Skip to content

Commit

Permalink
Update dependencies (#725)
Browse files Browse the repository at this point in the history
Update dependencies:

* Bump uvicorn from 0.13.3 to 0.13.4
* Bump django from 3.1.6 to 3.1.7
* Bump lark-parser from 0.11.1 to 0.11.2
* Bump mkdocstrings from 0.14.0 to 0.15.0
* Bump pylint from 2.6.0 to 2.7.2
* Bump mkdocs-material from 6.2.8 to 7.0.3
* Bump jarvis-tools from 2020.11.27 to 2021.2.22
* Bump pymatgen from 2021.2.8.1 to 2021.2.16 (for Python 3.7+)

Install specific pymatgen depending on Python version.
This is due to the numpy sub-dependency.

Update setup.py with new dependencies.

Fix get_min_ver() test utility function for special dependencies.
This involves (at the moment) only `pymatgen`, which is python version
dependant, concerning which version to install.

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
  • Loading branch information
CasperWA and dependabot[bot] committed Mar 1, 2021
1 parent 506373c commit 51453c9
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 17 deletions.
5 changes: 3 additions & 2 deletions requirements-client.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@ aiida-core==1.5.2
ase==3.21.1
numpy==1.20.1 ; python_version > '3.6'
numpy==1.19.5 ; python_version < '3.7'
pymatgen==2021.2.8.1
jarvis-tools==2020.11.27
pymatgen==2021.2.16; python_version > '3.6'
pymatgen==2021.2.8.1; python_version < '3.7'
jarvis-tools==2021.2.22
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 @@ pytest==6.2.2
pytest-cov==2.11.1
codecov==2.1.11
jsondiff==1.2.0
pylint==2.6.0
pylint==2.7.2
pre-commit==2.10.1
invoke==1.5.0
4 changes: 2 additions & 2 deletions requirements-docs.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
mkdocs==1.1.2
mkdocs-awesome-pages-plugin==2.5.0
mkdocs-material==6.2.8
mkdocs-material==7.0.3
mkdocs-minify-plugin==0.4.0
mkdocstrings==0.14.0
mkdocstrings==0.15.0
6 changes: 3 additions & 3 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
fastapi==0.63.0
lark-parser==0.11.1
lark-parser==0.11.2
pydantic==1.6.1
email_validator==1.1.2
requests==2.25.1
uvicorn==0.13.3
uvicorn==0.13.4
pymongo==3.11.3
mongomock==3.22.1
django==3.1.6
django==3.1.7
elasticsearch-dsl==7.3.0
Jinja2==2.11.3
typing-extensions==3.7.4.3
19 changes: 11 additions & 8 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,24 +20,27 @@
django_deps = ["django>=2.2.9,<4.0"]
elastic_deps = ["elasticsearch-dsl>=6.4,<8.0"]
mongo_deps = ["pymongo~=3.11", "mongomock~=3.22"]
server_deps = ["uvicorn~=0.13.3", "Jinja2~=2.11"] + mongo_deps
server_deps = ["uvicorn~=0.13.4", "Jinja2~=2.11"] + mongo_deps

# Client minded
aiida_deps = ["aiida-core~=1.5.2"]
ase_deps = ["ase~=3.21"]
cif_deps = ["numpy~=1.19"] # Keep at 1.19 for Python 3.6 support
pdb_deps = cif_deps
pymatgen_deps = ["pymatgen==2021.2.8.1"]
jarvis_deps = ["jarvis-tools==2020.11.27"]
pymatgen_deps = [
"pymatgen==2021.2.8.1;python_version<'3.7'",
"pymatgen==2021.2.16;python_version>'3.6'",
]
jarvis_deps = ["jarvis-tools==2021.2.22"]
client_deps = cif_deps

# General
docs_deps = [
"mkdocs~=1.1",
"mkdocs-awesome-pages-plugin~=2.5",
"mkdocs-material~=6.2",
"mkdocs-material~=7.0",
"mkdocs-minify-plugin~=0.4.0",
"mkdocstrings~=0.14.0",
"mkdocstrings~=0.15.0",
]
testing_deps = [
"pytest~=6.2",
Expand All @@ -46,7 +49,7 @@
"jsondiff~=1.2",
] + server_deps
dev_deps = (
["pylint~=2.6", "pre-commit~=2.10", "invoke~=1.5"]
["pylint~=2.7", "pre-commit~=2.10", "invoke~=1.5"]
+ docs_deps
+ testing_deps
+ client_deps
Expand Down Expand Up @@ -88,12 +91,12 @@
],
python_requires=">=3.6",
install_requires=[
"lark-parser~=0.11.1",
"lark-parser~=0.11.2",
"fastapi~=0.63.0",
"pydantic~=1.6.1",
"email_validator~=1.1",
"requests~=2.25",
'typing-extensions~=3.7;python_version<"3.8"',
"typing-extensions~=3.7;python_version<'3.8'",
],
extras_require={
"all": all_deps,
Expand Down
2 changes: 1 addition & 1 deletion tests/adapters/structures/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ def get_min_ver(dependency: str) -> str:
for line in setup_file.readlines():
min_ver = re.findall(fr'"{dependency}((=|!|<|>|~)=|>|<)(.+)"', line)
if min_ver:
return min_ver[0][2]
return min_ver[0][2].split(";")[0]
else:
raise RuntimeError(f"Cannot find {dependency} dependency in setup.py")

0 comments on commit 51453c9

Please sign in to comment.