Skip to content

Commit

Permalink
Merge branch 'materialsproject:main' into taskdoc
Browse files Browse the repository at this point in the history
  • Loading branch information
esoteric-ephemera authored Apr 15, 2024
2 parents 13b52d5 + 4743970 commit cd9a5f7
Show file tree
Hide file tree
Showing 21 changed files with 209 additions and 197 deletions.
2 changes: 1 addition & 1 deletion emmet-api/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM materialsproject/devops:python-3.1013.7 as base
FROM materialsproject/devops:python-3.1013.8 as base
RUN apt-get update && apt-get install -y --no-install-recommends libopenblas-dev libjpeg62 && apt-get clean

FROM base as builder
Expand Down
20 changes: 10 additions & 10 deletions emmet-api/requirements/deployment.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ bcrypt==4.1.2
# via paramiko
blinker==1.7.0
# via flask
boto3==1.34.81
boto3==1.34.84
# via
# emmet-api (emmet/emmet-api/setup.py)
# maggma
botocore==1.34.81
botocore==1.34.84
# via
# boto3
# s3transfer
Expand Down Expand Up @@ -87,7 +87,7 @@ gunicorn==21.2.0
# via emmet-api (emmet/emmet-api/setup.py)
h11==0.14.0
# via uvicorn
idna==3.6
idna==3.7
# via
# anyio
# requests
Expand Down Expand Up @@ -159,7 +159,7 @@ packaging==24.0
# plotly
palettable==3.3.3
# via pymatgen
pandas==2.2.1
pandas==2.2.2
# via
# -r python/requirements.txt
# pymatgen
Expand All @@ -177,21 +177,21 @@ pybtex==0.24.0
# pymatgen
pycparser==2.22
# via cffi
pydantic==2.6.4
pydantic==2.7.0
# via
# emmet-core
# fastapi
# maggma
# pydantic-settings
pydantic-core==2.16.3
pydantic-core==2.18.1
# via pydantic
pydantic-settings==2.2.1
# via
# emmet-core
# maggma
pydash==8.0.0
# via maggma
pymatgen==2024.3.1
pymatgen==2024.4.13
# via
# emmet-core
# pymatgen-analysis-alloys
Expand All @@ -217,7 +217,7 @@ pytz==2024.1
# via pandas
pyyaml==6.0.1
# via pybtex
pyzmq==25.1.2
pyzmq==26.0.0
# via maggma
referencing==0.34.0
# via
Expand Down Expand Up @@ -259,9 +259,9 @@ six==1.16.0
# python-dateutil
sniffio==1.3.1
# via anyio
spglib==2.3.1
spglib==2.4.0
# via pymatgen
sqlparse==0.4.4
sqlparse==0.5.0
# via ddtrace
sshtunnel==0.4.0
# via maggma
Expand Down
18 changes: 9 additions & 9 deletions emmet-api/requirements/ubuntu-latest_py3.10.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ bcrypt==4.1.2
# via paramiko
blinker==1.7.0
# via flask
boto3==1.34.81
boto3==1.34.84
# via
# emmet-api (setup.py)
# maggma
botocore==1.34.81
botocore==1.34.84
# via
# boto3
# s3transfer
Expand Down Expand Up @@ -87,7 +87,7 @@ gunicorn==21.2.0
# via emmet-api (setup.py)
h11==0.14.0
# via uvicorn
idna==3.6
idna==3.7
# via
# anyio
# requests
Expand Down Expand Up @@ -156,7 +156,7 @@ packaging==24.0
# plotly
palettable==3.3.3
# via pymatgen
pandas==2.2.1
pandas==2.2.2
# via pymatgen
paramiko==3.4.0
# via sshtunnel
Expand All @@ -172,21 +172,21 @@ pybtex==0.24.0
# pymatgen
pycparser==2.22
# via cffi
pydantic==2.6.4
pydantic==2.7.0
# via
# emmet-core
# fastapi
# maggma
# pydantic-settings
pydantic-core==2.16.3
pydantic-core==2.18.1
# via pydantic
pydantic-settings==2.2.1
# via
# emmet-core
# maggma
pydash==8.0.0
# via maggma
pymatgen==2024.3.1
pymatgen==2024.4.13
# via
# emmet-core
# pymatgen-analysis-alloys
Expand Down Expand Up @@ -252,9 +252,9 @@ six==1.16.0
# python-dateutil
sniffio==1.3.1
# via anyio
spglib==2.3.1
spglib==2.4.0
# via pymatgen
sqlparse==0.4.4
sqlparse==0.5.0
# via ddtrace
sshtunnel==0.4.0
# via maggma
Expand Down
20 changes: 10 additions & 10 deletions emmet-api/requirements/ubuntu-latest_py3.10_extras.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ bcrypt==4.1.2
# via paramiko
blinker==1.7.0
# via flask
boto3==1.34.81
boto3==1.34.84
# via
# emmet-api (setup.py)
# maggma
botocore==1.34.81
botocore==1.34.84
# via
# boto3
# s3transfer
Expand Down Expand Up @@ -114,7 +114,7 @@ htmlmin2==0.1.13
# via mkdocs-minify-plugin
identify==2.5.35
# via pre-commit
idna==3.6
idna==3.7
# via
# anyio
# requests
Expand Down Expand Up @@ -249,7 +249,7 @@ packaging==24.0
# pytest
palettable==3.3.3
# via pymatgen
pandas==2.2.1
pandas==2.2.2
# via pymatgen
paramiko==3.4.0
# via sshtunnel
Expand Down Expand Up @@ -280,13 +280,13 @@ pycodestyle==2.11.1
# flake8
pycparser==2.22
# via cffi
pydantic==2.6.4
pydantic==2.7.0
# via
# emmet-core
# fastapi
# maggma
# pydantic-settings
pydantic-core==2.16.3
pydantic-core==2.18.1
# via pydantic
pydantic-settings==2.2.1
# via
Expand All @@ -300,7 +300,7 @@ pyflakes==3.2.0
# via flake8
pygments==2.17.2
# via mkdocs-material
pymatgen==2024.3.1
pymatgen==2024.4.13
# via
# emmet-core
# pymatgen-analysis-alloys
Expand Down Expand Up @@ -388,9 +388,9 @@ sniffio==1.3.1
# via anyio
snowballstemmer==2.2.0
# via pydocstyle
spglib==2.3.1
spglib==2.4.0
# via pymatgen
sqlparse==0.4.4
sqlparse==0.5.0
# via ddtrace
sshtunnel==0.4.0
# via maggma
Expand All @@ -415,7 +415,7 @@ tqdm==4.66.2
# pymatgen
types-requests==2.31.0.20240406
# via emmet-api (setup.py)
types-setuptools==69.2.0.20240317
types-setuptools==69.5.0.20240415
# via emmet-api (setup.py)
typing-extensions==4.11.0
# via
Expand Down
18 changes: 9 additions & 9 deletions emmet-api/requirements/ubuntu-latest_py3.11.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ bcrypt==4.1.2
# via paramiko
blinker==1.7.0
# via flask
boto3==1.34.81
boto3==1.34.84
# via
# emmet-api (setup.py)
# maggma
botocore==1.34.81
botocore==1.34.84
# via
# boto3
# s3transfer
Expand Down Expand Up @@ -83,7 +83,7 @@ gunicorn==21.2.0
# via emmet-api (setup.py)
h11==0.14.0
# via uvicorn
idna==3.6
idna==3.7
# via
# anyio
# requests
Expand Down Expand Up @@ -152,7 +152,7 @@ packaging==24.0
# plotly
palettable==3.3.3
# via pymatgen
pandas==2.2.1
pandas==2.2.2
# via pymatgen
paramiko==3.4.0
# via sshtunnel
Expand All @@ -168,21 +168,21 @@ pybtex==0.24.0
# pymatgen
pycparser==2.22
# via cffi
pydantic==2.6.4
pydantic==2.7.0
# via
# emmet-core
# fastapi
# maggma
# pydantic-settings
pydantic-core==2.16.3
pydantic-core==2.18.1
# via pydantic
pydantic-settings==2.2.1
# via
# emmet-core
# maggma
pydash==8.0.0
# via maggma
pymatgen==2024.3.1
pymatgen==2024.4.13
# via
# emmet-core
# pymatgen-analysis-alloys
Expand Down Expand Up @@ -248,9 +248,9 @@ six==1.16.0
# python-dateutil
sniffio==1.3.1
# via anyio
spglib==2.3.1
spglib==2.4.0
# via pymatgen
sqlparse==0.4.4
sqlparse==0.5.0
# via ddtrace
sshtunnel==0.4.0
# via maggma
Expand Down
20 changes: 10 additions & 10 deletions emmet-api/requirements/ubuntu-latest_py3.11_extras.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ bcrypt==4.1.2
# via paramiko
blinker==1.7.0
# via flask
boto3==1.34.81
boto3==1.34.84
# via
# emmet-api (setup.py)
# maggma
botocore==1.34.81
botocore==1.34.84
# via
# boto3
# s3transfer
Expand Down Expand Up @@ -109,7 +109,7 @@ htmlmin2==0.1.13
# via mkdocs-minify-plugin
identify==2.5.35
# via pre-commit
idna==3.6
idna==3.7
# via
# anyio
# requests
Expand Down Expand Up @@ -244,7 +244,7 @@ packaging==24.0
# pytest
palettable==3.3.3
# via pymatgen
pandas==2.2.1
pandas==2.2.2
# via pymatgen
paramiko==3.4.0
# via sshtunnel
Expand Down Expand Up @@ -275,13 +275,13 @@ pycodestyle==2.11.1
# flake8
pycparser==2.22
# via cffi
pydantic==2.6.4
pydantic==2.7.0
# via
# emmet-core
# fastapi
# maggma
# pydantic-settings
pydantic-core==2.16.3
pydantic-core==2.18.1
# via pydantic
pydantic-settings==2.2.1
# via
Expand All @@ -295,7 +295,7 @@ pyflakes==3.2.0
# via flake8
pygments==2.17.2
# via mkdocs-material
pymatgen==2024.3.1
pymatgen==2024.4.13
# via
# emmet-core
# pymatgen-analysis-alloys
Expand Down Expand Up @@ -383,9 +383,9 @@ sniffio==1.3.1
# via anyio
snowballstemmer==2.2.0
# via pydocstyle
spglib==2.3.1
spglib==2.4.0
# via pymatgen
sqlparse==0.4.4
sqlparse==0.5.0
# via ddtrace
sshtunnel==0.4.0
# via maggma
Expand All @@ -405,7 +405,7 @@ tqdm==4.66.2
# pymatgen
types-requests==2.31.0.20240406
# via emmet-api (setup.py)
types-setuptools==69.2.0.20240317
types-setuptools==69.5.0.20240415
# via emmet-api (setup.py)
typing-extensions==4.11.0
# via
Expand Down
Loading

0 comments on commit cd9a5f7

Please sign in to comment.