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.

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

Update dependencies #385

Merged
merged 5 commits into from
Sep 28, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .ci/aiida-version.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"schemaVersion": 1,
"label": "AiiDA",
"message": "v2.0.3",
"message": "v2.0.4",
"color": "brightgreen"
}
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ FROM python:3.9
WORKDIR /app

# Install specific optimade and aiida-core versions
ARG OPTIMADE_TOOLS_VERSION=0.19.2
ARG AIIDA_VERSION=2.0.3
ARG OPTIMADE_TOOLS_VERSION=0.19.4
ARG AIIDA_VERSION=2.0.4

# Copy repo contents
COPY setup.py setup.json README.md requirements*.txt ./
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ The compatibility matrix below assumes the user always install the latest patch

| Latest release | Build status | Activity |
|:--------------:|:------------:|:--------:|
| [![AiiDA](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/aiidateam/aiida-optimade/develop/.ci/aiida-version.json)](https://github.com/aiidateam/aiida-core/)<br>[![PyPI](https://img.shields.io/pypi/v/aiida-optimade)](https://pypi.org/project/aiida-optimade/)<br>[![PyPI - Python Version](https://img.shields.io/pypi/pyversions/aiida-optimade)](https://pypi.org/project/aiida-optimade/)<br>[![OPTIMADE](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/Materials-Consortia/optimade-python-tools/v0.19.2/optimade-version.json)](https://github.com/Materials-Consortia/OPTIMADE/) | [![GitHub Workflow Status](https://img.shields.io/github/workflow/status/aiidateam/aiida-optimade/aiida-optimade)](https://github.com/aiidateam/aiida-optimade/actions/)<br>[![Codecov](https://img.shields.io/codecov/c/gh/aiidateam/aiida-optimade)](https://codecov.io/gh/aiidateam/aiida-optimade) | [![GitHub last commit](https://img.shields.io/github/last-commit/aiidateam/aiida-optimade)](https://github.com/aiidateam/aiida-optimade) |
| [![AiiDA](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/aiidateam/aiida-optimade/develop/.ci/aiida-version.json)](https://github.com/aiidateam/aiida-core/)<br>[![PyPI](https://img.shields.io/pypi/v/aiida-optimade)](https://pypi.org/project/aiida-optimade/)<br>[![PyPI - Python Version](https://img.shields.io/pypi/pyversions/aiida-optimade)](https://pypi.org/project/aiida-optimade/)<br>[![OPTIMADE](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/Materials-Consortia/optimade-python-tools/v0.19.4/optimade-version.json)](https://github.com/Materials-Consortia/OPTIMADE/) | [![GitHub Workflow Status](https://img.shields.io/github/workflow/status/aiidateam/aiida-optimade/aiida-optimade)](https://github.com/aiidateam/aiida-optimade/actions/)<br>[![Codecov](https://img.shields.io/codecov/c/gh/aiidateam/aiida-optimade)](https://codecov.io/gh/aiidateam/aiida-optimade) | [![GitHub last commit](https://img.shields.io/github/last-commit/aiidateam/aiida-optimade)](https://github.com/aiidateam/aiida-optimade) |

This is a RESTful API server created with [FastAPI](https://fastapi.tiangolo.com/) that exposes an AiiDA database according to the [OPTIMADE specification](https://github.com/Materials-Consortia/OPTIMADE/blob/develop/optimade.rst).

Expand Down Expand Up @@ -171,4 +171,4 @@ For example: `v2.3.12`.

[Python v3.7-v3.9]: https://img.shields.io/badge/python-3.7%20%7C%203.8%20%7C%203.9-blue

[OPTIMADE from OPT]: https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/Materials-Consortia/optimade-python-tools/v0.18.0/optimade-version.json
[OPTIMADE from OPT]: https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/Materials-Consortia/optimade-python-tools/v0.19.4/optimade-version.json
4 changes: 2 additions & 2 deletions profiles/docker-compose-mongo.j2
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ services:
context: ..
dockerfile: Dockerfile
args:
OPTIMADE_TOOLS_VERSION: 0.19.2
AIIDA_VERSION: 2.0.3
OPTIMADE_TOOLS_VERSION: 0.19.4
AIIDA_VERSION: 2.0.4
CONFIG_FILE: aiida_optimade/config.json
environment:
AIIDA_PATH: /app
Expand Down
4 changes: 2 additions & 2 deletions profiles/docker-compose-mongo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ services:
context: ..
dockerfile: Dockerfile
args:
OPTIMADE_TOOLS_VERSION: 0.19.2
AIIDA_VERSION: 2.0.3
OPTIMADE_TOOLS_VERSION: 0.19.4
AIIDA_VERSION: 2.0.4
CONFIG_FILE: aiida_optimade/config.json
environment:
AIIDA_PATH: /app
Expand Down
4 changes: 2 additions & 2 deletions profiles/docker-compose.j2
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ services:
context: ..
dockerfile: Dockerfile
args:
OPTIMADE_TOOLS_VERSION: 0.19.2
AIIDA_VERSION: 2.0.3
OPTIMADE_TOOLS_VERSION: 0.19.4
AIIDA_VERSION: 2.0.4
CONFIG_FILE: aiida_optimade/config.json
environment:
AIIDA_PATH: /app
Expand Down
4 changes: 2 additions & 2 deletions profiles/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ services:
context: ..
dockerfile: Dockerfile
args:
OPTIMADE_TOOLS_VERSION: 0.19.2
AIIDA_VERSION: 2.0.3
OPTIMADE_TOOLS_VERSION: 0.19.4
AIIDA_VERSION: 2.0.4
CONFIG_FILE: aiida_optimade/config.json
environment:
AIIDA_PATH: /app
Expand Down
4 changes: 2 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
optimade[mongo]~=0.19.2
aiida-core~=2.0.3
optimade[mongo]~=0.19.4
aiida-core~=2.0.4
pymatgen>=2019.7.2,<=2022.1.9,!=2019.9.7
uvicorn~=0.18.3

Expand Down