From 49d2509175f2b4b466b2fcee9f6994a8e7521a00 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 Nov 2023 05:26:35 +0000 Subject: [PATCH 1/2] Update optimade[server] requirement from ~=0.25.3 to ~=1.0.0 Updates the requirements on [optimade[server]](https://github.com/Materials-Consortia/optimade-python-tools) to permit the latest version. - [Release notes](https://github.com/Materials-Consortia/optimade-python-tools/releases) - [Changelog](https://github.com/Materials-Consortia/optimade-python-tools/blob/master/CHANGELOG.md) - [Commits](https://github.com/Materials-Consortia/optimade-python-tools/compare/v0.25.3...v1.0.0) --- updated-dependencies: - dependency-name: optimade[server] dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 0f0c1220..bb8a2b44 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -optimade[server]~=0.25.3 +optimade[server]~=1.0.0 aiida-core~=2.4.0 pymatgen>=2019.7.2,!=2019.9.7,<2023.10.12 From c003e3dff112e9a03245d91cdf8bb3d0be1c0fb0 Mon Sep 17 00:00:00 2001 From: The AiiDA Team Date: Mon, 13 Nov 2023 05:26:58 +0000 Subject: [PATCH 2/2] Update AiiDA/OPTIMADE --- Dockerfile | 2 +- README.md | 4 ++-- profiles/docker-compose-mongo.j2 | 2 +- profiles/docker-compose-mongo.yml | 2 +- profiles/docker-compose.j2 | 2 +- profiles/docker-compose.yml | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 78a73544..70d566b9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ FROM python:3.9 WORKDIR /app # Install specific optimade and aiida-core versions -ARG OPTIMADE_TOOLS_VERSION=0.25.3 +ARG OPTIMADE_TOOLS_VERSION=1.0.0 ARG AIIDA_VERSION=2.4.0 # Copy repo contents diff --git a/README.md b/README.md index bc61d2dd..6ca4bc45 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,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/)
[![PyPI](https://img.shields.io/pypi/v/aiida-optimade)](https://pypi.org/project/aiida-optimade/)
[![PyPI - Python Version](https://img.shields.io/pypi/pyversions/aiida-optimade)](https://pypi.org/project/aiida-optimade/)
[![OPTIMADE](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/Materials-Consortia/optimade-python-tools/v0.25.3/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/)
[![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/)
[![PyPI](https://img.shields.io/pypi/v/aiida-optimade)](https://pypi.org/project/aiida-optimade/)
[![PyPI - Python Version](https://img.shields.io/pypi/pyversions/aiida-optimade)](https://pypi.org/project/aiida-optimade/)
[![OPTIMADE](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/Materials-Consortia/optimade-python-tools/v1.0.0/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/)
[![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). @@ -183,4 +183,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.25.3/optimade-version.json +[OPTIMADE from OPT]: https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/Materials-Consortia/optimade-python-tools/v1.0.0/optimade-version.json diff --git a/profiles/docker-compose-mongo.j2 b/profiles/docker-compose-mongo.j2 index 14b3ad6c..e474c47c 100644 --- a/profiles/docker-compose-mongo.j2 +++ b/profiles/docker-compose-mongo.j2 @@ -10,7 +10,7 @@ services: context: .. dockerfile: Dockerfile args: - OPTIMADE_TOOLS_VERSION: 0.25.3 + OPTIMADE_TOOLS_VERSION: 1.0.0 AIIDA_VERSION: 2.4.0 CONFIG_FILE: aiida_optimade/config.json environment: diff --git a/profiles/docker-compose-mongo.yml b/profiles/docker-compose-mongo.yml index 9eed8730..1884a19f 100644 --- a/profiles/docker-compose-mongo.yml +++ b/profiles/docker-compose-mongo.yml @@ -11,7 +11,7 @@ services: context: .. dockerfile: Dockerfile args: - OPTIMADE_TOOLS_VERSION: 0.25.3 + OPTIMADE_TOOLS_VERSION: 1.0.0 AIIDA_VERSION: 2.4.0 CONFIG_FILE: aiida_optimade/config.json environment: diff --git a/profiles/docker-compose.j2 b/profiles/docker-compose.j2 index 1cda8ee0..dbf80c57 100644 --- a/profiles/docker-compose.j2 +++ b/profiles/docker-compose.j2 @@ -8,7 +8,7 @@ services: context: .. dockerfile: Dockerfile args: - OPTIMADE_TOOLS_VERSION: 0.25.3 + OPTIMADE_TOOLS_VERSION: 1.0.0 AIIDA_VERSION: 2.4.0 CONFIG_FILE: aiida_optimade/config.json environment: diff --git a/profiles/docker-compose.yml b/profiles/docker-compose.yml index 13456e80..26bb570b 100644 --- a/profiles/docker-compose.yml +++ b/profiles/docker-compose.yml @@ -9,7 +9,7 @@ services: context: .. dockerfile: Dockerfile args: - OPTIMADE_TOOLS_VERSION: 0.25.3 + OPTIMADE_TOOLS_VERSION: 1.0.0 AIIDA_VERSION: 2.4.0 CONFIG_FILE: aiida_optimade/config.json environment: