Skip to content

Commit

Permalink
Merge branch 'main' of github.com:materialsproject/emmet
Browse files Browse the repository at this point in the history
  • Loading branch information
munrojm committed Jan 8, 2024
2 parents bb8fe7d + 28747b5 commit eaa9657
Show file tree
Hide file tree
Showing 21 changed files with 109 additions and 109 deletions.
12 changes: 6 additions & 6 deletions emmet-api/requirements/deployment.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ bcrypt==4.1.2
# via paramiko
blinker==1.7.0
# via flask
boto3==1.34.11
boto3==1.34.14
# via
# emmet-api (emmet/emmet-api/setup.py)
# maggma
botocore==1.34.11
botocore==1.34.14
# via
# boto3
# s3transfer
Expand Down Expand Up @@ -67,7 +67,7 @@ dnspython==2.4.2
# via
# maggma
# pymongo
emmet-core[all]==0.75.0
emmet-core[all]==0.75.2
# via emmet-api (emmet/emmet-api/setup.py)
envier==0.5.0
# via ddtrace
Expand Down Expand Up @@ -123,7 +123,7 @@ kiwisolver==1.4.5
# via matplotlib
latexcodec==2.0.1
# via pybtex
maggma==0.60.0
maggma==0.60.2
# via emmet-api (emmet/emmet-api/setup.py)
markupsafe==2.1.3
# via
Expand Down Expand Up @@ -158,7 +158,7 @@ networkx==3.2.1
# via
# pymatgen
# robocrys
numpy==1.26.2
numpy==1.26.3
# via
# -r python/requirements.txt
# ase
Expand Down Expand Up @@ -266,7 +266,7 @@ pyyaml==6.0.1
# pybtex
pyzmq==25.1.2
# via maggma
referencing==0.32.0
referencing==0.32.1
# via
# jsonschema
# jsonschema-specifications
Expand Down
12 changes: 6 additions & 6 deletions emmet-api/requirements/ubuntu-latest_py3.10.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ bcrypt==4.1.2
# via paramiko
blinker==1.7.0
# via flask
boto3==1.34.11
boto3==1.34.14
# via
# emmet-api (setup.py)
# maggma
botocore==1.34.11
botocore==1.34.14
# via
# boto3
# s3transfer
Expand Down Expand Up @@ -67,7 +67,7 @@ dnspython==2.4.2
# via
# maggma
# pymongo
emmet-core[all]==0.75.0
emmet-core[all]==0.75.2
# via emmet-api (setup.py)
envier==0.5.0
# via ddtrace
Expand Down Expand Up @@ -123,7 +123,7 @@ kiwisolver==1.4.5
# via matplotlib
latexcodec==2.0.1
# via pybtex
maggma==0.60.0
maggma==0.60.1
# via emmet-api (setup.py)
markupsafe==2.1.3
# via
Expand Down Expand Up @@ -157,7 +157,7 @@ networkx==3.2.1
# via
# pymatgen
# robocrys
numpy==1.26.2
numpy==1.26.3
# via
# ase
# contourpy
Expand Down Expand Up @@ -263,7 +263,7 @@ pyyaml==6.0.1
# pybtex
pyzmq==25.1.2
# via maggma
referencing==0.32.0
referencing==0.32.1
# via
# jsonschema
# jsonschema-specifications
Expand Down
16 changes: 8 additions & 8 deletions emmet-api/requirements/ubuntu-latest_py3.10_extras.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ bcrypt==4.1.2
# via paramiko
blinker==1.7.0
# via flask
boto3==1.34.11
boto3==1.34.14
# via
# emmet-api (setup.py)
# maggma
botocore==1.34.11
botocore==1.34.14
# via
# boto3
# s3transfer
Expand Down Expand Up @@ -83,7 +83,7 @@ dnspython==2.4.2
# via
# maggma
# pymongo
emmet-core[all]==0.75.0
emmet-core[all]==0.75.2
# via emmet-api (setup.py)
envier==0.5.0
# via ddtrace
Expand All @@ -98,7 +98,7 @@ fastapi==0.108.0
# maggma
filelock==3.13.1
# via virtualenv
flake8==6.1.0
flake8==7.0.0
# via emmet-api (setup.py)
flask==3.0.0
# via mongogrant
Expand Down Expand Up @@ -163,7 +163,7 @@ latexcodec==2.0.1
# via pybtex
livereload==2.6.3
# via emmet-api (setup.py)
maggma==0.60.0
maggma==0.60.1
# via emmet-api (setup.py)
markdown==3.5.1
# via
Expand Down Expand Up @@ -249,7 +249,7 @@ networkx==3.2.1
# robocrys
nodeenv==1.8.0
# via pre-commit
numpy==1.26.2
numpy==1.26.3
# via
# ase
# contourpy
Expand Down Expand Up @@ -337,7 +337,7 @@ pydash==7.0.6
# via maggma
pydocstyle==6.3.0
# via emmet-api (setup.py)
pyflakes==3.1.0
pyflakes==3.2.0
# via flake8
pygments==2.17.2
# via mkdocs-material
Expand Down Expand Up @@ -396,7 +396,7 @@ pyyaml-env-tag==0.1
# via mkdocs
pyzmq==25.1.2
# via maggma
referencing==0.32.0
referencing==0.32.1
# via
# jsonschema
# jsonschema-specifications
Expand Down
12 changes: 6 additions & 6 deletions emmet-api/requirements/ubuntu-latest_py3.11.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ bcrypt==4.1.2
# via paramiko
blinker==1.7.0
# via flask
boto3==1.34.11
boto3==1.34.14
# via
# emmet-api (setup.py)
# maggma
botocore==1.34.11
botocore==1.34.14
# via
# boto3
# s3transfer
Expand Down Expand Up @@ -67,7 +67,7 @@ dnspython==2.4.2
# via
# maggma
# pymongo
emmet-core[all]==0.75.0
emmet-core[all]==0.75.2
# via emmet-api (setup.py)
envier==0.5.0
# via ddtrace
Expand Down Expand Up @@ -119,7 +119,7 @@ kiwisolver==1.4.5
# via matplotlib
latexcodec==2.0.1
# via pybtex
maggma==0.60.0
maggma==0.60.1
# via emmet-api (setup.py)
markupsafe==2.1.3
# via
Expand Down Expand Up @@ -153,7 +153,7 @@ networkx==3.2.1
# via
# pymatgen
# robocrys
numpy==1.26.2
numpy==1.26.3
# via
# ase
# contourpy
Expand Down Expand Up @@ -259,7 +259,7 @@ pyyaml==6.0.1
# pybtex
pyzmq==25.1.2
# via maggma
referencing==0.32.0
referencing==0.32.1
# via
# jsonschema
# jsonschema-specifications
Expand Down
16 changes: 8 additions & 8 deletions emmet-api/requirements/ubuntu-latest_py3.11_extras.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ bcrypt==4.1.2
# via paramiko
blinker==1.7.0
# via flask
boto3==1.34.11
boto3==1.34.14
# via
# emmet-api (setup.py)
# maggma
botocore==1.34.11
botocore==1.34.14
# via
# boto3
# s3transfer
Expand Down Expand Up @@ -83,7 +83,7 @@ dnspython==2.4.2
# via
# maggma
# pymongo
emmet-core[all]==0.75.0
emmet-core[all]==0.75.2
# via emmet-api (setup.py)
envier==0.5.0
# via ddtrace
Expand All @@ -93,7 +93,7 @@ fastapi==0.108.0
# maggma
filelock==3.13.1
# via virtualenv
flake8==6.1.0
flake8==7.0.0
# via emmet-api (setup.py)
flask==3.0.0
# via mongogrant
Expand Down Expand Up @@ -158,7 +158,7 @@ latexcodec==2.0.1
# via pybtex
livereload==2.6.3
# via emmet-api (setup.py)
maggma==0.60.0
maggma==0.60.1
# via emmet-api (setup.py)
markdown==3.5.1
# via
Expand Down Expand Up @@ -244,7 +244,7 @@ networkx==3.2.1
# robocrys
nodeenv==1.8.0
# via pre-commit
numpy==1.26.2
numpy==1.26.3
# via
# ase
# contourpy
Expand Down Expand Up @@ -332,7 +332,7 @@ pydash==7.0.6
# via maggma
pydocstyle==6.3.0
# via emmet-api (setup.py)
pyflakes==3.1.0
pyflakes==3.2.0
# via flake8
pygments==2.17.2
# via mkdocs-material
Expand Down Expand Up @@ -391,7 +391,7 @@ pyyaml-env-tag==0.1
# via mkdocs
pyzmq==25.1.2
# via maggma
referencing==0.32.0
referencing==0.32.1
# via
# jsonschema
# jsonschema-specifications
Expand Down
12 changes: 6 additions & 6 deletions emmet-api/requirements/ubuntu-latest_py3.9.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ bcrypt==4.1.2
# via paramiko
blinker==1.7.0
# via flask
boto3==1.34.11
boto3==1.34.14
# via
# emmet-api (setup.py)
# maggma
botocore==1.34.11
botocore==1.34.14
# via
# boto3
# s3transfer
Expand Down Expand Up @@ -67,7 +67,7 @@ dnspython==2.4.2
# via
# maggma
# pymongo
emmet-core[all]==0.75.0
emmet-core[all]==0.75.2
# via emmet-api (setup.py)
envier==0.5.0
# via ddtrace
Expand Down Expand Up @@ -127,7 +127,7 @@ kiwisolver==1.4.5
# via matplotlib
latexcodec==2.0.1
# via pybtex
maggma==0.60.0
maggma==0.60.1
# via emmet-api (setup.py)
markupsafe==2.1.3
# via
Expand Down Expand Up @@ -161,7 +161,7 @@ networkx==3.2.1
# via
# pymatgen
# robocrys
numpy==1.26.2
numpy==1.26.3
# via
# ase
# contourpy
Expand Down Expand Up @@ -267,7 +267,7 @@ pyyaml==6.0.1
# pybtex
pyzmq==25.1.2
# via maggma
referencing==0.32.0
referencing==0.32.1
# via
# jsonschema
# jsonschema-specifications
Expand Down

0 comments on commit eaa9657

Please sign in to comment.